Bug 534512 - [Layers] activating/ deactivating more than one layer do not behave correctly

- Add a new CSS property to avoid conflicting styles across multiple applied CSS
- Update the property views (cleaning)
- We need not rely on the modification of the Layers' Views to update the application of the CSS
- Moved command code to new Command classes
- If no views have been selected All the displayed views are selected by default
- Added a listener to the CSSIntances
- Corrected the way the CSS were resolved as the Layer's and the Model's might have different memory spaces

Change-Id: Id4c799ecde1f238e6b31ab43fd31acd7d81560d5
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF
index 0946336..3202af3 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/META-INF/MANIFEST.MF
@@ -22,6 +22,6 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.internal.infra.gmfdiag.layers.configmodel.layersconfig.provider.LayersConfigEditPlugin$Implementation$Activator
+Bundle-Activator: org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.provider.LayersEditPlugin$Implementation$Activator
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.layers.model.edit;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateCSSHideInstance_stylesheet_EmbeddedStyleSheet.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateCSSHideInstance_stylesheet_EmbeddedStyleSheet.gif
new file mode 100755
index 0000000..d8aebba
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateCSSHideInstance_stylesheet_EmbeddedStyleSheet.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateCSSHideInstance_stylesheet_StyleSheetReference.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateCSSHideInstance_stylesheet_StyleSheetReference.gif
new file mode 100755
index 0000000..160cd18
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateCSSHideInstance_stylesheet_StyleSheetReference.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateFolder_elements_CSSHideType.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateFolder_elements_CSSHideType.gif
new file mode 100755
index 0000000..a4565df
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateFolder_elements_CSSHideType.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateProperty_defaultValue_CSSHideInstance.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateProperty_defaultValue_CSSHideInstance.gif
new file mode 100755
index 0000000..4a2fd2e
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateProperty_defaultValue_CSSHideInstance.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToPropertySetter_value_CSSHidePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToPropertySetter_value_CSSHidePropertySetter.gif
new file mode 100755
index 0000000..a1607f9
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToPropertySetter_value_CSSHidePropertySetter.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_CSSHideInstance.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_CSSHideInstance.gif
new file mode 100755
index 0000000..968b6be
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToTypeInstanceMap_value_CSSHideInstance.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToTypeMap_value_CSSHideType.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToTypeMap_value_CSSHideType.gif
new file mode 100755
index 0000000..c05a418
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/ctool16/CreateStringToTypeMap_value_CSSHideType.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHideInstance.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHideInstance.gif
new file mode 100755
index 0000000..a26660e
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHideInstance.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHidePropertySetter.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHidePropertySetter.gif
new file mode 100755
index 0000000..cdd3b76
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHidePropertySetter.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHideType.gif b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHideType.gif
new file mode 100755
index 0000000..106881e
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/icons/full/obj16/CSSHideType.gif
Binary files differ
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/plugin.properties b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/plugin.properties
index 13d4f1f..f552068 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/plugin.properties
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/plugin.properties
@@ -255,3 +255,9 @@
 _UI_Theme_icon_feature = Icon
 _UI_Theme_stylesheets_feature = Stylesheets
 _UI_CSSInstance_stylesheet_feature = Stylesheet
+_UI_CSSHidePropertySetter_type = CSS Hide Property Setter
+_UI_CSSHideType_type = CSS Hide Type
+_UI_CSSHideInstance_type = CSS Hide Instance
+_UI_CSSInstance_style_feature = Style
+_UI_CSSHideInstance_stylesheet_feature = Stylesheet
+_UI_CSSHideInstance_style_feature = Style
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHideInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHideInstanceItemProvider.java
new file mode 100755
index 0000000..653533a
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHideInstanceItemProvider.java
@@ -0,0 +1,190 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.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.gmfdiag.css.stylesheets.StylesheetsFactory;
+
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CSSHideInstanceItemProvider extends TypeInstanceItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CSSHideInstanceItemProvider(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);
+
+			addStylePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Style feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addStylePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CSSHideInstance_style_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_CSSHideInstance_style_feature", "_UI_CSSHideInstance_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 LayersPackage.Literals.CSS_HIDE_INSTANCE__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(LayersPackage.Literals.CSS_HIDE_INSTANCE__STYLESHEET);
+		}
+		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 CSSHideInstance.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CSSHideInstance")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((CSSHideInstance)object).getStyle();
+		return label == null || label.length() == 0 ?
+			getString("_UI_CSSHideInstance_type") : //$NON-NLS-1$
+			getString("_UI_CSSHideInstance_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * 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(CSSHideInstance.class)) {
+			case LayersPackage.CSS_HIDE_INSTANCE__STYLE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
+			case LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET:
+				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
+				(LayersPackage.Literals.CSS_HIDE_INSTANCE__STYLESHEET,
+				 StylesheetsFactory.eINSTANCE.createStyleSheetReference()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(LayersPackage.Literals.CSS_HIDE_INSTANCE__STYLESHEET,
+				 StylesheetsFactory.eINSTANCE.createEmbeddedStyleSheet()));
+	}
+
+}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHidePropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHidePropertySetterItemProvider.java
new file mode 100755
index 0000000..93a8e82
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHidePropertySetterItemProvider.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.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.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CSSHidePropertySetterItemProvider extends PropertySetterItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CSSHidePropertySetterItemProvider(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 CSSHidePropertySetter.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CSSHidePropertySetter")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((CSSHidePropertySetter)object).getPropertyName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_CSSHidePropertySetter_type") : //$NON-NLS-1$
+			getString("_UI_CSSHidePropertySetter_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * 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/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHideTypeItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHideTypeItemProvider.java
new file mode 100755
index 0000000..9f53c52
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSHideTypeItemProvider.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.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.internal.infra.gmfdiag.layers.model.layers.CSSHideType;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class CSSHideTypeItemProvider extends TypeItemProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CSSHideTypeItemProvider(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 CSSHideType.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/CSSHideType")); //$NON-NLS-1$
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((CSSHideType)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_CSSHideType_type") : //$NON-NLS-1$
+			getString("_UI_CSSHideType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
+	}
+	
+
+	/**
+	 * 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/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSInstanceItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSInstanceItemProvider.java
index cb0ee61..e9b2c41 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSInstanceItemProvider.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/CSSInstanceItemProvider.java
@@ -22,7 +22,9 @@
 
 import org.eclipse.emf.ecore.EStructuralFeature;
 
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StylesheetsFactory;
@@ -58,11 +60,34 @@
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addStylePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Style feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addStylePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_CSSInstance_style_feature"), //$NON-NLS-1$
+				 getString("_UI_PropertyDescriptor_description", "_UI_CSSInstance_style_feature", "_UI_CSSInstance_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 LayersPackage.Literals.CSS_INSTANCE__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}.
@@ -111,7 +136,10 @@
 	 */
 	@Override
 	public String getText(Object object) {
-		return getString("_UI_CSSInstance_type"); //$NON-NLS-1$
+		String label = ((CSSInstance)object).getStyle();
+		return label == null || label.length() == 0 ?
+			getString("_UI_CSSInstance_type") : //$NON-NLS-1$
+			getString("_UI_CSSInstance_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 	
 
@@ -127,6 +155,9 @@
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(CSSInstance.class)) {
+			case LayersPackage.CSS_INSTANCE__STYLE:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 			case LayersPackage.CSS_INSTANCE__STYLESHEET:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/FolderItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/FolderItemProvider.java
index a70f12c..2784d86 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/FolderItemProvider.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/FolderItemProvider.java
@@ -239,6 +239,11 @@
 			(createChildParameter
 				(LayersPackage.Literals.FOLDER__ELEMENTS,
 				 LayersFactory.eINSTANCE.createCSSType()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(LayersPackage.Literals.FOLDER__ELEMENTS,
+				 LayersFactory.eINSTANCE.createCSSHideType()));
 	}
 
 }
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/LayersItemProviderAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/LayersItemProviderAdapterFactory.java
index 09ff56c..2f269e3 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/LayersItemProviderAdapterFactory.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/LayersItemProviderAdapterFactory.java
@@ -1486,6 +1486,75 @@
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CSSHidePropertySetterItemProvider cssHidePropertySetterItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCSSHidePropertySetterAdapter() {
+		if (cssHidePropertySetterItemProvider == null) {
+			cssHidePropertySetterItemProvider = new CSSHidePropertySetterItemProvider(this);
+		}
+
+		return cssHidePropertySetterItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CSSHideTypeItemProvider cssHideTypeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCSSHideTypeAdapter() {
+		if (cssHideTypeItemProvider == null) {
+			cssHideTypeItemProvider = new CSSHideTypeItemProvider(this);
+		}
+
+		return cssHideTypeItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected CSSHideInstanceItemProvider cssHideInstanceItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createCSSHideInstanceAdapter() {
+		if (cssHideInstanceItemProvider == null) {
+			cssHideInstanceItemProvider = new CSSHideInstanceItemProvider(this);
+		}
+
+		return cssHideInstanceItemProvider;
+	}
+
+	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -1645,6 +1714,9 @@
 		if (cssPropertySetterItemProvider != null) cssPropertySetterItemProvider.dispose();
 		if (cssTypeItemProvider != null) cssTypeItemProvider.dispose();
 		if (cssInstanceItemProvider != null) cssInstanceItemProvider.dispose();
+		if (cssHidePropertySetterItemProvider != null) cssHidePropertySetterItemProvider.dispose();
+		if (cssHideTypeItemProvider != null) cssHideTypeItemProvider.dispose();
+		if (cssHideInstanceItemProvider != null) cssHideInstanceItemProvider.dispose();
 	}
 
 }
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/PropertyItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/PropertyItemProvider.java
index 8ff7890..5c0ff55 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/PropertyItemProvider.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/PropertyItemProvider.java
@@ -290,6 +290,11 @@
 			(createChildParameter
 				(LayersPackage.Literals.PROPERTY__DEFAULT_VALUE,
 				 LayersFactory.eINSTANCE.createCSSInstance()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(LayersPackage.Literals.PROPERTY__DEFAULT_VALUE,
+				 LayersFactory.eINSTANCE.createCSSHideInstance()));
 	}
 
 }
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToPropertySetterItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToPropertySetterItemProvider.java
index fcbaed6..751119d 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToPropertySetterItemProvider.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToPropertySetterItemProvider.java
@@ -227,6 +227,11 @@
 			(createChildParameter
 				(LayersPackage.Literals.STRING_TO_PROPERTY_SETTER__VALUE,
 				 LayersFactory.eINSTANCE.createCSSPropertySetter()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(LayersPackage.Literals.STRING_TO_PROPERTY_SETTER__VALUE,
+				 LayersFactory.eINSTANCE.createCSSHidePropertySetter()));
 	}
 
 	/**
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeInstanceMapItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeInstanceMapItemProvider.java
index d951ca8..fc48465 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeInstanceMapItemProvider.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeInstanceMapItemProvider.java
@@ -237,6 +237,11 @@
 			(createChildParameter
 				(LayersPackage.Literals.STRING_TO_TYPE_INSTANCE_MAP__VALUE,
 				 LayersFactory.eINSTANCE.createCSSInstance()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(LayersPackage.Literals.STRING_TO_TYPE_INSTANCE_MAP__VALUE,
+				 LayersFactory.eINSTANCE.createCSSHideInstance()));
 	}
 
 	/**
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeMapItemProvider.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeMapItemProvider.java
index 23d20c3..d34a4be 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeMapItemProvider.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.edit/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/provider/StringToTypeMapItemProvider.java
@@ -232,6 +232,11 @@
 			(createChildParameter
 				(LayersPackage.Literals.STRING_TO_TYPE_MAP__VALUE,
 				 LayersFactory.eINSTANCE.createCSSType()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(LayersPackage.Literals.STRING_TO_TYPE_MAP__VALUE,
+				 LayersFactory.eINSTANCE.createCSSHideType()));
 	}
 
 	/**
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF
index 6e8a8ec..8f7ba20 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model.editor/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@
 Bundle-Name: %pluginName
 Bundle-Localization: plugin
 Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.internal.infra.gmfdiag.layers.configmodel.layersconfig.presentation.LayersConfigEditorPlugin$Implementation
+Bundle-Activator: org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.presentation.LayersEditorPlugin$Implementation
 Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.layers.model.editor;singleton:=true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.ecore b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.ecore
index 213724f..f85ed10 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.ecore
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.ecore
@@ -588,4 +588,13 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" ordered="false"
         eType="#//String"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="CSSHidePropertySetter" eSuperTypes="#//PropertySetter"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CSSHideType" eSuperTypes="#//Type"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CSSHideInstance" eSuperTypes="#//TypeInstance">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="stylesheet" ordered="false"
+        lowerBound="1" eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.gmfdiag.css.model/Model/StyleSheets.ecore#//StyleSheet"
+        containment="true"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" ordered="false"
+        eType="#//String"/>
+  </eClassifiers>
 </ecore:EPackage>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.genmodel b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.genmodel
index 69d3f74..fc13522 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.genmodel
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.genmodel
@@ -475,5 +475,12 @@
           createChild="true" ecoreFeature="ecore:EReference layers.ecore#//CSSInstance/stylesheet"/>
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute layers.ecore#//CSSInstance/style"/>
     </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="layers.ecore#//CSSHidePropertySetter"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="layers.ecore#//CSSHideType"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="layers.ecore#//CSSHideInstance">
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference layers.ecore#//CSSHideInstance/stylesheet"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute layers.ecore#//CSSHideInstance/style"/>
+    </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.uml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.uml
index 76f9a2f..6b9ff5c 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.uml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/layers.uml
@@ -1,117 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Model xmi:id="_gAOFQLcqEeK8_t7Rpq6ZJA" name="Layers" URI="">
-    <ownedComment xmi:type="uml:Comment" xmi:id="_7_dC4HbuEeOlpfB_tZS-QA" annotatedElement="_gAOFQLcqEeK8_t7Rpq6ZJA">
+    <ownedComment xmi:id="_7_dC4HbuEeOlpfB_tZS-QA" annotatedElement="_gAOFQLcqEeK8_t7Rpq6ZJA">
       <body>Start the LayesStack.&#xD;
 This method should be called after the LayersStack creation. It is not called from the constructor, because &#xD;
 the initialisation can differ if the LayersStack is created by the user or by EMF after a reloading.&#xD;
 </body>
     </ownedComment>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_uhlc8LcqEeK8_t7Rpq6ZJA">
+    <packageImport xmi:id="_uhlc8LcqEeK8_t7Rpq6ZJA">
       <importedPackage xmi:type="uml:Model" href="notation/notation.uml#_AziHILcnEeKeLJDBCBPhPw"/>
     </packageImport>
-    <packageImport xmi:type="uml:PackageImport" xmi:id="_7C5bkNBYEee6_PI6xaXFIg">
+    <packageImport xmi:id="_7C5bkNBYEee6_PI6xaXFIg">
       <importedPackage xmi:type="uml:Model" href="pathmap://STYLESHEETS/StyleSheets.uml#_MeGMUNBHEeeeIb5NcUL5SQ"/>
     </packageImport>
     <packagedElement xmi:type="uml:Class" xmi:id="_yN_dQLcqEeK8_t7Rpq6ZJA" name="LayerNamedStyle">
-      <generalization xmi:type="uml:Generalization" xmi:id="_0NyKwLcqEeK8_t7Rpq6ZJA">
+      <generalization xmi:id="_0NyKwLcqEeK8_t7Rpq6ZJA">
         <general xmi:type="uml:Class" href="notation/notation.uml#_AziHercnEeKeLJDBCBPhPw"/>
       </generalization>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_jWHHANa7EeKPiuTfpuvqHA" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" aggregation="composite" association="_jWQ4ANa7EeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_jWHHANa7EeKPiuTfpuvqHA" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" aggregation="composite" association="_jWQ4ANa7EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jWHHAda7EeKPiuTfpuvqHA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jWHHAta7EeKPiuTfpuvqHA" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_OyQ5QL1xEeKKJJ5BmR3W3Q" name="String"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_eNnjMNa7EeKPiuTfpuvqHA" name="LayerDescriptor">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_iiUlMNqCEeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" association="_iim5ENqCEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_iiUlMNqCEeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" association="_iim5ENqCEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iiUlMdqCEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iiUlMtqCEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_gT0asNa7EeKPiuTfpuvqHA" name="LayersStack">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cHaqsNbGEeKPiuTfpuvqHA" name="layers" type="_9IaAANjiEeKQqZMBCFd2Uw" aggregation="composite" association="_cHkbsNbGEeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_cHaqsNbGEeKPiuTfpuvqHA" name="layers" type="_9IaAANjiEeKQqZMBCFd2Uw" aggregation="composite" association="_cHkbsNbGEeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cHaqsdbGEeKPiuTfpuvqHA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cHaqstbGEeKPiuTfpuvqHA" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ctvjINjwEeKQqZMBCFd2Uw" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_ctvjINjwEeKQqZMBCFd2Uw" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ctvjIdjwEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ctvjItjwEeKQqZMBCFd2Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_ctvjI9jwEeKQqZMBCFd2Uw">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ct7wYNjwEeKQqZMBCFd2Uw" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_ct7wYNjwEeKQqZMBCFd2Uw" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ct7wYdjwEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ct7wYtjwEeKQqZMBCFd2Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_ct7wY9jwEeKQqZMBCFd2Uw">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_hQIS8NkhEeKQqZMBCFd2Uw" name="diagram" association="_hQam0NkhEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_hQIS8NkhEeKQqZMBCFd2Uw" name="diagram" association="_hQam0NkhEeKQqZMBCFd2Uw">
         <type xmi:type="uml:Class" href="notation/notation.uml#_AziHhrcnEeKeLJDBCBPhPw"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hQIS8dkhEeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hQIS8tkhEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_c5OEgHl8EeOlpfB_tZS-QA" name="state" visibility="public" type="_8__xgHltEeOlpfB_tZS-QA" isUnique="false">
+      <ownedAttribute xmi:id="_c5OEgHl8EeOlpfB_tZS-QA" name="state" visibility="public" type="_8__xgHltEeOlpfB_tZS-QA" isUnique="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_c5OEgXl8EeOlpfB_tZS-QA" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_c5OEgnl8EeOlpfB_tZS-QA" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_c5OEg3l8EeOlpfB_tZS-QA" name="detached" value="detached"/>
       </ownedAttribute>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_2bk1oHpGEeOlpfB_tZS-QA" name="InterfaceRealization1" client="_gT0asNa7EeKPiuTfpuvqHA" supplier="_RopgYHpGEeOlpfB_tZS-QA" contract="_RopgYHpGEeOlpfB_tZS-QA"/>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8H1xgO70EeK0p4PkXjd-_Q" name="getComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_8H1xge70EeK0p4PkXjd-_Q">
+      <interfaceRealization xmi:id="_2bk1oHpGEeOlpfB_tZS-QA" name="InterfaceRealization1" client="_gT0asNa7EeKPiuTfpuvqHA" supplier="_RopgYHpGEeOlpfB_tZS-QA" contract="_RopgYHpGEeOlpfB_tZS-QA"/>
+      <ownedOperation xmi:id="_8H1xgO70EeK0p4PkXjd-_Q" name="getComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_8H1xge70EeK0p4PkXjd-_Q">
           <body>Get the ComputePropertyValueCommands for the specified views and Property.&#xD;
 @return A list of Command allowing to get the value of the property for each view. The list contains null if no command is available for a View.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8H1xgu70EeK0p4PkXjd-_Q" name="view">
+        <ownedParameter xmi:id="_8H1xgu70EeK0p4PkXjd-_Q" name="view">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8H1xg-70EeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8H1xhO70EeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" direction="return"/>
+        <ownedParameter xmi:id="_8H1xg-70EeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_8H1xhO70EeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8IAJkO70EeK0p4PkXjd-_Q" name="getPropertiesComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_8IAJke70EeK0p4PkXjd-_Q">
+      <ownedOperation xmi:id="_8IAJkO70EeK0p4PkXjd-_Q" name="getPropertiesComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_8IAJke70EeK0p4PkXjd-_Q">
           <body>Get the ComputePropertyValueCommands for the specified view and Properties.&#xD;
 @return A list of Command allowing to get the value of the properties for the specified view. The list contains null if no command is available for a property.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8IAJku70EeK0p4PkXjd-_Q" name="view">
+        <ownedParameter xmi:id="_8IAJku70EeK0p4PkXjd-_Q" name="view">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8IAJk-70EeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" isOrdered="true" direction="inout">
+        <ownedParameter xmi:id="_8IAJk-70EeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" isOrdered="true" direction="inout">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8IAJlO70EeK0p4PkXjd-_Q" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8IAJle70EeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8IAJlu70EeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
+        <ownedParameter xmi:id="_8IAJlu70EeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8IAJl-70EeK0p4PkXjd-_Q"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8IAJmO70EeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8ILIsO70EeK0p4PkXjd-_Q" name="getViewsComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_8ILIse70EeK0p4PkXjd-_Q">
+      <ownedOperation xmi:id="_8ILIsO70EeK0p4PkXjd-_Q" name="getViewsComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_8ILIse70EeK0p4PkXjd-_Q">
           <body>Get the ComputePropertyValueCommands for the specified view and Property.&#xD;
 @return the Command allowing to get the value, or null.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8ILIsu70EeK0p4PkXjd-_Q" name="view" isOrdered="true" direction="inout">
+        <ownedParameter xmi:id="_8ILIsu70EeK0p4PkXjd-_Q" name="view" isOrdered="true" direction="inout">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8ILIs-70EeK0p4PkXjd-_Q"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8ILItO70EeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8ILIte70EeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8ILItu70EeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
+        <ownedParameter xmi:id="_8ILIte70EeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_8ILItu70EeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8ILIt-70EeK0p4PkXjd-_Q"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8ILIuO70EeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_rQGJoHbuEeOlpfB_tZS-QA" name="startAfterCreation"/>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_9n-f4HbuEeOlpfB_tZS-QA" name="attachLayers" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Go6U4HbvEeOlpfB_tZS-QA" annotatedElement="_9n-f4HbuEeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_rQGJoHbuEeOlpfB_tZS-QA" name="startAfterCreation"/>
+      <ownedOperation xmi:id="_9n-f4HbuEeOlpfB_tZS-QA" name="attachLayers" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_Go6U4HbvEeOlpfB_tZS-QA" annotatedElement="_9n-f4HbuEeOlpfB_tZS-QA">
           <body>Start the LayersStack after a reloading by EMF. This method should be explicitly called after a reloading.&#xD;
 The method usually start the layer behaviors.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_RnmmUHl8EeOlpfB_tZS-QA" name="attach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_RnmmUXl8EeOlpfB_tZS-QA" annotatedElement="_RnmmUHl8EeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_RnmmUHl8EeOlpfB_tZS-QA" name="attach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_RnmmUXl8EeOlpfB_tZS-QA" annotatedElement="_RnmmUHl8EeOlpfB_tZS-QA">
           <body>Try to attach this Layer. If successful, the state go to &quot;attached&quot;. Otherwise, an exception is thrown.&#xD;
 A Layer can be attached if its required attributes are set.&#xD;
 Required attributes:&#xD;
@@ -125,35 +125,35 @@
 If this Layer is successfully attached, then attach subLayers.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_RnmmUnl8EeOlpfB_tZS-QA" name="detach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_RnmmU3l8EeOlpfB_tZS-QA" annotatedElement="_RnmmUnl8EeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_RnmmUnl8EeOlpfB_tZS-QA" name="detach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_RnmmU3l8EeOlpfB_tZS-QA" annotatedElement="_RnmmUnl8EeOlpfB_tZS-QA">
           <body>Detach the Layer. The state go to &quot;detached&quot;.&#xD;
 Associated behavior are stopped.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_RnmmVHl8EeOlpfB_tZS-QA" name="enterAttachedState" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_RnmmVXl8EeOlpfB_tZS-QA" annotatedElement="_RnmmVHl8EeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_RnmmVHl8EeOlpfB_tZS-QA" name="enterAttachedState" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_RnmmVXl8EeOlpfB_tZS-QA" annotatedElement="_RnmmVHl8EeOlpfB_tZS-QA">
           <body>This method is called by the class immediately after entering in attached state.&#xD;
 The methodcan be used to start the layer behaviors.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_RnmmVnl8EeOlpfB_tZS-QA" name="exitAttachedState">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_RnmmV3l8EeOlpfB_tZS-QA" annotatedElement="_RnmmVnl8EeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_RnmmVnl8EeOlpfB_tZS-QA" name="exitAttachedState">
+        <ownedComment xmi:id="_RnmmV3l8EeOlpfB_tZS-QA" annotatedElement="_RnmmVnl8EeOlpfB_tZS-QA">
           <body>This method is called just before this Layer leave the attached state.&#xD;
 </body>
         </ownedComment>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_jWQ4ANa7EeKPiuTfpuvqHA" name="layerNamedStyle_layerStack_1" memberEnd="_jWQ4Ada7EeKPiuTfpuvqHA _jWHHANa7EeKPiuTfpuvqHA">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_jWQ4Ada7EeKPiuTfpuvqHA" name="layerNamedStyle" type="_yN_dQLcqEeK8_t7Rpq6ZJA" association="_jWQ4ANa7EeKPiuTfpuvqHA">
+      <ownedEnd xmi:id="_jWQ4Ada7EeKPiuTfpuvqHA" name="layerNamedStyle" type="_yN_dQLcqEeK8_t7Rpq6ZJA" association="_jWQ4ANa7EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jWQ4Ata7EeKPiuTfpuvqHA" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jWQ4A9a7EeKPiuTfpuvqHA" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_51zAINa7EeKPiuTfpuvqHA" name="AbstractLayer" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="__ujk4NjMEeKgkM6XJF9t4A" general="_9IaAANjiEeKQqZMBCFd2Uw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_5YkcINa8EeKPiuTfpuvqHA" name="propertyValues" type="_AjTZ8Na8EeKPiuTfpuvqHA" isOrdered="true" isUnique="false" association="_5YuNINa8EeKPiuTfpuvqHA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_yAlZYNkWEeKQqZMBCFd2Uw">
+      <generalization xmi:id="__ujk4NjMEeKgkM6XJF9t4A" general="_9IaAANjiEeKQqZMBCFd2Uw"/>
+      <ownedAttribute xmi:id="_5YkcINa8EeKPiuTfpuvqHA" name="propertyValues" type="_AjTZ8Na8EeKPiuTfpuvqHA" isOrdered="true" isUnique="false" association="_5YuNINa8EeKPiuTfpuvqHA">
+        <ownedComment xmi:id="_yAlZYNkWEeKQqZMBCFd2Uw">
           <body>An ordered list of references onvalue instances.&#xD;
 This list is used to access instances by indexes.&#xD;
 Elements are set in the list when they are attached to the layer. A null element mean that the property at the specified index is not attached.&#xD;
@@ -162,78 +162,78 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5YkcIda8EeKPiuTfpuvqHA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5YkcIta8EeKPiuTfpuvqHA" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_A1bYQNjLEeKgkM6XJF9t4A" name="propertyValueMap" type="_vMMQsNjKEeKgkM6XJF9t4A" aggregation="composite" association="_A1nlgNjLEeKgkM6XJF9t4A">
+      <ownedAttribute xmi:id="_A1bYQNjLEeKgkM6XJF9t4A" name="propertyValueMap" type="_vMMQsNjKEeKgkM6XJF9t4A" aggregation="composite" association="_A1nlgNjLEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A1bYQdjLEeKgkM6XJF9t4A"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A1bYQtjLEeKgkM6XJF9t4A" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_LA8SkNjiEeKQqZMBCFd2Uw" name="layerDescriptor" type="_eNnjMNa7EeKPiuTfpuvqHA" association="_LBIf0NjiEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_LA8SkNjiEeKQqZMBCFd2Uw" name="layerDescriptor" type="_eNnjMNa7EeKPiuTfpuvqHA" association="_LBIf0NjiEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LA8SkdjiEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LA8SktjiEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_3qy14NjkEeKQqZMBCFd2Uw" name="views" association="_3q_DINjkEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_3qy14NjkEeKQqZMBCFd2Uw" name="views" association="_3q_DINjkEeKQqZMBCFd2Uw">
         <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3qy14djkEeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3qy14tjkEeKQqZMBCFd2Uw" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_rEPKgO-MEeK0p4PkXjd-_Q" name="attachedProperties" type="_-vaacNa7EeKPiuTfpuvqHA" aggregation="composite" isDerived="true" association="_rEb-0O-MEeK0p4PkXjd-_Q">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_0zHqoO-MEeK0p4PkXjd-_Q">
+      <ownedAttribute xmi:id="_rEPKgO-MEeK0p4PkXjd-_Q" name="attachedProperties" type="_-vaacNa7EeKPiuTfpuvqHA" aggregation="composite" isDerived="true" association="_rEb-0O-MEeK0p4PkXjd-_Q">
+        <ownedComment xmi:id="_0zHqoO-MEeK0p4PkXjd-_Q">
           <body>Return the list of Property (descriptors) attached to the Layer.&#xD;
 This is a derived transient list.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rEPKge-MEeK0p4PkXjd-_Q"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rEPKgu-MEeK0p4PkXjd-_Q" value="*"/>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_gfah8OKIEeKOWoLMe41Aew" name="addPropertyInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_zzrA4OKIEeKOWoLMe41Aew">
+      <ownedOperation xmi:id="_gfah8OKIEeKOWoLMe41Aew" name="addPropertyInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_zzrA4OKIEeKOWoLMe41Aew">
           <body>Add the specified property to the map of property.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ocu90OKIEeKOWoLMe41Aew" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_9j3nQOKWEeKOWoLMe41Aew" name="result" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_ocu90OKIEeKOWoLMe41Aew" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_9j3nQOKWEeKOWoLMe41Aew" name="result" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_sJkb8OKIEeKOWoLMe41Aew" name="removePropertyInstance">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_sJkb8eKIEeKOWoLMe41Aew" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+      <ownedOperation xmi:id="_sJkb8OKIEeKOWoLMe41Aew" name="removePropertyInstance">
+        <ownedParameter xmi:id="_sJkb8eKIEeKOWoLMe41Aew" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ldtfkOKWEeKOWoLMe41Aew" name="getPropertyInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ldtfkeKWEeKOWoLMe41Aew">
+      <ownedOperation xmi:id="_ldtfkOKWEeKOWoLMe41Aew" name="getPropertyInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_ldtfkeKWEeKOWoLMe41Aew">
           <body>Add the specified property to the map of property.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ldtfkuKWEeKOWoLMe41Aew" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_voU5cOKWEeKOWoLMe41Aew" name="result" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_ldtfkuKWEeKOWoLMe41Aew" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_voU5cOKWEeKOWoLMe41Aew" name="result" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_IR-vwOKXEeKOWoLMe41Aew" name="getPropertyInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_IR-vweKXEeKOWoLMe41Aew">
+      <ownedOperation xmi:id="_IR-vwOKXEeKOWoLMe41Aew" name="getPropertyInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_IR-vweKXEeKOWoLMe41Aew">
           <body>Add the specified property to the map of property.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_IR-vwuKXEeKOWoLMe41Aew" name="property" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_IR-vw-KXEeKOWoLMe41Aew" name="result" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_IR-vwuKXEeKOWoLMe41Aew" name="property" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+        <ownedParameter xmi:id="_IR-vw-KXEeKOWoLMe41Aew" name="result" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_-vaacNa7EeKPiuTfpuvqHA" name="Property">
-      <generalization xmi:type="uml:Generalization" xmi:id="_YRb5sNhdEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_L2FowNhcEeKgkM6XJF9t4A" name="type" type="_EoL3oNhcEeKgkM6XJF9t4A" association="_L2X8oNhcEeKgkM6XJF9t4A">
+      <generalization xmi:id="_YRb5sNhdEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
+      <ownedAttribute xmi:id="_L2FowNhcEeKgkM6XJF9t4A" name="type" type="_EoL3oNhcEeKgkM6XJF9t4A" association="_L2X8oNhcEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L2FowdhcEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L2FowthcEeKgkM6XJF9t4A" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_O62aQNhcEeKgkM6XJF9t4A" name="defaultValue" type="_AjTZ8Na8EeKPiuTfpuvqHA" aggregation="composite" association="_O7IuINhcEeKgkM6XJF9t4A">
+      <ownedAttribute xmi:id="_O62aQNhcEeKgkM6XJF9t4A" name="defaultValue" type="_AjTZ8Na8EeKPiuTfpuvqHA" aggregation="composite" association="_O7IuINhcEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O62aQdhcEeKgkM6XJF9t4A"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O62aQthcEeKgkM6XJF9t4A" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sdWO0NhcEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_sdWO0NhcEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_utwLMNhcEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ut8YcNhcEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_uunG0NhcEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_hT9qINhdEeKgkM6XJF9t4A" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_hT9qINhdEeKgkM6XJF9t4A" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_j92dgNhdEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_j-CqwNhdEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_j-tZINhdEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HjktUO3qEeKwLp35IbAIig" name="index" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_OHvk8O3qEeKwLp35IbAIig">
+      <ownedAttribute xmi:id="_HjktUO3qEeKwLp35IbAIig" name="index" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+        <ownedComment xmi:id="_OHvk8O3qEeKwLp35IbAIig">
           <body>Index of the property in the arrays of the application.&#xD;
 The index is used by the application to access property in arrays.&#xD;
 Each property has a unique index. This is the application responsability to maintain the index.&#xD;
@@ -246,45 +246,45 @@
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LHPoYO3qEeKwLp35IbAIig" value="1"/>
         <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_Bic9oO-FEeK0p4PkXjd-_Q" value="-1"/>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_9LLeENhcEeKgkM6XJF9t4A" name="createInstance" raisedException="_KG7HMNxMEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_HPKEcNhdEeKgkM6XJF9t4A" name="return" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
+      <ownedOperation xmi:id="_9LLeENhcEeKgkM6XJF9t4A" name="createInstance" raisedException="_KG7HMNxMEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_HPKEcNhdEeKgkM6XJF9t4A" name="return" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_AjTZ8Na8EeKPiuTfpuvqHA" name="TypeInstance" isAbstract="true">
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_g2QFQO8YEeK0p4PkXjd-_Q" name="InterfaceRealization1" client="_AjTZ8Na8EeKPiuTfpuvqHA" supplier="_XZJOcO8UEeK0p4PkXjd-_Q" contract="_XZJOcO8UEeK0p4PkXjd-_Q"/>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ZFFKAEczEeOEBJ2PxFQgyQ" name="setValueFromString">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ghl-4EczEeOEBJ2PxFQgyQ">
+      <interfaceRealization xmi:id="_g2QFQO8YEeK0p4PkXjd-_Q" name="InterfaceRealization1" client="_AjTZ8Na8EeKPiuTfpuvqHA" supplier="_XZJOcO8UEeK0p4PkXjd-_Q" contract="_XZJOcO8UEeK0p4PkXjd-_Q"/>
+      <ownedOperation xmi:id="_ZFFKAEczEeOEBJ2PxFQgyQ" name="setValueFromString">
+        <ownedComment xmi:id="_ghl-4EczEeOEBJ2PxFQgyQ">
           <body>Set the value of the instance from the porvided String.&#xD;
 Actually, only simple values are accepted.&#xD;
 TODO Allows complexe values, using a well defined syntax ?</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_fODTYEczEeOEBJ2PxFQgyQ" name="value" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+        <ownedParameter xmi:id="_fODTYEczEeOEBJ2PxFQgyQ" name="value" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_oJwUAEc8EeOEBJ2PxFQgyQ" name="setValueFromInstance">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_tVpxIEc8EeOEBJ2PxFQgyQ" name="value" type="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedOperation xmi:id="_oJwUAEc8EeOEBJ2PxFQgyQ" name="setValueFromInstance">
+        <ownedParameter xmi:id="_tVpxIEc8EeOEBJ2PxFQgyQ" name="value" type="_AjTZ8Na8EeKPiuTfpuvqHA"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_SuHkkNa8EeKPiuTfpuvqHA" name="int"/>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_TqqsYNa8EeKPiuTfpuvqHA" name="boolean"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_5YuNINa8EeKPiuTfpuvqHA" name="layer_propertyValue_1" memberEnd="_5YuNIda8EeKPiuTfpuvqHA _5YkcINa8EeKPiuTfpuvqHA">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_5YuNIda8EeKPiuTfpuvqHA" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_5YuNINa8EeKPiuTfpuvqHA">
+      <ownedEnd xmi:id="_5YuNIda8EeKPiuTfpuvqHA" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_5YuNINa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5YuNIta8EeKPiuTfpuvqHA" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5YuNI9a8EeKPiuTfpuvqHA" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_cHkbsNbGEeKPiuTfpuvqHA" name="layersStack_layer_1" memberEnd="_cHkbsdbGEeKPiuTfpuvqHA _cHaqsNbGEeKPiuTfpuvqHA">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_cHkbsdbGEeKPiuTfpuvqHA" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" association="_cHkbsNbGEeKPiuTfpuvqHA">
+      <ownedEnd xmi:id="_cHkbsdbGEeKPiuTfpuvqHA" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" association="_cHkbsNbGEeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cHkbstbGEeKPiuTfpuvqHA" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cHkbs9bGEeKPiuTfpuvqHA" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_fAmyUNhbEeKgkM6XJF9t4A" name="Folder">
-      <generalization xmi:type="uml:Generalization" xmi:id="_6l23ENhbEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_js_o8NhbEeKgkM6XJF9t4A" name="elements" type="_ggM80NhbEeKgkM6XJF9t4A" aggregation="composite" association="_jtR80NhbEeKgkM6XJF9t4A">
+      <generalization xmi:id="_6l23ENhbEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
+      <ownedAttribute xmi:id="_js_o8NhbEeKgkM6XJF9t4A" name="elements" type="_ggM80NhbEeKgkM6XJF9t4A" aggregation="composite" association="_jtR80NhbEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_js_o8dhbEeKgkM6XJF9t4A"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_js_o8thbEeKgkM6XJF9t4A" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pSIZkNhoEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_pSIZkNhoEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_r_ILUNhoEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_r_afMNhoEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_sALUMNhoEeKgkM6XJF9t4A">
@@ -294,74 +294,74 @@
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ggM80NhbEeKgkM6XJF9t4A" name="FolderElement" isAbstract="true"/>
     <packagedElement xmi:type="uml:Association" xmi:id="_jtR80NhbEeKgkM6XJF9t4A" name="package_packageableElement_1" memberEnd="_jtR80dhbEeKgkM6XJF9t4A _js_o8NhbEeKgkM6XJF9t4A">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_jtR80dhbEeKgkM6XJF9t4A" name="folder" type="_fAmyUNhbEeKgkM6XJF9t4A" association="_jtR80NhbEeKgkM6XJF9t4A">
+      <ownedEnd xmi:id="_jtR80dhbEeKgkM6XJF9t4A" name="folder" type="_fAmyUNhbEeKgkM6XJF9t4A" association="_jtR80NhbEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_jtR80thbEeKgkM6XJF9t4A"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_jtR809hbEeKgkM6XJF9t4A" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_EoL3oNhcEeKgkM6XJF9t4A" name="Type" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_5T84YNhdEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_kg7x4NhcEeKgkM6XJF9t4A" name="metamodel" type="_I3wPYNhcEeKgkM6XJF9t4A" association="_khB4gNhcEeKgkM6XJF9t4A">
+      <generalization xmi:id="_5T84YNhdEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
+      <ownedAttribute xmi:id="_kg7x4NhcEeKgkM6XJF9t4A" name="metamodel" type="_I3wPYNhcEeKgkM6XJF9t4A" association="_khB4gNhcEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kg7x4dhcEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kg7x4thcEeKgkM6XJF9t4A" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_oTs44NhcEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_oTs44NhcEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rDya4NhcEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rD-oINhcEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_rEpWgNhcEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_kquxoNhdEeKgkM6XJF9t4A" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_kquxoNhdEeKgkM6XJF9t4A" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_m6-9ANhdEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_m7RQ4NhdEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_m77_QNhdEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_VRDxkNhgEeKgkM6XJF9t4A" name="createInstance">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_VRDxkdhgEeKgkM6XJF9t4A" name="return" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
+      <ownedOperation xmi:id="_VRDxkNhgEeKgkM6XJF9t4A" name="createInstance">
+        <ownedParameter xmi:id="_VRDxkdhgEeKgkM6XJF9t4A" name="return" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_I3wPYNhcEeKgkM6XJF9t4A" name="Metamodel">
-      <generalization xmi:type="uml:Generalization" xmi:id="_7uWeQNhdEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_r6aEYNhdEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <generalization xmi:id="_7uWeQNhdEeKgkM6XJF9t4A" general="_ggM80NhbEeKgkM6XJF9t4A"/>
+      <ownedAttribute xmi:id="_r6aEYNhdEeKgkM6XJF9t4A" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_u3drYNhdEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_u3p4oNhdEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_u4UnANhdEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_vhv-gNhdEeKgkM6XJF9t4A" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_vhv-gNhdEeKgkM6XJF9t4A" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_xtI4ANhdEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xtbL4NhdEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_xuF6QNhdEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_i5nR8NhgEeKgkM6XJF9t4A" name="nsuri" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_i5nR8NhgEeKgkM6XJF9t4A" name="nsuri" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_llQY0NhgEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_llcmENhgEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_lmHUcNhgEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_mR_jANhgEeKgkM6XJF9t4A" name="pluginID" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_mR_jANhgEeKgkM6XJF9t4A" name="pluginID" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_o2xM4NhgEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_o3DgwNhgEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_o3uPINhgEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_pkeAYNhgEeKgkM6XJF9t4A" name="ePackageInstanceName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_pkeAYNhgEeKgkM6XJF9t4A" name="ePackageInstanceName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uXcAINhgEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uXoNYNhgEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_uYZCYNhgEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="__MsGANhgEeKgkM6XJF9t4A" name="isTypeValid" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Eu5xYNhhEeKgkM6XJF9t4A">
+      <ownedAttribute xmi:id="__MsGANhgEeKgkM6XJF9t4A" name="isTypeValid" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
+        <ownedComment xmi:id="_Eu5xYNhhEeKgkM6XJF9t4A">
           <body>Flag indicating if the type is valide, ie if the type can be instancied with the provided values.&#xD;
 This flag is set automatically by the class. The class listen to the modifications of nsuri, pluginID and ePAckageInstance. &#xD;
 When one of these property is modified, the class check if the type can be instanciated. Set the flag accordingly.</body>
@@ -372,24 +372,24 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_K3KQcNheEeKgkM6XJF9t4A" name="getEPackage">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_SDWKUNheEeKgkM6XJF9t4A" name="return" type="_lVnFMNheEeKgkM6XJF9t4A" direction="return"/>
+      <ownedOperation xmi:id="_K3KQcNheEeKgkM6XJF9t4A" name="getEPackage">
+        <ownedParameter xmi:id="_SDWKUNheEeKgkM6XJF9t4A" name="return" type="_lVnFMNheEeKgkM6XJF9t4A" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_L2X8oNhcEeKgkM6XJF9t4A" name="propertyDescriptor_type_1" memberEnd="_L2X8odhcEeKgkM6XJF9t4A _L2FowNhcEeKgkM6XJF9t4A">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_L2X8odhcEeKgkM6XJF9t4A" name="propertyDescriptor" type="_-vaacNa7EeKPiuTfpuvqHA" association="_L2X8oNhcEeKgkM6XJF9t4A">
+      <ownedEnd xmi:id="_L2X8odhcEeKgkM6XJF9t4A" name="propertyDescriptor" type="_-vaacNa7EeKPiuTfpuvqHA" association="_L2X8oNhcEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_L2X8othcEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_L2X8o9hcEeKgkM6XJF9t4A" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_O7IuINhcEeKgkM6XJF9t4A" name="propertyDescriptor_propertyValue_1" memberEnd="_O7IuIdhcEeKgkM6XJF9t4A _O62aQNhcEeKgkM6XJF9t4A">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_O7IuIdhcEeKgkM6XJF9t4A" name="propertyDescriptor" type="_-vaacNa7EeKPiuTfpuvqHA" association="_O7IuINhcEeKgkM6XJF9t4A">
+      <ownedEnd xmi:id="_O7IuIdhcEeKgkM6XJF9t4A" name="propertyDescriptor" type="_-vaacNa7EeKPiuTfpuvqHA" association="_O7IuINhcEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_O7IuIthcEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_O7IuI9hcEeKgkM6XJF9t4A" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_khB4gNhcEeKgkM6XJF9t4A" name="type_metamodel_1" memberEnd="_khB4gdhcEeKgkM6XJF9t4A _kg7x4NhcEeKgkM6XJF9t4A">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_khB4gdhcEeKgkM6XJF9t4A" name="type" type="_J6C5MNhkEeKgkM6XJF9t4A" association="_khB4gNhcEeKgkM6XJF9t4A">
+      <ownedEnd xmi:id="_khB4gdhcEeKgkM6XJF9t4A" name="type" type="_J6C5MNhkEeKgkM6XJF9t4A" association="_khB4gNhcEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_khB4gthcEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_khB4g9hcEeKgkM6XJF9t4A" value="1"/>
       </ownedEnd>
@@ -397,8 +397,8 @@
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_c1QNsNheEeKgkM6XJF9t4A" name="Object"/>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_lVnFMNheEeKgkM6XJF9t4A" name="EPackage"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_6RrIENhhEeKgkM6XJF9t4A" name="IntInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_g5ap4NhiEeKgkM6XJF9t4A" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_HJX90NhjEeKgkM6XJF9t4A" name="value" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <generalization xmi:id="_g5ap4NhiEeKgkM6XJF9t4A" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_HJX90NhjEeKgkM6XJF9t4A" name="value" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_kY2vwNhjEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_kZC9ANhjEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_kZtrYNhjEeKgkM6XJF9t4A">
@@ -407,8 +407,8 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_-yuRYNhhEeKgkM6XJF9t4A" name="BooleanInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_klghINhiEeKgkM6XJF9t4A" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_lMfMINhjEeKgkM6XJF9t4A" name="value" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
+      <generalization xmi:id="_klghINhiEeKgkM6XJF9t4A" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_lMfMINhjEeKgkM6XJF9t4A" name="value" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ngE_YNhjEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ngRMoNhjEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_ng77ANhjEeKgkM6XJF9t4A">
@@ -417,8 +417,8 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_Cww0QNhiEeKgkM6XJF9t4A" name="StringInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_mlgC8NhiEeKgkM6XJF9t4A" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_oRNhYNhjEeKgkM6XJF9t4A" name="value" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <generalization xmi:id="_mlgC8NhiEeKgkM6XJF9t4A" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_oRNhYNhjEeKgkM6XJF9t4A" name="value" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_qxBywNhjEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_qxOAANhjEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_qx4uYNhjEeKgkM6XJF9t4A">
@@ -427,22 +427,22 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_6xEH4NhjEeKgkM6XJF9t4A" name="IntType">
-      <generalization xmi:type="uml:Generalization" xmi:id="_n3p8cNhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_n3p8cNhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="__iczQNhjEeKgkM6XJF9t4A" name="BooleanType">
-      <generalization xmi:type="uml:Generalization" xmi:id="_rgmZENhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_rgmZENhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_E308gNhkEeKgkM6XJF9t4A" name="StringType">
-      <generalization xmi:type="uml:Generalization" xmi:id="_tdBpgNhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_tdBpgNhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_J6C5MNhkEeKgkM6XJF9t4A" name="CustomType">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_08frwNhkEeKgkM6XJF9t4A">
+      <ownedComment xmi:id="_08frwNhkEeKgkM6XJF9t4A">
         <body>A CustomType is used to refer to a type defined in an external metamodel.&#xD;
 The classifier specify the name of the type defined in a ECore metamodel. The metamodel property is used&#xD;
 to specify the ECore metamodel containing  the type referenced.</body>
       </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_wLYGINhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_U0l7MNhkEeKgkM6XJF9t4A" name="classifier" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <generalization xmi:id="_wLYGINhkEeKgkM6XJF9t4A" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <ownedAttribute xmi:id="_U0l7MNhkEeKgkM6XJF9t4A" name="classifier" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_V7OMENhkEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_V7aZUNhkEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_V8FHsNhkEeKgkM6XJF9t4A">
@@ -451,14 +451,14 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_vMMQsNjKEeKgkM6XJF9t4A" name="StringToTypeInstanceMap">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_1B8jINjKEeKgkM6XJF9t4A" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_1B8jINjKEeKgkM6XJF9t4A" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3hw0gNjKEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3h9BwNjKEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_3it2wNjKEeKgkM6XJF9t4A">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_4f0_QNjKEeKgkM6XJF9t4A" name="value" visibility="public" type="_AjTZ8Na8EeKPiuTfpuvqHA" aggregation="composite">
+      <ownedAttribute xmi:id="_4f0_QNjKEeKgkM6XJF9t4A" name="value" visibility="public" type="_AjTZ8Na8EeKPiuTfpuvqHA" aggregation="composite">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8Z8rcNjKEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8aJfwNjKEeKgkM6XJF9t4A" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_8a6UwNjKEeKgkM6XJF9t4A">
@@ -467,106 +467,106 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_A1nlgNjLEeKgkM6XJF9t4A" name="layer_stringToTypeInstanceMap_1" memberEnd="_A1nlgdjLEeKgkM6XJF9t4A _A1bYQNjLEeKgkM6XJF9t4A">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_A1nlgdjLEeKgkM6XJF9t4A" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_A1nlgNjLEeKgkM6XJF9t4A">
+      <ownedEnd xmi:id="_A1nlgdjLEeKgkM6XJF9t4A" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_A1nlgNjLEeKgkM6XJF9t4A">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_A1nlgtjLEeKgkM6XJF9t4A" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_A1nlg9jLEeKgkM6XJF9t4A" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_DN8s0NjhEeKQqZMBCFd2Uw" name="LayersStackApplication">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_K6hW8NjhEeKQqZMBCFd2Uw">
+      <ownedComment xmi:id="_K6hW8NjhEeKQqZMBCFd2Uw">
         <body>This represent the root of LayerStack.&#xD;
 All model with LayerStack has an instance of this class as root.&#xD;
 This class allows to find the associated registries : PropertyRegistry, LayerDescriptorRegistry</body>
       </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_bwKaMNjoEeKQqZMBCFd2Uw" general="_ggM80NhbEeKgkM6XJF9t4A"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_aj6GoNjhEeKQqZMBCFd2Uw" name="layersStacks" type="_gT0asNa7EeKPiuTfpuvqHA" aggregation="composite" association="_akGT4NjhEeKQqZMBCFd2Uw">
+      <generalization xmi:id="_bwKaMNjoEeKQqZMBCFd2Uw" general="_ggM80NhbEeKgkM6XJF9t4A"/>
+      <ownedAttribute xmi:id="_aj6GoNjhEeKQqZMBCFd2Uw" name="layersStacks" type="_gT0asNa7EeKPiuTfpuvqHA" aggregation="composite" association="_akGT4NjhEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aj6GodjhEeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aj6GotjhEeKQqZMBCFd2Uw" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_DYWsYNjpEeKQqZMBCFd2Uw" name="layerStackRegistry" type="_uMYd4NjoEeKQqZMBCFd2Uw" aggregation="composite" association="_DYi5oNjpEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_DYWsYNjpEeKQqZMBCFd2Uw" name="layerStackRegistry" type="_uMYd4NjoEeKQqZMBCFd2Uw" aggregation="composite" association="_DYi5oNjpEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DYWsYdjpEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DYWsYtjpEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_EEc9YNjpEeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" aggregation="composite" association="_EEjEANjpEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_EEc9YNjpEeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" aggregation="composite" association="_EEjEANjpEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EEc9YdjpEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EEc9YtjpEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_5rptsNqBEeKQqZMBCFd2Uw" name="layerDescriptorRegistry" type="_zYGE8NqBEeKQqZMBCFd2Uw" aggregation="composite" association="_5r8BkNqBEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_5rptsNqBEeKQqZMBCFd2Uw" name="layerDescriptorRegistry" type="_zYGE8NqBEeKQqZMBCFd2Uw" aggregation="composite" association="_5r8BkNqBEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5rptsdqBEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5rptstqBEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_wRCXENt2EeKQqZMBCFd2Uw" name="factory" type="_IOwJ4Nt2EeKQqZMBCFd2Uw" aggregation="composite" association="_wROkUNt2EeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_wRCXENt2EeKQqZMBCFd2Uw" name="factory" type="_IOwJ4Nt2EeKQqZMBCFd2Uw" aggregation="composite" association="_wROkUNt2EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wRCXEdt2EeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wRCXEtt2EeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_3F7c4O3uEeKwLp35IbAIig" name="propertySetterRegistry" type="_q85OgO3uEeKwLp35IbAIig" aggregation="composite" association="_3GHqIO3uEeKwLp35IbAIig">
+      <ownedAttribute xmi:id="_3F7c4O3uEeKwLp35IbAIig" name="propertySetterRegistry" type="_q85OgO3uEeKwLp35IbAIig" aggregation="composite" association="_3GHqIO3uEeKwLp35IbAIig">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3F7c4e3uEeKwLp35IbAIig"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3F7c4u3uEeKwLp35IbAIig" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_FDc3EAxAEeOjX-JbGFEH7w" name="layerOperatorDescriptorRegistry" type="_T5we4AkdEeOnVqX9VcfeWQ" aggregation="composite" association="_FDpEUAxAEeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="_FDc3EAxAEeOjX-JbGFEH7w" name="layerOperatorDescriptorRegistry" type="_T5we4AkdEeOnVqX9VcfeWQ" aggregation="composite" association="_FDpEUAxAEeOjX-JbGFEH7w">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FDc3EQxAEeOjX-JbGFEH7w"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FDc3EgxAEeOjX-JbGFEH7w" value="1"/>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_jo2R4NjhEeKQqZMBCFd2Uw" name="getLayersStackFor">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_3TxkYNjhEeKQqZMBCFd2Uw" name="diagram">
+      <ownedOperation xmi:id="_jo2R4NjhEeKQqZMBCFd2Uw" name="getLayersStackFor">
+        <ownedParameter xmi:id="_3TxkYNjhEeKQqZMBCFd2Uw" name="diagram">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHhrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8X93ANjhEeKQqZMBCFd2Uw" name="return" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_8X93ANjhEeKQqZMBCFd2Uw" name="return" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_8QO3kN0kEeKwptaAAanMDg" name="removeLayersStackFor">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_8QO3kd0kEeKwptaAAanMDg" name="diagram">
+      <ownedOperation xmi:id="_8QO3kN0kEeKwptaAAanMDg" name="removeLayersStackFor">
+        <ownedParameter xmi:id="_8QO3kd0kEeKwptaAAanMDg" name="diagram">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHhrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_H4FrgN0lEeKwptaAAanMDg" name="isLayersStackAttachedFor">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_H4Frgd0lEeKwptaAAanMDg" name="diagram">
+      <ownedOperation xmi:id="_H4FrgN0lEeKwptaAAanMDg" name="isLayersStackAttachedFor">
+        <ownedParameter xmi:id="_H4Frgd0lEeKwptaAAanMDg" name="diagram">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHhrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_H4Frgt0lEeKwptaAAanMDg" name="return" type="_TqqsYNa8EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_H4Frgt0lEeKwptaAAanMDg" name="return" type="_TqqsYNa8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ZJ8N0N0lEeKwptaAAanMDg" name="createLayersStackFor">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZJ8N0d0lEeKwptaAAanMDg" name="diagram">
+      <ownedOperation xmi:id="_ZJ8N0N0lEeKwptaAAanMDg" name="createLayersStackFor">
+        <ownedParameter xmi:id="_ZJ8N0d0lEeKwptaAAanMDg" name="diagram">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHhrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZJ8N0t0lEeKwptaAAanMDg" name="return" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_ZJ8N0t0lEeKwptaAAanMDg" name="return" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ZdgqEN0lEeKwptaAAanMDg" name="lookupLayersStackFor" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZdgqEd0lEeKwptaAAanMDg" name="diagram">
+      <ownedOperation xmi:id="_ZdgqEN0lEeKwptaAAanMDg" name="lookupLayersStackFor" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_ZdgqEd0lEeKwptaAAanMDg" name="diagram">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHhrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZdgqEt0lEeKwptaAAanMDg" name="return" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_ZdgqEt0lEeKwptaAAanMDg" name="return" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_akGT4NjhEeKQqZMBCFd2Uw" name="layersStackApplication_layersStack_1" memberEnd="_akGT4djhEeKQqZMBCFd2Uw _aj6GoNjhEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_akGT4djhEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_akGT4NjhEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_akGT4djhEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_akGT4NjhEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_akGT4tjhEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_akGT49jhEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_LBIf0NjiEeKQqZMBCFd2Uw" name="layer_layerDescriptor_1" memberEnd="_LBIf0djiEeKQqZMBCFd2Uw _LA8SkNjiEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_LBIf0djiEeKQqZMBCFd2Uw" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_LBIf0NjiEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_LBIf0djiEeKQqZMBCFd2Uw" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_LBIf0NjiEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LBIf0tjiEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LBIf09jiEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_9IaAANjiEeKQqZMBCFd2Uw" name="LayerExpression" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_18JYYNt5EeKwptaAAanMDg" general="_325AENt0EeKQqZMBCFd2Uw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_AWx_gNjuEeKQqZMBCFd2Uw" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <generalization xmi:id="_18JYYNt5EeKwptaAAanMDg" general="_325AENt0EeKQqZMBCFd2Uw"/>
+      <ownedAttribute xmi:id="_AWx_gNjuEeKQqZMBCFd2Uw" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AWx_gdjuEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AWx_gtjuEeKQqZMBCFd2Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_AWx_g9juEeKQqZMBCFd2Uw">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_AW-MwNjuEeKQqZMBCFd2Uw" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_AW-MwNjuEeKQqZMBCFd2Uw" name="description" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AW-MwdjuEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AW-MwtjuEeKQqZMBCFd2Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_AW-Mw9juEeKQqZMBCFd2Uw">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_mCUIAAxEEeOjX-JbGFEH7w" name="isLayerEnabledInternal" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA" isReadOnly="true" isDerived="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_unSZwAxEEeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="_mCUIAAxEEeOjX-JbGFEH7w" name="isLayerEnabledInternal" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA" isReadOnly="true" isDerived="true">
+        <ownedComment xmi:id="_unSZwAxEEeOjX-JbGFEH7w">
           <body>Return true if the Layer is enabled (participate to the diagram), or false if it is not enabled.&#xD;
 This is a derieved property.&#xD;
 This flag is used internally to check if the layer is enabled. It is used by operation computing command. If the flag return false, no command is returned.&#xD;
@@ -578,8 +578,8 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_qaozIAxEEeOjX-JbGFEH7w" name="isLayerEnabled" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_-aGyQAxEEeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="_qaozIAxEEeOjX-JbGFEH7w" name="isLayerEnabled" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
+        <ownedComment xmi:id="_-aGyQAxEEeOjX-JbGFEH7w">
           <body>Is the user enabled this layer ?&#xD;
 Return true if the user enable this layer, false if the user disable this layer.&#xD;
 When the user disable a layer, the isEnable property also return false.</body>
@@ -588,8 +588,8 @@
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_tBHGIAxEEeOjX-JbGFEH7w" value="1"/>
         <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_hvDRIAxGEeOjX-JbGFEH7w" value="true"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_xcbgQGQ7EeOlpfB_tZS-QA" name="isBranchEnabled" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_egbT0GQ8EeOlpfB_tZS-QA" annotatedElement="_xcbgQGQ7EeOlpfB_tZS-QA">
+      <ownedAttribute xmi:id="_xcbgQGQ7EeOlpfB_tZS-QA" name="isBranchEnabled" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
+        <ownedComment xmi:id="_egbT0GQ8EeOlpfB_tZS-QA" annotatedElement="_xcbgQGQ7EeOlpfB_tZS-QA">
           <body>Is the branch from this node to the root enabled ?&#xD;
 A branch is enabled if all node of the branch are enabled.&#xD;
 In other world, if an ancestor node is disable, the branch is disabled.&#xD;
@@ -599,83 +599,83 @@
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_xcbgQ2Q7EeOlpfB_tZS-QA" value="1"/>
         <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_xcbgRGQ7EeOlpfB_tZS-QA" value="true"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_PznBcGQ5EeOlpfB_tZS-QA" name="owningLayersStack" type="_gT0asNa7EeKPiuTfpuvqHA" association="_PznBc2Q5EeOlpfB_tZS-QA">
+      <ownedAttribute xmi:id="_PznBcGQ5EeOlpfB_tZS-QA" name="owningLayersStack" type="_gT0asNa7EeKPiuTfpuvqHA" association="_PznBc2Q5EeOlpfB_tZS-QA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PznBcWQ5EeOlpfB_tZS-QA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PznBcmQ5EeOlpfB_tZS-QA" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_E2soAHluEeOlpfB_tZS-QA" name="state" visibility="public" type="_8__xgHltEeOlpfB_tZS-QA" isUnique="false">
+      <ownedAttribute xmi:id="_E2soAHluEeOlpfB_tZS-QA" name="state" visibility="public" type="_8__xgHltEeOlpfB_tZS-QA" isUnique="false">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ISCtgHluEeOlpfB_tZS-QA" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ISCtgXluEeOlpfB_tZS-QA" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_QPjWoHluEeOlpfB_tZS-QA" name="detached" value="detached"/>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_VdSFsO7HEeK0p4PkXjd-_Q" name="getComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_CI71QO7JEeK0p4PkXjd-_Q">
+      <ownedOperation xmi:id="_VdSFsO7HEeK0p4PkXjd-_Q" name="getComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_CI71QO7JEeK0p4PkXjd-_Q">
           <body>Get the ComputePropertyValueCommands for the specified views and Property.&#xD;
 @return A list of Command allowing to get the value of the property for each view. The list contains null if no command is available for a View.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_kPANkO7HEeK0p4PkXjd-_Q" name="view">
+        <ownedParameter xmi:id="_kPANkO7HEeK0p4PkXjd-_Q" name="view">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_pVVOMO7HEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_vwTtkO7HEeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" direction="return"/>
+        <ownedParameter xmi:id="_pVVOMO7HEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_vwTtkO7HEeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_xfz8UO7HEeK0p4PkXjd-_Q" name="getViewsComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_QUzeEO7JEeK0p4PkXjd-_Q">
+      <ownedOperation xmi:id="_xfz8UO7HEeK0p4PkXjd-_Q" name="getViewsComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_QUzeEO7JEeK0p4PkXjd-_Q">
           <body>Get the ComputePropertyValueCommands for the specified view and Property.&#xD;
 @return the Command allowing to get the value, or null.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xfz8Ue7HEeK0p4PkXjd-_Q" name="view" isOrdered="true" direction="inout">
+        <ownedParameter xmi:id="_xfz8Ue7HEeK0p4PkXjd-_Q" name="view" isOrdered="true" direction="inout">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_SKx9sO7IEeK0p4PkXjd-_Q"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_SLGGwO7IEeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xfz8Uu7HEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_xfz8U-7HEeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
+        <ownedParameter xmi:id="_xfz8Uu7HEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_xfz8U-7HEeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_T3aeoO7IEeK0p4PkXjd-_Q"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_T31VYO7IEeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_x2PfUO7HEeK0p4PkXjd-_Q" name="getPropertiesComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Q2rcEO7JEeK0p4PkXjd-_Q">
+      <ownedOperation xmi:id="_x2PfUO7HEeK0p4PkXjd-_Q" name="getPropertiesComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_Q2rcEO7JEeK0p4PkXjd-_Q">
           <body>Get the ComputePropertyValueCommands for the specified view and Properties.&#xD;
 @return A list of Command allowing to get the value of the properties for the specified view. The list contains null if no command is available for a property.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_x2PfUe7HEeK0p4PkXjd-_Q" name="view">
+        <ownedParameter xmi:id="_x2PfUe7HEeK0p4PkXjd-_Q" name="view">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_x2PfUu7HEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" isOrdered="true" direction="inout">
+        <ownedParameter xmi:id="_x2PfUu7HEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" isOrdered="true" direction="inout">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_a3kHoO7IEeK0p4PkXjd-_Q" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_a32bgO7IEeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_x2PfU-7HEeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
+        <ownedParameter xmi:id="_x2PfU-7HEeK0p4PkXjd-_Q" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true" direction="return">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_coyNoO7IEeK0p4PkXjd-_Q"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cpKoIO7IEeK0p4PkXjd-_Q" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Ps2L4GUaEeOlpfB_tZS-QA" name="attachToLayersStack">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_nC1a4GUaEeOlpfB_tZS-QA" annotatedElement="_Ps2L4GUaEeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_Ps2L4GUaEeOlpfB_tZS-QA" name="attachToLayersStack">
+        <ownedComment xmi:id="_nC1a4GUaEeOlpfB_tZS-QA" annotatedElement="_Ps2L4GUaEeOlpfB_tZS-QA">
           <body>Method called to specify that this Layer should be initialized for the specified LayerStack.&#xD;
 Init this Layer for the specified LayersStack.&#xD;
 This method is called by the LayersStack when it detect that tha layer is attached to it.&#xD;
 </body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_cr5cQGUaEeOlpfB_tZS-QA" name="owningLayersStack" type="_gT0asNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_cr5cQGUaEeOlpfB_tZS-QA" name="owningLayersStack" type="_gT0asNa7EeKPiuTfpuvqHA"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_kzSSwGUdEeOlpfB_tZS-QA" name="getLayersStack" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_04NH4GUdEeOlpfB_tZS-QA" annotatedElement="_kzSSwGUdEeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_kzSSwGUdEeOlpfB_tZS-QA" name="getLayersStack" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_04NH4GUdEeOlpfB_tZS-QA" annotatedElement="_kzSSwGUdEeOlpfB_tZS-QA">
           <body>A checked version of getOwningLayersStack.&#xD;
 </body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_r3jmwGUdEeOlpfB_tZS-QA" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_r3jmwGUdEeOlpfB_tZS-QA" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_YeJ4IHbvEeOlpfB_tZS-QA" name="enterAttachedState" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_YeJ4IXbvEeOlpfB_tZS-QA" annotatedElement="_YeJ4IHbvEeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_YeJ4IHbvEeOlpfB_tZS-QA" name="enterAttachedState" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_YeJ4IXbvEeOlpfB_tZS-QA" annotatedElement="_YeJ4IHbvEeOlpfB_tZS-QA">
           <body>This method is called by the class immediately after entering in attached state.&#xD;
 The methodcan be used to start the layer behaviors.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_VTcHQHluEeOlpfB_tZS-QA" name="attach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_tUEZQHlvEeOlpfB_tZS-QA" annotatedElement="_VTcHQHluEeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_VTcHQHluEeOlpfB_tZS-QA" name="attach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_tUEZQHlvEeOlpfB_tZS-QA" annotatedElement="_VTcHQHluEeOlpfB_tZS-QA">
           <body>Try to attach this Layer. If successful, the state go to &quot;attached&quot;. Otherwise, an exception is thrown.&#xD;
 A Layer can be attached if its required attributes are set.&#xD;
 Required attributes:&#xD;
@@ -689,35 +689,35 @@
 If this Layer is successfully attached, then attach subLayers.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_XeS1QHluEeOlpfB_tZS-QA" name="detach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_yitoYHlvEeOlpfB_tZS-QA" annotatedElement="_XeS1QHluEeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_XeS1QHluEeOlpfB_tZS-QA" name="detach" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_yitoYHlvEeOlpfB_tZS-QA" annotatedElement="_XeS1QHluEeOlpfB_tZS-QA">
           <body>Detach the Layer. The state go to &quot;detached&quot;.&#xD;
 Associated behavior are stopped.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_XNTkMHl0EeOlpfB_tZS-QA" name="exitAttachedState">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_e9TVwHl0EeOlpfB_tZS-QA" annotatedElement="_XNTkMHl0EeOlpfB_tZS-QA">
+      <ownedOperation xmi:id="_XNTkMHl0EeOlpfB_tZS-QA" name="exitAttachedState">
+        <ownedComment xmi:id="_e9TVwHl0EeOlpfB_tZS-QA" annotatedElement="_XNTkMHl0EeOlpfB_tZS-QA">
           <body>This method is called just before this Layer leave the attached state.&#xD;
 </body>
         </ownedComment>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_HoKjcNjjEeKQqZMBCFd2Uw" name="LayerOperator" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_OJCPcNjjEeKQqZMBCFd2Uw" general="_9IaAANjiEeKQqZMBCFd2Uw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_emyegNjnEeKQqZMBCFd2Uw" name="layers" type="_9IaAANjiEeKQqZMBCFd2Uw" isOrdered="true" aggregation="composite" association="_em-rwNjnEeKQqZMBCFd2Uw">
+      <generalization xmi:id="_OJCPcNjjEeKQqZMBCFd2Uw" general="_9IaAANjiEeKQqZMBCFd2Uw"/>
+      <ownedAttribute xmi:id="_emyegNjnEeKQqZMBCFd2Uw" name="layers" type="_9IaAANjiEeKQqZMBCFd2Uw" isOrdered="true" aggregation="composite" association="_em-rwNjnEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_emyegdjnEeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_emyegtjnEeKQqZMBCFd2Uw" value="*"/>
       </ownedAttribute>
-      <interfaceRealization xmi:type="uml:InterfaceRealization" xmi:id="_0RxQgHpGEeOlpfB_tZS-QA" name="InterfaceRealization1" client="_HoKjcNjjEeKQqZMBCFd2Uw" supplier="_RopgYHpGEeOlpfB_tZS-QA" contract="_RopgYHpGEeOlpfB_tZS-QA"/>
+      <interfaceRealization xmi:id="_0RxQgHpGEeOlpfB_tZS-QA" name="InterfaceRealization1" client="_HoKjcNjjEeKQqZMBCFd2Uw" supplier="_RopgYHpGEeOlpfB_tZS-QA" contract="_RopgYHpGEeOlpfB_tZS-QA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_WuVRUNjjEeKQqZMBCFd2Uw" name="AbstractLayerOperator" isAbstract="true">
-      <generalization xmi:type="uml:Generalization" xmi:id="_0lwNANjjEeKQqZMBCFd2Uw" general="_HoKjcNjjEeKQqZMBCFd2Uw"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_KSjUEAkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptor" type="_GKddUAkdEeOnVqX9VcfeWQ" association="_KSvhUAkdEeOnVqX9VcfeWQ">
+      <generalization xmi:id="_0lwNANjjEeKQqZMBCFd2Uw" general="_HoKjcNjjEeKQqZMBCFd2Uw"/>
+      <ownedAttribute xmi:id="_KSjUEAkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptor" type="_GKddUAkdEeOnVqX9VcfeWQ" association="_KSvhUAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KSjUEQkdEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KSjUEgkdEeOnVqX9VcfeWQ" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="__XEYgAw-EeOjX-JbGFEH7w" name="layerOperatorDescriptorName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_GnIFwAw_EeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="__XEYgAw-EeOjX-JbGFEH7w" name="layerOperatorDescriptorName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+        <ownedComment xmi:id="_GnIFwAw_EeOjX-JbGFEH7w">
           <body>The name of the associated descriptor.&#xD;
 This name is persisted with the  LayerOperator. The descriptor is not persisted.&#xD;
 The name is used to retrieve the Descriptor from the LayerOperatorDescriptorRegistry, when the application object is set. </body>
@@ -728,14 +728,14 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Dhl7YAxDEeOjX-JbGFEH7w" name="isDescriptorSet">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_LWD9QAxDEeOjX-JbGFEH7w">
+      <ownedOperation xmi:id="_Dhl7YAxDEeOjX-JbGFEH7w" name="isDescriptorSet">
+        <ownedComment xmi:id="_LWD9QAxDEeOjX-JbGFEH7w">
           <body>Return true if the Descriptor is set. Return false otherwise.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_KE53YAxDEeOjX-JbGFEH7w" name="return" type="_TqqsYNa8EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_KE53YAxDEeOjX-JbGFEH7w" name="return" type="_TqqsYNa8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_0VaLUA3SEeOjX-JbGFEH7w" name="resetDescriptor">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_4IMgcA3SEeOjX-JbGFEH7w">
+      <ownedOperation xmi:id="_0VaLUA3SEeOjX-JbGFEH7w" name="resetDescriptor">
+        <ownedComment xmi:id="_4IMgcA3SEeOjX-JbGFEH7w">
           <body>Reset the descriptor accordingly to the descriptor name.&#xD;
 The descriptor is resseted only if the ::application and ::layerOperatorDescriptorName are set.&#xD;
 Nothing is done if one of the attribute is not set.&#xD;
@@ -744,38 +744,38 @@
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_gqW1kNjjEeKQqZMBCFd2Uw" name="TopLayerOperator">
-      <generalization xmi:type="uml:Generalization" xmi:id="_zoqSoNjjEeKQqZMBCFd2Uw" general="_WuVRUNjjEeKQqZMBCFd2Uw"/>
+      <generalization xmi:id="_zoqSoNjjEeKQqZMBCFd2Uw" general="_WuVRUNjjEeKQqZMBCFd2Uw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_wpB4wNjjEeKQqZMBCFd2Uw" name="StackedLayerOperator">
-      <generalization xmi:type="uml:Generalization" xmi:id="_zL9IgNjjEeKQqZMBCFd2Uw" general="_WuVRUNjjEeKQqZMBCFd2Uw"/>
+      <generalization xmi:id="_zL9IgNjjEeKQqZMBCFd2Uw" general="_WuVRUNjjEeKQqZMBCFd2Uw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_1xJCENjjEeKQqZMBCFd2Uw" name="CustomLayerOperator">
-      <generalization xmi:type="uml:Generalization" xmi:id="_4b_ewNjjEeKQqZMBCFd2Uw" general="_HoKjcNjjEeKQqZMBCFd2Uw"/>
+      <generalization xmi:id="_4b_ewNjjEeKQqZMBCFd2Uw" general="_HoKjcNjjEeKQqZMBCFd2Uw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_3q_DINjkEeKQqZMBCFd2Uw" name="layer_view_1" memberEnd="_3q_DIdjkEeKQqZMBCFd2Uw _3qy14NjkEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_3q_DIdjkEeKQqZMBCFd2Uw" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_3q_DINjkEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_3q_DIdjkEeKQqZMBCFd2Uw" name="layer" type="_51zAINa7EeKPiuTfpuvqHA" association="_3q_DINjkEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3q_DItjkEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3q_DI9jkEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_em-rwNjnEeKQqZMBCFd2Uw" name="layerOperator_layerExpression_1" memberEnd="_em-rwdjnEeKQqZMBCFd2Uw _emyegNjnEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_em-rwdjnEeKQqZMBCFd2Uw" name="layerOperator" type="_HoKjcNjjEeKQqZMBCFd2Uw" association="_em-rwNjnEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_em-rwdjnEeKQqZMBCFd2Uw" name="layerOperator" type="_HoKjcNjjEeKQqZMBCFd2Uw" association="_em-rwNjnEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_em-rwtjnEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_em-rw9jnEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_uMYd4NjoEeKQqZMBCFd2Uw" name="LayerStackDescriptorRegistry"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_8OefoNjoEeKQqZMBCFd2Uw" name="PropertyRegistry">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NVP94NjqEeKQqZMBCFd2Uw" name="properties" type="_-vaacNa7EeKPiuTfpuvqHA" isOrdered="true" aggregation="composite" association="_NVcLINjqEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_NVP94NjqEeKQqZMBCFd2Uw" name="properties" type="_-vaacNa7EeKPiuTfpuvqHA" isOrdered="true" aggregation="composite" association="_NVcLINjqEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NVP94djqEeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NVP94tjqEeKQqZMBCFd2Uw" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_JhvqgNj_EeKQqZMBCFd2Uw" name="typeRegistry" type="_tLip8Nj-EeKQqZMBCFd2Uw" aggregation="composite" association="_Jh73wNj_EeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_JhvqgNj_EeKQqZMBCFd2Uw" name="typeRegistry" type="_tLip8Nj-EeKQqZMBCFd2Uw" aggregation="composite" association="_Jh73wNj_EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Jhvqgdj_EeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jhvqgtj_EeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_RrX8YA2qEeOjX-JbGFEH7w" name="propertiesCount" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA" isReadOnly="true" isDerived="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_p3RfsA2qEeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="_RrX8YA2qEeOjX-JbGFEH7w" name="propertiesCount" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA" isReadOnly="true" isDerived="true">
+        <ownedComment xmi:id="_p3RfsA2qEeOjX-JbGFEH7w">
           <body>The number of registered properties.&#xD;
 This is a value derived from the internal list of properties.</body>
         </ownedComment>
@@ -785,42 +785,42 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_1X6RoNkCEeKQqZMBCFd2Uw" name="getPropertyIndex" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="__hV_wNkCEeKQqZMBCFd2Uw" name="propertyName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_F2HJcNkDEeKQqZMBCFd2Uw" name="return" type="_SuHkkNa8EeKPiuTfpuvqHA" direction="return"/>
+      <ownedOperation xmi:id="_1X6RoNkCEeKQqZMBCFd2Uw" name="getPropertyIndex" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="__hV_wNkCEeKQqZMBCFd2Uw" name="propertyName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+        <ownedParameter xmi:id="_F2HJcNkDEeKQqZMBCFd2Uw" name="return" type="_SuHkkNa8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_dcjjAOT7EeKSDdPH_NXL-g" name="getProperty" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_dcjjAeT7EeKSDdPH_NXL-g" name="propertyName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_dcjjAuT7EeKSDdPH_NXL-g" name="return" type="_-vaacNa7EeKPiuTfpuvqHA" direction="return"/>
+      <ownedOperation xmi:id="_dcjjAOT7EeKSDdPH_NXL-g" name="getProperty" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_dcjjAeT7EeKSDdPH_NXL-g" name="propertyName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+        <ownedParameter xmi:id="_dcjjAuT7EeKSDdPH_NXL-g" name="return" type="_-vaacNa7EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Klpz4A3LEeOjX-JbGFEH7w" name="addProperty">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_RE4hIA3LEeOjX-JbGFEH7w">
+      <ownedOperation xmi:id="_Klpz4A3LEeOjX-JbGFEH7w" name="addProperty">
+        <ownedComment xmi:id="_RE4hIA3LEeOjX-JbGFEH7w">
           <body>Add the property to the registry.&#xD;
 Also set the index of the property.&#xD;
 Do nothing if a Property with the same name already exist.&#xD;
 Note: a Property can not be retrieved from the registry (the operation is not supported by the application).</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_P1PeMA3LEeOjX-JbGFEH7w" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_P1PeMA3LEeOjX-JbGFEH7w" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_DYi5oNjpEeKQqZMBCFd2Uw" name="layersStackApplication_layerStackRegistry_1" memberEnd="_DYi5odjpEeKQqZMBCFd2Uw _DYWsYNjpEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_DYi5odjpEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_DYi5oNjpEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_DYi5odjpEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_DYi5oNjpEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DYi5otjpEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_DYi5o9jpEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_EEjEANjpEeKQqZMBCFd2Uw" name="layersStackApplication_propertyRegistry_1" memberEnd="_EEjEAdjpEeKQqZMBCFd2Uw _EEc9YNjpEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_EEjEAdjpEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_EEjEANjpEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_EEjEAdjpEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_EEjEANjpEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_EEjEAtjpEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_EEjEA9jpEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ItBOgNjqEeKQqZMBCFd2Uw" name="PropertyIndex">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ZcvUINjqEeKQqZMBCFd2Uw" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" association="_ZdBoANjqEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_ZcvUINjqEeKQqZMBCFd2Uw" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" association="_ZdBoANjqEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZcvUIdjqEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZcvUItjqEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_j-DE0NjsEeKQqZMBCFd2Uw" name="index" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_j-DE0NjsEeKQqZMBCFd2Uw" name="index" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lYYU0NjsEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lYqosNjsEeKQqZMBCFd2Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_lZbdsNjsEeKQqZMBCFd2Uw">
@@ -829,23 +829,23 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_NVcLINjqEeKQqZMBCFd2Uw" name="propertyRegistry_property_1" memberEnd="_NVcLIdjqEeKQqZMBCFd2Uw _NVP94NjqEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_NVcLIdjqEeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" association="_NVcLINjqEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_NVcLIdjqEeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" association="_NVcLINjqEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_NVcLItjqEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_NVcLI9jqEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_ZdBoANjqEeKQqZMBCFd2Uw" name="propertyIndex_property_1" memberEnd="_ZdBoAdjqEeKQqZMBCFd2Uw _ZcvUINjqEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_ZdBoAdjqEeKQqZMBCFd2Uw" name="propertyIndex" type="_ItBOgNjqEeKQqZMBCFd2Uw" association="_ZdBoANjqEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_ZdBoAdjqEeKQqZMBCFd2Uw" name="propertyIndex" type="_ItBOgNjqEeKQqZMBCFd2Uw" association="_ZdBoANjqEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ZdBoAtjqEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ZdBoA9jqEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_hgu_wNjqEeKQqZMBCFd2Uw" name="StringToPropertyIndexMap">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_mzbocNjqEeKQqZMBCFd2Uw" name="value" type="_ItBOgNjqEeKQqZMBCFd2Uw" aggregation="composite" association="_mzt8UNjqEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_mzbocNjqEeKQqZMBCFd2Uw" name="value" type="_ItBOgNjqEeKQqZMBCFd2Uw" aggregation="composite" association="_mzt8UNjqEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mzbocdjqEeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mzboctjqEeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_fQXNsNjsEeKQqZMBCFd2Uw" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_fQXNsNjsEeKQqZMBCFd2Uw" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hC3tINjsEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hDKoENjsEeKQqZMBCFd2Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_hD5A0NjsEeKQqZMBCFd2Uw">
@@ -854,35 +854,35 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_mzt8UNjqEeKQqZMBCFd2Uw" name="stringToPropertyIndexMap_propertyIndex_1" memberEnd="_mzt8UdjqEeKQqZMBCFd2Uw _mzbocNjqEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_mzt8UdjqEeKQqZMBCFd2Uw" name="stringToPropertyIndexMap" type="_hgu_wNjqEeKQqZMBCFd2Uw" association="_mzt8UNjqEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_mzt8UdjqEeKQqZMBCFd2Uw" name="stringToPropertyIndexMap" type="_hgu_wNjqEeKQqZMBCFd2Uw" association="_mzt8UNjqEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mzt8UtjqEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mzt8U9jqEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_tLip8Nj-EeKQqZMBCFd2Uw" name="TypeRegistry">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_2az14Nj-EeKQqZMBCFd2Uw" name="types" type="_P4xeANj_EeKQqZMBCFd2Uw" aggregation="composite" association="_2bADINj-EeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_2az14Nj-EeKQqZMBCFd2Uw" name="types" type="_P4xeANj_EeKQqZMBCFd2Uw" aggregation="composite" association="_2bADINj-EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2az14dj-EeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2az14tj-EeKQqZMBCFd2Uw" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_2bADINj-EeKQqZMBCFd2Uw" name="typeRegistry_type_1" memberEnd="_2bADIdj-EeKQqZMBCFd2Uw _2az14Nj-EeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_2bADIdj-EeKQqZMBCFd2Uw" name="typeRegistry" type="_tLip8Nj-EeKQqZMBCFd2Uw" association="_2bADINj-EeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_2bADIdj-EeKQqZMBCFd2Uw" name="typeRegistry" type="_tLip8Nj-EeKQqZMBCFd2Uw" association="_2bADINj-EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2bADItj-EeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2bADI9j-EeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_Jh73wNj_EeKQqZMBCFd2Uw" name="propertyRegistry_typeRegistry_1" memberEnd="_Jh73wdj_EeKQqZMBCFd2Uw _JhvqgNj_EeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Jh73wdj_EeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" association="_Jh73wNj_EeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_Jh73wdj_EeKQqZMBCFd2Uw" name="propertyRegistry" type="_8OefoNjoEeKQqZMBCFd2Uw" association="_Jh73wNj_EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Jh73wtj_EeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Jh73w9j_EeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_P4xeANj_EeKQqZMBCFd2Uw" name="StringToTypeMap">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_U05ZwNj_EeKQqZMBCFd2Uw" name="value" type="_EoL3oNhcEeKgkM6XJF9t4A" aggregation="composite" association="_U1FnANj_EeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_U05ZwNj_EeKQqZMBCFd2Uw" name="value" type="_EoL3oNhcEeKgkM6XJF9t4A" aggregation="composite" association="_U1FnANj_EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U05Zwdj_EeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U05Zwtj_EeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_kaf1oNj_EeKQqZMBCFd2Uw" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_kaf1oNj_EeKQqZMBCFd2Uw" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lxSCYNj_EeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lxkWQNj_EeKQqZMBCFd2Uw" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_lyPEoNj_EeKQqZMBCFd2Uw">
@@ -891,65 +891,65 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_U1FnANj_EeKQqZMBCFd2Uw" name="stringToTypeMap_type_1" memberEnd="_U1FnAdj_EeKQqZMBCFd2Uw _U05ZwNj_EeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_U1FnAdj_EeKQqZMBCFd2Uw" name="stringToTypeMap" type="_P4xeANj_EeKQqZMBCFd2Uw" association="_U1FnANj_EeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_U1FnAdj_EeKQqZMBCFd2Uw" name="stringToTypeMap" type="_P4xeANj_EeKQqZMBCFd2Uw" association="_U1FnANj_EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_U1FnAtj_EeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_U1FnA9j_EeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_hQam0NkhEeKQqZMBCFd2Uw" name="layersStack_diagram_1" memberEnd="_hQam0dkhEeKQqZMBCFd2Uw _hQIS8NkhEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_hQam0dkhEeKQqZMBCFd2Uw" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" association="_hQam0NkhEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_hQam0dkhEeKQqZMBCFd2Uw" name="layersStack" type="_gT0asNa7EeKPiuTfpuvqHA" association="_hQam0NkhEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hQam0tkhEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hQam09khEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_zYGE8NqBEeKQqZMBCFd2Uw" name="LayerDescriptorRegistry">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_TzkRwNqCEeKQqZMBCFd2Uw" name="layerDescriptors" type="_eNnjMNa7EeKPiuTfpuvqHA" aggregation="composite" association="_Tz2loNqCEeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_TzkRwNqCEeKQqZMBCFd2Uw" name="layerDescriptors" type="_eNnjMNa7EeKPiuTfpuvqHA" aggregation="composite" association="_Tz2loNqCEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TzkRwdqCEeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TzkRwtqCEeKQqZMBCFd2Uw" value="*"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_5r8BkNqBEeKQqZMBCFd2Uw" name="layersStackApplication_layerDescriptorRegistry_1" memberEnd="_5r8BkdqBEeKQqZMBCFd2Uw _5rptsNqBEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_5r8BkdqBEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_5r8BkNqBEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_5r8BkdqBEeKQqZMBCFd2Uw" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_5r8BkNqBEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5r8BktqBEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5r8Bk9qBEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_Tz2loNqCEeKQqZMBCFd2Uw" name="layerDescriptorRegistry_layerDescriptor_1" memberEnd="_Tz2lodqCEeKQqZMBCFd2Uw _TzkRwNqCEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Tz2lodqCEeKQqZMBCFd2Uw" name="layerDescriptorRegistry" type="_zYGE8NqBEeKQqZMBCFd2Uw" association="_Tz2loNqCEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_Tz2lodqCEeKQqZMBCFd2Uw" name="layerDescriptorRegistry" type="_zYGE8NqBEeKQqZMBCFd2Uw" association="_Tz2loNqCEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Tz2lotqCEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Tz2lo9qCEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_iim5ENqCEeKQqZMBCFd2Uw" name="layerDescriptor_propertyRegistry_1" memberEnd="_iim5EdqCEeKQqZMBCFd2Uw _iiUlMNqCEeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_iim5EdqCEeKQqZMBCFd2Uw" name="layerDescriptor" type="_eNnjMNa7EeKPiuTfpuvqHA" association="_iim5ENqCEeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="_iim5EdqCEeKQqZMBCFd2Uw" name="layerDescriptor" type="_eNnjMNa7EeKPiuTfpuvqHA" association="_iim5ENqCEeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iim5EtqCEeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iim5E9qCEeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_xhwY8NqCEeKQqZMBCFd2Uw" name="SimpleLayerDescriptor">
-      <generalization xmi:type="uml:Generalization" xmi:id="_3ee2ENqCEeKQqZMBCFd2Uw" general="_eNnjMNa7EeKPiuTfpuvqHA"/>
+      <generalization xmi:id="_3ee2ENqCEeKQqZMBCFd2Uw" general="_eNnjMNa7EeKPiuTfpuvqHA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_z4m7kNqCEeKQqZMBCFd2Uw" name="RegExpLayerDescriptor">
-      <generalization xmi:type="uml:Generalization" xmi:id="_5RvjcNqCEeKQqZMBCFd2Uw" general="_eNnjMNa7EeKPiuTfpuvqHA"/>
+      <generalization xmi:id="_5RvjcNqCEeKQqZMBCFd2Uw" general="_eNnjMNa7EeKPiuTfpuvqHA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_325AENt0EeKQqZMBCFd2Uw" name="ApplicationDependantElement" isAbstract="true">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_KjtrkNt1EeKQqZMBCFd2Uw">
+      <ownedComment xmi:id="_KjtrkNt1EeKQqZMBCFd2Uw">
         <body>Base class for elements depending on the LayerStackApplication.&#xD;
 This class carry a referenceto the Application.</body>
       </ownedComment>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="__rXB8Nt0EeKQqZMBCFd2Uw" name="application" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="__rpV0Nt0EeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="__rXB8Nt0EeKQqZMBCFd2Uw" name="application" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="__rpV0Nt0EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__rXB8dt0EeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__rXB8tt0EeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="__rpV0Nt0EeKQqZMBCFd2Uw" name="applicationDependantElement_layersStackApplication_1" memberEnd="__rpV0dt0EeKQqZMBCFd2Uw __rXB8Nt0EeKQqZMBCFd2Uw">
-      <ownedEnd xmi:type="uml:Property" xmi:id="__rpV0dt0EeKQqZMBCFd2Uw" name="applicationDependantElement" type="_325AENt0EeKQqZMBCFd2Uw" association="__rpV0Nt0EeKQqZMBCFd2Uw">
+      <ownedEnd xmi:id="__rpV0dt0EeKQqZMBCFd2Uw" name="applicationDependantElement" type="_325AENt0EeKQqZMBCFd2Uw" association="__rpV0Nt0EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__rpV0tt0EeKQqZMBCFd2Uw" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__rpV09t0EeKQqZMBCFd2Uw" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_IOwJ4Nt2EeKQqZMBCFd2Uw" name="LayerApplicationFactory">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_wROkUdt2EeKQqZMBCFd2Uw" name="application" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_wROkUNt2EeKQqZMBCFd2Uw">
+      <ownedAttribute xmi:id="_wROkUdt2EeKQqZMBCFd2Uw" name="application" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_wROkUNt2EeKQqZMBCFd2Uw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wROkUtt2EeKQqZMBCFd2Uw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wROkU9t2EeKQqZMBCFd2Uw" value="1"/>
       </ownedAttribute>
@@ -957,116 +957,116 @@
     <packagedElement xmi:type="uml:Association" xmi:id="_wROkUNt2EeKQqZMBCFd2Uw" name="layersStackApplication_layerApplicationFactory_1" memberEnd="_wROkUdt2EeKQqZMBCFd2Uw _wRCXENt2EeKQqZMBCFd2Uw"/>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_iYKFMNxGEeKwptaAAanMDg" name="LayersException"/>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_k-dZENxGEeKwptaAAanMDg" name="NotFoundException">
-      <generalization xmi:type="uml:Generalization" xmi:id="_oxlscNxGEeKwptaAAanMDg" general="_iYKFMNxGEeKwptaAAanMDg"/>
+      <generalization xmi:id="_oxlscNxGEeKwptaAAanMDg" general="_iYKFMNxGEeKwptaAAanMDg"/>
     </packagedElement>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_KG7HMNxMEeKwptaAAanMDg" name="BadStateException">
-      <generalization xmi:type="uml:Generalization" xmi:id="_ShHsUNxMEeKwptaAAanMDg" general="_iYKFMNxGEeKwptaAAanMDg"/>
+      <generalization xmi:id="_ShHsUNxMEeKwptaAAanMDg" general="_iYKFMNxGEeKwptaAAanMDg"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_agAC4NxWEeKwptaAAanMDg" name="NullInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_drCbgNxWEeKwptaAAanMDg" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_OU7XsNxXEeKwptaAAanMDg" name="getInstance" isStatic="true">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_WSaLoNxXEeKwptaAAanMDg" type="_agAC4NxWEeKwptaAAanMDg" direction="return"/>
+      <generalization xmi:id="_drCbgNxWEeKwptaAAanMDg" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedOperation xmi:id="_OU7XsNxXEeKwptaAAanMDg" name="getInstance" isStatic="true">
+        <ownedParameter xmi:id="_WSaLoNxXEeKwptaAAanMDg" type="_agAC4NxWEeKwptaAAanMDg" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_z9aN8OHTEeKCZbxNW-U3VQ" name="RegExpLayer">
-      <generalization xmi:type="uml:Generalization" xmi:id="_R8qP8OHUEeKCZbxNW-U3VQ" general="_51zAINa7EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Bm93wBZ1EeOZwp016gnCFQ" name="expr" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <generalization xmi:id="_R8qP8OHUEeKCZbxNW-U3VQ" general="_51zAINa7EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_Bm93wBZ1EeOZwp016gnCFQ" name="expr" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_DqoYoBZ1EeOZwp016gnCFQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Dq76oBZ1EeOZwp016gnCFQ" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_Dr0rcBZ1EeOZwp016gnCFQ">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Fp_BQBZ1EeOZwp016gnCFQ" name="language" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_Fp_BQBZ1EeOZwp016gnCFQ" name="language" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_H11NwBZ1EeOZwp016gnCFQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_H2IIsBZ1EeOZwp016gnCFQ" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_H3BgkBZ1EeOZwp016gnCFQ">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NAa0AFCkEeO_9LQ4jZWm3w" name="isDomainChangedEventDependant" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_NAa0AFCkEeO_9LQ4jZWm3w" name="isDomainChangedEventDependant" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_TxFPgFCkEeO_9LQ4jZWm3w" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_TxFPgVCkEeO_9LQ4jZWm3w" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_TxFPglCkEeO_9LQ4jZWm3w">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_X_qIwFCkEeO_9LQ4jZWm3w" name="domainChangedEventLevel" visibility="public" type="_7cWpgFVHEeOah7Z-UYdQAA">
+      <ownedAttribute xmi:id="_X_qIwFCkEeO_9LQ4jZWm3w" name="domainChangedEventLevel" visibility="public" type="_7cWpgFVHEeOah7Z-UYdQAA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rnnm0FCkEeO_9LQ4jZWm3w" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rnnm0VCkEeO_9LQ4jZWm3w" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_rnnm0lCkEeO_9LQ4jZWm3w">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_uJr68FCkEeO_9LQ4jZWm3w" name="isDiagramChangedEventDependant" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_uJr68FCkEeO_9LQ4jZWm3w" name="isDiagramChangedEventDependant" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ua2jcFCkEeO_9LQ4jZWm3w" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ua8qEFCkEeO_9LQ4jZWm3w" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_ua8qEVCkEeO_9LQ4jZWm3w">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_y220sFCkEeO_9LQ4jZWm3w" name="diagramChangedEventLevel" visibility="public" type="_7cWpgFVHEeOah7Z-UYdQAA">
+      <ownedAttribute xmi:id="_y220sFCkEeO_9LQ4jZWm3w" name="diagramChangedEventLevel" visibility="public" type="_7cWpgFVHEeOah7Z-UYdQAA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1VR-8FCkEeO_9LQ4jZWm3w" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1VR-8VCkEeO_9LQ4jZWm3w" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_1VR-8lCkEeO_9LQ4jZWm3w">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_sPbYQFClEeO_9LQ4jZWm3w" name="expressionContextObjectType" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_sPbYQFClEeO_9LQ4jZWm3w" name="expressionContextObjectType" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wnnggFClEeO_9LQ4jZWm3w" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wnnggVClEeO_9LQ4jZWm3w" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_wnngglClEeO_9LQ4jZWm3w">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_kI0XsBZ0EeOZwp016gnCFQ" name="activate">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Ifv3ABaBEeOZwp016gnCFQ" name="newParentLayer" type="_WuVRUNjjEeKQqZMBCFd2Uw"/>
+      <ownedOperation xmi:id="_kI0XsBZ0EeOZwp016gnCFQ" name="activate">
+        <ownedParameter xmi:id="_Ifv3ABaBEeOZwp016gnCFQ" name="newParentLayer" type="_WuVRUNjjEeKQqZMBCFd2Uw"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_lpOagBZ0EeOZwp016gnCFQ" name="deactivate">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_MZS7cBaBEeOZwp016gnCFQ" name="oldParentLayer" type="_WuVRUNjjEeKQqZMBCFd2Uw"/>
+      <ownedOperation xmi:id="_lpOagBZ0EeOZwp016gnCFQ" name="deactivate">
+        <ownedParameter xmi:id="_MZS7cBaBEeOZwp016gnCFQ" name="oldParentLayer" type="_WuVRUNjjEeKQqZMBCFd2Uw"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_pKKxsBZ0EeOZwp016gnCFQ" name="isDerivedView" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_-UwgIBZ0EeOZwp016gnCFQ" name="res" type="_TqqsYNa8EeKPiuTfpuvqHA" direction="return">
+      <ownedOperation xmi:id="_pKKxsBZ0EeOZwp016gnCFQ" name="isDerivedView" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_-UwgIBZ0EeOZwp016gnCFQ" name="res" type="_TqqsYNa8EeKPiuTfpuvqHA" direction="return">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LLUi4BZ1EeOZwp016gnCFQ" value="1"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_LLnd0BZ1EeOZwp016gnCFQ" value="1"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0YIjYFVIEeOah7Z-UYdQAA" name="view">
+        <ownedParameter xmi:id="_0YIjYFVIEeOah7Z-UYdQAA" name="view">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_EnH6gFVJEeOah7Z-UYdQAA" name="attachDerivedView" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Pusr4FVJEeOah7Z-UYdQAA">
+      <ownedOperation xmi:id="_EnH6gFVJEeOah7Z-UYdQAA" name="attachDerivedView" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_Pusr4FVJEeOah7Z-UYdQAA">
           <body>Attach the provided view to the Layer if the isDerivedView(view) return true for this view.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_EnH6hFVJEeOah7Z-UYdQAA" name="view">
+        <ownedParameter xmi:id="_EnH6hFVJEeOah7Z-UYdQAA" name="view">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Y5m8QFVJEeOah7Z-UYdQAA" name="attachDerivedViews" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Y5m8QVVJEeOah7Z-UYdQAA">
+      <ownedOperation xmi:id="_Y5m8QFVJEeOah7Z-UYdQAA" name="attachDerivedViews" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_Y5m8QVVJEeOah7Z-UYdQAA">
           <body>For each view, attach it to the Layer if the isDerivedView(view) return true for the view.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Y5m8QlVJEeOah7Z-UYdQAA" name="views">
+        <ownedParameter xmi:id="_Y5m8QlVJEeOah7Z-UYdQAA" name="views">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_h3YvkFVJEeOah7Z-UYdQAA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_h3YvkVVJEeOah7Z-UYdQAA" value="*"/>
         </ownedParameter>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_m3jd0FVJEeOah7Z-UYdQAA" name="attachDerivedViews" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_m3jd0VVJEeOah7Z-UYdQAA">
+      <ownedOperation xmi:id="_m3jd0FVJEeOah7Z-UYdQAA" name="attachDerivedViews" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_m3jd0VVJEeOah7Z-UYdQAA">
           <body>Attach the views associated to the Diagram to this layer, if the isDerivedView(view) return true for the view.</body>
         </ownedComment>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_Lwc4MFVKEeOah7Z-UYdQAA" name="lookupDerivedViews" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Lwc4MVVKEeOah7Z-UYdQAA">
+      <ownedOperation xmi:id="_Lwc4MFVKEeOah7Z-UYdQAA" name="lookupDerivedViews" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_Lwc4MVVKEeOah7Z-UYdQAA">
           <body>Return the subcollection of views for which the expression return true.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Lwc4MlVKEeOah7Z-UYdQAA" name="views">
+        <ownedParameter xmi:id="_Lwc4MlVKEeOah7Z-UYdQAA" name="views">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Lwc4M1VKEeOah7Z-UYdQAA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Lwc4NFVKEeOah7Z-UYdQAA" value="*"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_X28v8FVKEeOah7Z-UYdQAA" name="res" direction="return">
+        <ownedParameter xmi:id="_X28v8FVKEeOah7Z-UYdQAA" name="res" direction="return">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hTG1cFVXEeOeP67GJGKDkA"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hTG1cVVXEeOeP67GJGKDkA" value="*"/>
@@ -1074,14 +1074,14 @@
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="__1GNoOHTEeKCZbxNW-U3VQ" name="Layer">
-      <generalization xmi:type="uml:Generalization" xmi:id="_am4OEOHUEeKCZbxNW-U3VQ" general="_51zAINa7EeKPiuTfpuvqHA"/>
+      <generalization xmi:id="_am4OEOHUEeKCZbxNW-U3VQ" general="_51zAINa7EeKPiuTfpuvqHA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ti_eQOT_EeKSDdPH_NXL-g" name="Color">
-      <generalization xmi:type="uml:Generalization" xmi:id="_Y0k5AOUAEeKSDdPH_NXL-g" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_Y0k5AOUAEeKSDdPH_NXL-g" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_vkSnoOT_EeKSDdPH_NXL-g" name="ColorInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_YCxooOUAEeKSDdPH_NXL-g" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Q8HvAOUAEeKSDdPH_NXL-g" name="value" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <generalization xmi:id="_YCxooOUAEeKSDdPH_NXL-g" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_Q8HvAOUAEeKSDdPH_NXL-g" name="value" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Q8HvAeUAEeKSDdPH_NXL-g" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Q8HvAuUAEeKSDdPH_NXL-g" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_Q8HvA-UAEeKSDdPH_NXL-g">
@@ -1090,153 +1090,153 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_fL2kIOUAEeKSDdPH_NXL-g" name="FillInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_jXYwcOUAEeKSDdPH_NXL-g" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_nVngkOUAEeKSDdPH_NXL-g" name="transparency" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <generalization xmi:id="_jXYwcOUAEeKSDdPH_NXL-g" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_nVngkOUAEeKSDdPH_NXL-g" name="transparency" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nVngkeUAEeKSDdPH_NXL-g" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nVngkuUAEeKSDdPH_NXL-g" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_nVngk-UAEeKSDdPH_NXL-g">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_uTht4OUAEeKSDdPH_NXL-g" name="fillColor" type="_vkSnoOT_EeKSDdPH_NXL-g" aggregation="composite" association="_uTre4OUAEeKSDdPH_NXL-g">
+      <ownedAttribute xmi:id="_uTht4OUAEeKSDdPH_NXL-g" name="fillColor" type="_vkSnoOT_EeKSDdPH_NXL-g" aggregation="composite" association="_uTre4OUAEeKSDdPH_NXL-g">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uTht4eUAEeKSDdPH_NXL-g" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uTht4uUAEeKSDdPH_NXL-g" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_gsEZsOUAEeKSDdPH_NXL-g" name="Fill">
-      <generalization xmi:type="uml:Generalization" xmi:id="_ip-Q0OUAEeKSDdPH_NXL-g" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_ip-Q0OUAEeKSDdPH_NXL-g" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_uTre4OUAEeKSDdPH_NXL-g" name="fillInstance_colorInstance_1" memberEnd="_uTre4eUAEeKSDdPH_NXL-g _uTht4OUAEeKSDdPH_NXL-g">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_uTre4eUAEeKSDdPH_NXL-g" name="fillInstance" type="_fL2kIOUAEeKSDdPH_NXL-g" association="_uTre4OUAEeKSDdPH_NXL-g">
+      <ownedEnd xmi:id="_uTre4eUAEeKSDdPH_NXL-g" name="fillInstance" type="_fL2kIOUAEeKSDdPH_NXL-g" association="_uTre4OUAEeKSDdPH_NXL-g">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_uTre4uUAEeKSDdPH_NXL-g" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_uTre4-UAEeKSDdPH_NXL-g" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_q85OgO3uEeKwLp35IbAIig" name="PropertySetterRegistry">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_3GHqIe3uEeKwLp35IbAIig" name="application" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_3GHqIO3uEeKwLp35IbAIig">
+      <ownedAttribute xmi:id="_3GHqIe3uEeKwLp35IbAIig" name="application" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_3GHqIO3uEeKwLp35IbAIig">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_3GHqIu3uEeKwLp35IbAIig"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_3GHqI-3uEeKwLp35IbAIig" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_iPT94O3vEeKwLp35IbAIig" name="propertySetters" type="_fyVlIO3vEeKwLp35IbAIig" isOrdered="true" association="_iPmRwO3vEeKwLp35IbAIig">
+      <ownedAttribute xmi:id="_iPT94O3vEeKwLp35IbAIig" name="propertySetters" type="_fyVlIO3vEeKwLp35IbAIig" isOrdered="true" association="_iPmRwO3vEeKwLp35IbAIig">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iPT94e3vEeKwLp35IbAIig"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iPT94u3vEeKwLp35IbAIig" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_hmejMO5mEeK0p4PkXjd-_Q" name="setterMap" type="_JSMf8O5mEeK0p4PkXjd-_Q" aggregation="composite" association="_hmkp0O5mEeK0p4PkXjd-_Q">
+      <ownedAttribute xmi:id="_hmejMO5mEeK0p4PkXjd-_Q" name="setterMap" type="_JSMf8O5mEeK0p4PkXjd-_Q" aggregation="composite" association="_hmkp0O5mEeK0p4PkXjd-_Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hmejMe5mEeK0p4PkXjd-_Q"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hmejMu5mEeK0p4PkXjd-_Q" value="*"/>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_L7LusO5WEeK0p4PkXjd-_Q" name="getPropertySetter" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_Tr1nkO5WEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_ZJbRoO5WEeK0p4PkXjd-_Q" name="return" type="_fyVlIO3vEeKwLp35IbAIig" direction="return"/>
+      <ownedOperation xmi:id="_L7LusO5WEeK0p4PkXjd-_Q" name="getPropertySetter" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_Tr1nkO5WEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_ZJbRoO5WEeK0p4PkXjd-_Q" name="return" type="_fyVlIO3vEeKwLp35IbAIig" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_fF4pAO5WEeK0p4PkXjd-_Q" name="getPropertySetter" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_fF4pAe5WEeK0p4PkXjd-_Q" name="property" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_fF4pAu5WEeK0p4PkXjd-_Q" name="return" type="_fyVlIO3vEeKwLp35IbAIig" direction="return"/>
+      <ownedOperation xmi:id="_fF4pAO5WEeK0p4PkXjd-_Q" name="getPropertySetter" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_fF4pAe5WEeK0p4PkXjd-_Q" name="property" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+        <ownedParameter xmi:id="_fF4pAu5WEeK0p4PkXjd-_Q" name="return" type="_fyVlIO3vEeKwLp35IbAIig" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_mCwUgO5WEeK0p4PkXjd-_Q" name="addPropertySetter">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_quPzQO5WEeK0p4PkXjd-_Q" name="setter" type="_fyVlIO3vEeKwLp35IbAIig"/>
+      <ownedOperation xmi:id="_mCwUgO5WEeK0p4PkXjd-_Q" name="addPropertySetter">
+        <ownedParameter xmi:id="_quPzQO5WEeK0p4PkXjd-_Q" name="setter" type="_fyVlIO3vEeKwLp35IbAIig"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_3GHqIO3uEeKwLp35IbAIig" name="layersStackApplication_propertySetterRegistry_1" memberEnd="_3GHqIe3uEeKwLp35IbAIig _3F7c4O3uEeKwLp35IbAIig"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_fyVlIO3vEeKwLp35IbAIig" name="PropertySetter" isAbstract="true">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_4C8Y8O5VEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" association="_4DImMO5VEeK0p4PkXjd-_Q">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_ApRVkO5WEeK0p4PkXjd-_Q">
+      <ownedAttribute xmi:id="_4C8Y8O5VEeK0p4PkXjd-_Q" name="property" type="_-vaacNa7EeKPiuTfpuvqHA" association="_4DImMO5VEeK0p4PkXjd-_Q">
+        <ownedComment xmi:id="_ApRVkO5WEeK0p4PkXjd-_Q">
           <body>The property for which this setter is for.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4C8Y8e5VEeK0p4PkXjd-_Q"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4C8Y8u5VEeK0p4PkXjd-_Q" value="1"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_p3vR8O5qEeK0p4PkXjd-_Q" name="propertyName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_p3vR8O5qEeK0p4PkXjd-_Q" name="propertyName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_scKWgO5qEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_sccqYO5qEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_sdl54O5qEeK0p4PkXjd-_Q">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_GOgVMO5VEeK0p4PkXjd-_Q" name="setValue">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_P9Ky4O5VEeK0p4PkXjd-_Q" name="view">
+      <ownedOperation xmi:id="_GOgVMO5VEeK0p4PkXjd-_Q" name="setValue">
+        <ownedParameter xmi:id="_P9Ky4O5VEeK0p4PkXjd-_Q" name="view">
           <type xmi:type="uml:Class" href="notation/notation.uml#_AziHOrcnEeKeLJDBCBPhPw"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_pXFBcO5VEeK0p4PkXjd-_Q" name="value" type="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_pXFBcO5VEeK0p4PkXjd-_Q" name="value" type="_AjTZ8Na8EeKPiuTfpuvqHA"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_iPmRwO3vEeKwLp35IbAIig" name="propertySetterRegistry_propertySetter_1" memberEnd="_iPmRwe3vEeKwLp35IbAIig _iPT94O3vEeKwLp35IbAIig">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_iPmRwe3vEeKwLp35IbAIig" name="propertySetterRegistry" type="_q85OgO3uEeKwLp35IbAIig" association="_iPmRwO3vEeKwLp35IbAIig">
+      <ownedEnd xmi:id="_iPmRwe3vEeKwLp35IbAIig" name="propertySetterRegistry" type="_q85OgO3uEeKwLp35IbAIig" association="_iPmRwO3vEeKwLp35IbAIig">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_iPmRwu3vEeKwLp35IbAIig" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_iPmRw-3vEeKwLp35IbAIig" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_4DImMO5VEeK0p4PkXjd-_Q" name="propertySetter_property_1" memberEnd="_4DImMe5VEeK0p4PkXjd-_Q _4C8Y8O5VEeK0p4PkXjd-_Q">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_4DImMe5VEeK0p4PkXjd-_Q" name="propertySetter" type="_fyVlIO3vEeKwLp35IbAIig" association="_4DImMO5VEeK0p4PkXjd-_Q">
+      <ownedEnd xmi:id="_4DImMe5VEeK0p4PkXjd-_Q" name="propertySetter" type="_fyVlIO3vEeKwLp35IbAIig" association="_4DImMO5VEeK0p4PkXjd-_Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4DImMu5VEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4DImM-5VEeK0p4PkXjd-_Q" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_R-WVkO5XEeK0p4PkXjd-_Q" name="FillPropertySetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_Y8pkcO5XEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_Y8pkcO5XEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_Ue7b8O5XEeK0p4PkXjd-_Q" name="IsValidPropertySetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_ZxycsO5XEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_ZxycsO5XEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_JSMf8O5mEeK0p4PkXjd-_Q" name="StringToPropertySetter">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_NBuFsO5mEeK0p4PkXjd-_Q" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_NBuFsO5mEeK0p4PkXjd-_Q" name="key" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PgE-gO5mEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PgdZAO5mEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_Phgh4O5mEeK0p4PkXjd-_Q">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_QfjegO5mEeK0p4PkXjd-_Q" name="value" type="_fyVlIO3vEeKwLp35IbAIig" aggregation="composite" association="_QfvrwO5mEeK0p4PkXjd-_Q">
+      <ownedAttribute xmi:id="_QfjegO5mEeK0p4PkXjd-_Q" name="value" type="_fyVlIO3vEeKwLp35IbAIig" aggregation="composite" association="_QfvrwO5mEeK0p4PkXjd-_Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qfjege5mEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qfjegu5mEeK0p4PkXjd-_Q" value="1"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_QfvrwO5mEeK0p4PkXjd-_Q" name="stringToPropertySetter_propertySetter_1" memberEnd="_Qfvrwe5mEeK0p4PkXjd-_Q _QfjegO5mEeK0p4PkXjd-_Q">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_Qfvrwe5mEeK0p4PkXjd-_Q" name="stringToPropertySetter" type="_JSMf8O5mEeK0p4PkXjd-_Q" association="_QfvrwO5mEeK0p4PkXjd-_Q">
+      <ownedEnd xmi:id="_Qfvrwe5mEeK0p4PkXjd-_Q" name="stringToPropertySetter" type="_JSMf8O5mEeK0p4PkXjd-_Q" association="_QfvrwO5mEeK0p4PkXjd-_Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Qfvrwu5mEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Qfvrw-5mEeK0p4PkXjd-_Q" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_hmkp0O5mEeK0p4PkXjd-_Q" name="propertySetterRegistry_stringToPropertySetter_1" memberEnd="_hmkp0e5mEeK0p4PkXjd-_Q _hmejMO5mEeK0p4PkXjd-_Q">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_hmkp0e5mEeK0p4PkXjd-_Q" name="propertySetterRegistry" type="_q85OgO3uEeKwLp35IbAIig" association="_hmkp0O5mEeK0p4PkXjd-_Q">
+      <ownedEnd xmi:id="_hmkp0e5mEeK0p4PkXjd-_Q" name="propertySetterRegistry" type="_q85OgO3uEeKwLp35IbAIig" association="_hmkp0O5mEeK0p4PkXjd-_Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_hmkp0u5mEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hmkp0-5mEeK0p4PkXjd-_Q" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_-z_6YO5zEeK0p4PkXjd-_Q" name="NullPropertySetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_Co0P0O50EeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_Co0P0O50EeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_Qeyn4O7GEeK0p4PkXjd-_Q" name="ComputePropertyValueCommand"/>
     <packagedElement xmi:type="uml:Interface" xmi:id="_XZJOcO8UEeK0p4PkXjd-_Q" name="ComputePropertyValueCommandItf">
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_uYMx4O8ZEeK0p4PkXjd-_Q" name="getCmdValue" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_f0BhUO8aEeK0p4PkXjd-_Q">
+      <ownedOperation xmi:id="_uYMx4O8ZEeK0p4PkXjd-_Q" name="getCmdValue" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_f0BhUO8aEeK0p4PkXjd-_Q">
           <body>	 * Execute the command and return the computed value.&#xD;
 	 * Compute the value of the Property, and return it.&#xD;
 	 * @return The computed value of the Property.&#xD;
 </body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_zjYdUO8ZEeK0p4PkXjd-_Q" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
+        <ownedParameter xmi:id="_zjYdUO8ZEeK0p4PkXjd-_Q" type="_AjTZ8Na8EeKPiuTfpuvqHA" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_rEb-0O-MEeK0p4PkXjd-_Q" name="abstractLayer_property_1" memberEnd="_rEb-0e-MEeK0p4PkXjd-_Q _rEPKgO-MEeK0p4PkXjd-_Q">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_rEb-0e-MEeK0p4PkXjd-_Q" name="abstractLayer" type="_51zAINa7EeKPiuTfpuvqHA" association="_rEb-0O-MEeK0p4PkXjd-_Q">
+      <ownedEnd xmi:id="_rEb-0e-MEeK0p4PkXjd-_Q" name="abstractLayer" type="_51zAINa7EeKPiuTfpuvqHA" association="_rEb-0O-MEeK0p4PkXjd-_Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_rEb-0u-MEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_rEb-0--MEeK0p4PkXjd-_Q" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_RnjeUO-YEeK0p4PkXjd-_Q" name="LineType">
-      <generalization xmi:type="uml:Generalization" xmi:id="_UJAucO-YEeK0p4PkXjd-_Q" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_UJAucO-YEeK0p4PkXjd-_Q" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ZGwa0O-YEeK0p4PkXjd-_Q" name="LineInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_ijurkO-YEeK0p4PkXjd-_Q" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_vpaIYO-YEeK0p4PkXjd-_Q" name="lineColor" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <generalization xmi:id="_ijurkO-YEeK0p4PkXjd-_Q" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_vpaIYO-YEeK0p4PkXjd-_Q" name="lineColor" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_x1KOQO-YEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_x1iowO-YEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_x2frAO-YEeK0p4PkXjd-_Q">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_yrVBQO-YEeK0p4PkXjd-_Q" name="lineWith" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_yrVBQO-YEeK0p4PkXjd-_Q" name="lineWith" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1JMK0O-YEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1JbbYO-YEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_1KSXAO-YEeK0p4PkXjd-_Q">
@@ -1245,89 +1245,89 @@
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_JgyOsO-cEeK0p4PkXjd-_Q" name="LinePropertySetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_QKhi0O-cEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_QKhi0O-cEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_Gvwp0O-iEeK0p4PkXjd-_Q" name="FontPropertySetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_LuAFcO-iEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_LuAFcO-iEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_OtShEO-iEeK0p4PkXjd-_Q" name="FontInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_VH6bIO-iEeK0p4PkXjd-_Q" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_Xlt6UO-iEeK0p4PkXjd-_Q" name="fontColor" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <generalization xmi:id="_VH6bIO-iEeK0p4PkXjd-_Q" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_Xlt6UO-iEeK0p4PkXjd-_Q" name="fontColor" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_aTOpcO-iEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_aTnD8O-iEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_vcdF8O-iEeK0p4PkXjd-_Q" value="15053796"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_bD8UsO-iEeK0p4PkXjd-_Q" name="fontName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_bD8UsO-iEeK0p4PkXjd-_Q" name="fontName" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_dY9rUO-iEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_dZWF0O-iEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_sZKUEO-iEeK0p4PkXjd-_Q" value="Segoe UI"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_epxy8O-iEeK0p4PkXjd-_Q" name="fontHeigh" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_epxy8O-iEeK0p4PkXjd-_Q" name="fontHeigh" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_heIw8O-iEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_hebE0O-iEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralInteger" xmi:id="_x9IS8O-iEeK0p4PkXjd-_Q" value="9"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_inEu8O-iEeK0p4PkXjd-_Q" name="bold" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
+      <ownedAttribute xmi:id="_inEu8O-iEeK0p4PkXjd-_Q" name="bold" visibility="public" type="_TqqsYNa8EeKPiuTfpuvqHA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k3zbcO-iEeK0p4PkXjd-_Q" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k4L18O-iEeK0p4PkXjd-_Q" value="1"/>
         <defaultValue xmi:type="uml:LiteralBoolean" xmi:id="_0K5LAO-iEeK0p4PkXjd-_Q" value="true"/>
       </ownedAttribute>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_Q6ta4O-iEeK0p4PkXjd-_Q" name="FontType">
-      <generalization xmi:type="uml:Generalization" xmi:id="_UKLAgO-iEeK0p4PkXjd-_Q" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_UKLAgO-iEeK0p4PkXjd-_Q" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_xZ-bMO-lEeK0p4PkXjd-_Q" name="IsVisiblePropertySetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_01zB0O-lEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_01zB0O-lEeK0p4PkXjd-_Q" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_GKddUAkdEeOnVqX9VcfeWQ" name="LayerOperatorDescriptor">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_5xnb4AkdEeOnVqX9VcfeWQ" name="propertyOperators" type="_wk7C0AkdEeOnVqX9VcfeWQ" isOrdered="true" association="_5x5vwAkdEeOnVqX9VcfeWQ">
+      <ownedAttribute xmi:id="_5xnb4AkdEeOnVqX9VcfeWQ" name="propertyOperators" type="_wk7C0AkdEeOnVqX9VcfeWQ" isOrdered="true" association="_5x5vwAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5xnb4QkdEeOnVqX9VcfeWQ"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5xnb4gkdEeOnVqX9VcfeWQ" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_ysOUQAkiEeOnVqX9VcfeWQ" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_ysOUQAkiEeOnVqX9VcfeWQ" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_1AnYwAkiEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_1A5soAkiEeOnVqX9VcfeWQ" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_1B2u4AkiEeOnVqX9VcfeWQ">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_w5x7sAkhEeOnVqX9VcfeWQ" name="getPropertyOperator" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_C90I4AkiEeOnVqX9VcfeWQ" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_MNkdAAkiEeOnVqX9VcfeWQ" name="return" type="_wk7C0AkdEeOnVqX9VcfeWQ" direction="return"/>
+      <ownedOperation xmi:id="_w5x7sAkhEeOnVqX9VcfeWQ" name="getPropertyOperator" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_C90I4AkiEeOnVqX9VcfeWQ" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_MNkdAAkiEeOnVqX9VcfeWQ" name="return" type="_wk7C0AkdEeOnVqX9VcfeWQ" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_TzuWEAkiEeOnVqX9VcfeWQ" name="setPropertyOperator">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_boCm8AkiEeOnVqX9VcfeWQ" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_eeXT0AkiEeOnVqX9VcfeWQ" name="operator" type="_wk7C0AkdEeOnVqX9VcfeWQ"/>
+      <ownedOperation xmi:id="_TzuWEAkiEeOnVqX9VcfeWQ" name="setPropertyOperator">
+        <ownedParameter xmi:id="_boCm8AkiEeOnVqX9VcfeWQ" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_eeXT0AkiEeOnVqX9VcfeWQ" name="operator" type="_wk7C0AkdEeOnVqX9VcfeWQ"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_htp6UAkiEeOnVqX9VcfeWQ" name="createLayerOperator">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_rwGPoAkiEeOnVqX9VcfeWQ" name="return" type="_WuVRUNjjEeKQqZMBCFd2Uw" direction="return"/>
+      <ownedOperation xmi:id="_htp6UAkiEeOnVqX9VcfeWQ" name="createLayerOperator">
+        <ownedParameter xmi:id="_rwGPoAkiEeOnVqX9VcfeWQ" name="return" type="_WuVRUNjjEeKQqZMBCFd2Uw" direction="return"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_oj_4UAkoEeOnVqX9VcfeWQ" name="setPropertyCollectionSize">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_x-5FcAkoEeOnVqX9VcfeWQ">
+      <ownedOperation xmi:id="_oj_4UAkoEeOnVqX9VcfeWQ" name="setPropertyCollectionSize">
+        <ownedComment xmi:id="_x-5FcAkoEeOnVqX9VcfeWQ">
           <body>Set the size of the property collection declared in the PropertyRegistry.&#xD;
 Setting the size allow to set the size of the lists indexed with Properties' index (like propertyOperators).</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_wdouEAkoEeOnVqX9VcfeWQ" name="size" type="_SuHkkNa8EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_x2wVwAkrEeOnVqX9VcfeWQ" name="defaultPropertyOperator" type="_G-g6AAkpEeOnVqX9VcfeWQ"/>
+        <ownedParameter xmi:id="_wdouEAkoEeOnVqX9VcfeWQ" name="size" type="_SuHkkNa8EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_x2wVwAkrEeOnVqX9VcfeWQ" name="defaultPropertyOperator" type="_G-g6AAkpEeOnVqX9VcfeWQ"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_KSvhUAkdEeOnVqX9VcfeWQ" name="abstractLayerOperator_layerOperatorDescriptor_1" memberEnd="_KSvhUQkdEeOnVqX9VcfeWQ _KSjUEAkdEeOnVqX9VcfeWQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_KSvhUQkdEeOnVqX9VcfeWQ" name="abstractLayerOperator" type="_WuVRUNjjEeKQqZMBCFd2Uw" association="_KSvhUAkdEeOnVqX9VcfeWQ">
+      <ownedEnd xmi:id="_KSvhUQkdEeOnVqX9VcfeWQ" name="abstractLayerOperator" type="_WuVRUNjjEeKQqZMBCFd2Uw" association="_KSvhUAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_KSvhUgkdEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_KSvhUwkdEeOnVqX9VcfeWQ" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_T5we4AkdEeOnVqX9VcfeWQ" name="LayerOperatorDescriptorRegistry">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_X8IIIAkdEeOnVqX9VcfeWQ" name="descriptors" type="_GKddUAkdEeOnVqX9VcfeWQ" aggregation="composite" association="_X8acAAkdEeOnVqX9VcfeWQ">
+      <ownedAttribute xmi:id="_X8IIIAkdEeOnVqX9VcfeWQ" name="descriptors" type="_GKddUAkdEeOnVqX9VcfeWQ" aggregation="composite" association="_X8acAAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X8IIIQkdEeOnVqX9VcfeWQ"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X8IIIgkdEeOnVqX9VcfeWQ" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_31bcAAkdEeOnVqX9VcfeWQ" name="propertyOperators" type="_wk7C0AkdEeOnVqX9VcfeWQ" isOrdered="true" aggregation="composite" association="_31lNAAkdEeOnVqX9VcfeWQ">
+      <ownedAttribute xmi:id="_31bcAAkdEeOnVqX9VcfeWQ" name="propertyOperators" type="_wk7C0AkdEeOnVqX9VcfeWQ" isOrdered="true" aggregation="composite" association="_31lNAAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_31bcAQkdEeOnVqX9VcfeWQ"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_31bcAgkdEeOnVqX9VcfeWQ" value="*"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_TfMTsAkmEeOnVqX9VcfeWQ" name="propertyCollectionSize" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_Z8ZnsAkmEeOnVqX9VcfeWQ">
+      <ownedAttribute xmi:id="_TfMTsAkmEeOnVqX9VcfeWQ" name="propertyCollectionSize" visibility="public" type="_SuHkkNa8EeKPiuTfpuvqHA">
+        <ownedComment xmi:id="_Z8ZnsAkmEeOnVqX9VcfeWQ">
           <body>This represents the number of Properties that are declared in the PrpertyRegistry.&#xD;
 This number is used to initialized the collections indexed by Properties' index &#xD;
 (like LayerOperatorDescriptor::propertyOperators).&#xD;
@@ -1340,8 +1340,8 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_rTr0UA2fEeOjX-JbGFEH7w" name="defaultOperator" visibility="public" type="_G-g6AAkpEeOnVqX9VcfeWQ" isReadOnly="true">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_xzwPEA2fEeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="_rTr0UA2fEeOjX-JbGFEH7w" name="defaultOperator" visibility="public" type="_G-g6AAkpEeOnVqX9VcfeWQ" isReadOnly="true">
+        <ownedComment xmi:id="_xzwPEA2fEeOjX-JbGFEH7w">
           <body>The default Operator used when the propertiesListSize are set.</body>
         </ownedComment>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_usAbAA2fEeOjX-JbGFEH7w" value="1"/>
@@ -1350,99 +1350,99 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_ZjkYUAkjEeOnVqX9VcfeWQ" name="addLayerOperatorDescriptor">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_kc_Y8AkjEeOnVqX9VcfeWQ" name="descriptor" type="_GKddUAkdEeOnVqX9VcfeWQ"/>
+      <ownedOperation xmi:id="_ZjkYUAkjEeOnVqX9VcfeWQ" name="addLayerOperatorDescriptor">
+        <ownedParameter xmi:id="_kc_Y8AkjEeOnVqX9VcfeWQ" name="descriptor" type="_GKddUAkdEeOnVqX9VcfeWQ"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_sQbgEAkjEeOnVqX9VcfeWQ" name="getLayerOperatorDescriptor" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_sQbgEQkjEeOnVqX9VcfeWQ" name="descriptor" type="_GKddUAkdEeOnVqX9VcfeWQ" direction="return"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_0hL1UAkjEeOnVqX9VcfeWQ" name="name" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+      <ownedOperation xmi:id="_sQbgEAkjEeOnVqX9VcfeWQ" name="getLayerOperatorDescriptor" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_sQbgEQkjEeOnVqX9VcfeWQ" name="descriptor" type="_GKddUAkdEeOnVqX9VcfeWQ" direction="return"/>
+        <ownedParameter xmi:id="_0hL1UAkjEeOnVqX9VcfeWQ" name="name" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_6Ui7EAkjEeOnVqX9VcfeWQ" name="addPropertyOperator">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="__1tdkAkjEeOnVqX9VcfeWQ" name="operator" type="_wk7C0AkdEeOnVqX9VcfeWQ"/>
+      <ownedOperation xmi:id="_6Ui7EAkjEeOnVqX9VcfeWQ" name="addPropertyOperator">
+        <ownedParameter xmi:id="__1tdkAkjEeOnVqX9VcfeWQ" name="operator" type="_wk7C0AkdEeOnVqX9VcfeWQ"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_HQzWIAkkEeOnVqX9VcfeWQ" name="getPropertyOperator" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_HQzWIQkkEeOnVqX9VcfeWQ" name="operator" type="_wk7C0AkdEeOnVqX9VcfeWQ" direction="return"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_M6KLUAkkEeOnVqX9VcfeWQ" name="name" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+      <ownedOperation xmi:id="_HQzWIAkkEeOnVqX9VcfeWQ" name="getPropertyOperator" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_HQzWIQkkEeOnVqX9VcfeWQ" name="operator" type="_wk7C0AkdEeOnVqX9VcfeWQ" direction="return"/>
+        <ownedParameter xmi:id="_M6KLUAkkEeOnVqX9VcfeWQ" name="name" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_U3cyAAkkEeOnVqX9VcfeWQ" name="attachOperatorToDescriptor" raisedException="_k-dZENxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_v9TU8A0JEeOjX-JbGFEH7w" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_csy9oAkkEeOnVqX9VcfeWQ" name="operatorName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_hIyn0AkkEeOnVqX9VcfeWQ" name="layerDescriptorName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+      <ownedOperation xmi:id="_U3cyAAkkEeOnVqX9VcfeWQ" name="attachOperatorToDescriptor" raisedException="_k-dZENxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_v9TU8A0JEeOjX-JbGFEH7w" name="property" type="_-vaacNa7EeKPiuTfpuvqHA"/>
+        <ownedParameter xmi:id="_csy9oAkkEeOnVqX9VcfeWQ" name="operatorName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+        <ownedParameter xmi:id="_hIyn0AkkEeOnVqX9VcfeWQ" name="layerDescriptorName" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
       </ownedOperation>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_p1keQBKGEeO9e9pZ1EIGJg" name="createLayerOperator" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_p1keQRKGEeO9e9pZ1EIGJg" name="return" type="_WuVRUNjjEeKQqZMBCFd2Uw" direction="return"/>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_vtq6EBKGEeO9e9pZ1EIGJg" name="layerOperatorID" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
+      <ownedOperation xmi:id="_p1keQBKGEeO9e9pZ1EIGJg" name="createLayerOperator" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedParameter xmi:id="_p1keQRKGEeO9e9pZ1EIGJg" name="return" type="_WuVRUNjjEeKQqZMBCFd2Uw" direction="return"/>
+        <ownedParameter xmi:id="_vtq6EBKGEeO9e9pZ1EIGJg" name="layerOperatorID" type="_OyQ5QL1xEeKKJJ5BmR3W3Q"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_X8acAAkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptorRegistry_layerOperatorDescriptor_1" memberEnd="_X8acAQkdEeOnVqX9VcfeWQ _X8IIIAkdEeOnVqX9VcfeWQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_X8acAQkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptorRegistry" type="_T5we4AkdEeOnVqX9VcfeWQ" association="_X8acAAkdEeOnVqX9VcfeWQ">
+      <ownedEnd xmi:id="_X8acAQkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptorRegistry" type="_T5we4AkdEeOnVqX9VcfeWQ" association="_X8acAAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_X8acAgkdEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_X8acAwkdEeOnVqX9VcfeWQ" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_wk7C0AkdEeOnVqX9VcfeWQ" name="PropertyOperator">
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_8J3zEAklEeOnVqX9VcfeWQ" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_8J3zEAklEeOnVqX9VcfeWQ" name="name" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_8J3zEQklEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_8J3zEgklEeOnVqX9VcfeWQ" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_8J3zEwklEeOnVqX9VcfeWQ">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_WKdZYAkhEeOnVqX9VcfeWQ" name="getComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_WKdZYQkhEeOnVqX9VcfeWQ">
+      <ownedOperation xmi:id="_WKdZYAkhEeOnVqX9VcfeWQ" name="getComputePropertyValueCommand" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_WKdZYQkhEeOnVqX9VcfeWQ">
           <body>Get the ComputePropertyValueCommands for the specified views and Property.&#xD;
 @return A list of Command allowing to get the value of the property for each view. The list contains null if no command is available for a View.</body>
         </ownedComment>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_WKdZYwkhEeOnVqX9VcfeWQ" name="property" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true">
+        <ownedParameter xmi:id="_WKdZYwkhEeOnVqX9VcfeWQ" name="property" type="_Qeyn4O7GEeK0p4PkXjd-_Q" isOrdered="true">
           <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_lkDZkAkhEeOnVqX9VcfeWQ"/>
           <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_lkVtcAkhEeOnVqX9VcfeWQ" value="*"/>
         </ownedParameter>
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_WKdZZAkhEeOnVqX9VcfeWQ" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" direction="return"/>
+        <ownedParameter xmi:id="_WKdZZAkhEeOnVqX9VcfeWQ" name="result" type="_Qeyn4O7GEeK0p4PkXjd-_Q" direction="return"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_31lNAAkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptorRegistry_propertyOperator_1" memberEnd="_31lNAQkdEeOnVqX9VcfeWQ _31bcAAkdEeOnVqX9VcfeWQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_31lNAQkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptorRegistry" type="_T5we4AkdEeOnVqX9VcfeWQ" association="_31lNAAkdEeOnVqX9VcfeWQ">
+      <ownedEnd xmi:id="_31lNAQkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptorRegistry" type="_T5we4AkdEeOnVqX9VcfeWQ" association="_31lNAAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_31lNAgkdEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_31lNAwkdEeOnVqX9VcfeWQ" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_5x5vwAkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptor_propertyOperator_1" memberEnd="_5x5vwQkdEeOnVqX9VcfeWQ _5xnb4AkdEeOnVqX9VcfeWQ">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_5x5vwQkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptor" type="_GKddUAkdEeOnVqX9VcfeWQ" association="_5x5vwAkdEeOnVqX9VcfeWQ">
+      <ownedEnd xmi:id="_5x5vwQkdEeOnVqX9VcfeWQ" name="layerOperatorDescriptor" type="_GKddUAkdEeOnVqX9VcfeWQ" association="_5x5vwAkdEeOnVqX9VcfeWQ">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_5x5vwgkdEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_5x5vwwkdEeOnVqX9VcfeWQ" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_G-g6AAkpEeOnVqX9VcfeWQ" name="DefaultPropertyOperator">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_MkVTAAkpEeOnVqX9VcfeWQ">
+      <ownedComment xmi:id="_MkVTAAkpEeOnVqX9VcfeWQ">
         <body>This DefaultPropertyOperator works for any Property.&#xD;
 It returns the first value of the provided list.</body>
       </ownedComment>
-      <generalization xmi:type="uml:Generalization" xmi:id="_LAjzIAkpEeOnVqX9VcfeWQ" general="_wk7C0AkdEeOnVqX9VcfeWQ"/>
+      <generalization xmi:id="_LAjzIAkpEeOnVqX9VcfeWQ" general="_wk7C0AkdEeOnVqX9VcfeWQ"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ELKvAAkxEeOnVqX9VcfeWQ" name="TopLayerOperatorDescriptor">
-      <generalization xmi:type="uml:Generalization" xmi:id="_ON-3wAkxEeOnVqX9VcfeWQ" general="_GKddUAkdEeOnVqX9VcfeWQ"/>
+      <generalization xmi:id="_ON-3wAkxEeOnVqX9VcfeWQ" general="_GKddUAkdEeOnVqX9VcfeWQ"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_Hxsw0AkxEeOnVqX9VcfeWQ" name="StackedLayerOperatorDescriptor">
-      <generalization xmi:type="uml:Generalization" xmi:id="_PQ9-wAkxEeOnVqX9VcfeWQ" general="_GKddUAkdEeOnVqX9VcfeWQ"/>
+      <generalization xmi:id="_PQ9-wAkxEeOnVqX9VcfeWQ" general="_GKddUAkdEeOnVqX9VcfeWQ"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_mt6gYAnsEeOnVqX9VcfeWQ" name="CustomPropertyOperator">
-      <generalization xmi:type="uml:Generalization" xmi:id="_SfZjMAntEeOnVqX9VcfeWQ" general="_wk7C0AkdEeOnVqX9VcfeWQ"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_yEySAAnsEeOnVqX9VcfeWQ" name="classname" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <generalization xmi:id="_SfZjMAntEeOnVqX9VcfeWQ" general="_wk7C0AkdEeOnVqX9VcfeWQ"/>
+      <ownedAttribute xmi:id="_yEySAAnsEeOnVqX9VcfeWQ" name="classname" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_yEySAQnsEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_yEySAgnsEeOnVqX9VcfeWQ" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_yEySAwnsEeOnVqX9VcfeWQ">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XTdvIAntEeOnVqX9VcfeWQ" name="operatorInstance" visibility="public" type="__ADTwAxLEeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="_XTdvIAntEeOnVqX9VcfeWQ" name="operatorInstance" visibility="public" type="__ADTwAxLEeOjX-JbGFEH7w">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_cqOYcAntEeOnVqX9VcfeWQ" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_cqgsUAntEeOnVqX9VcfeWQ" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_crLasAntEeOnVqX9VcfeWQ">
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_XwmlsA3gEeOjX-JbGFEH7w" name="classBundleID" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_c4HSEA3gEeOjX-JbGFEH7w">
+      <ownedAttribute xmi:id="_XwmlsA3gEeOjX-JbGFEH7w" name="classBundleID" visibility="public" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+        <ownedComment xmi:id="_c4HSEA3gEeOjX-JbGFEH7w">
           <body>Bundle ID of the class specified by classname.&#xD;
 This is generally the id of the plugin containing the class specified by classname.&#xD;
 This is required when the custom operator is defined by its classname, and the operator is not located in the current &#xD;
@@ -1455,85 +1455,102 @@
           <value xsi:nil="true"/>
         </defaultValue>
       </ownedAttribute>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_vbiJ8A3gEeOjX-JbGFEH7w" name="resetOperatorInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
-        <ownedComment xmi:type="uml:Comment" xmi:id="_y6QTkA3gEeOjX-JbGFEH7w">
+      <ownedOperation xmi:id="_vbiJ8A3gEeOjX-JbGFEH7w" name="resetOperatorInstance" raisedException="_iYKFMNxGEeKwptaAAanMDg">
+        <ownedComment xmi:id="_y6QTkA3gEeOjX-JbGFEH7w">
           <body>Set the operator instance from the classname and BundleID if and only if this two properties are set.</body>
         </ownedComment>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_FDpEUAxAEeOjX-JbGFEH7w" name="layersStackApplication_layerOperatorDescriptorRegistry_1" memberEnd="_FDpEUQxAEeOjX-JbGFEH7w _FDc3EAxAEeOjX-JbGFEH7w">
-      <ownedEnd xmi:type="uml:Property" xmi:id="_FDpEUQxAEeOjX-JbGFEH7w" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_FDpEUAxAEeOjX-JbGFEH7w">
+      <ownedEnd xmi:id="_FDpEUQxAEeOjX-JbGFEH7w" name="layersStackApplication" type="_DN8s0NjhEeKQqZMBCFd2Uw" association="_FDpEUAxAEeOjX-JbGFEH7w">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_FDpEUgxAEeOjX-JbGFEH7w" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_FDpEUwxAEeOjX-JbGFEH7w" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_G7XE0AxJEeOjX-JbGFEH7w" name="AndStackedLayerOperatorDescriptor">
-      <generalization xmi:type="uml:Generalization" xmi:id="_Uq4v4AxJEeOjX-JbGFEH7w" general="_Hxsw0AkxEeOnVqX9VcfeWQ"/>
+      <generalization xmi:id="_Uq4v4AxJEeOjX-JbGFEH7w" general="_Hxsw0AkxEeOnVqX9VcfeWQ"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_LUfBMAxJEeOjX-JbGFEH7w" name="OrStackedLayerOperatorDescriptor">
-      <generalization xmi:type="uml:Generalization" xmi:id="_TzDwAAxJEeOjX-JbGFEH7w" general="_Hxsw0AkxEeOnVqX9VcfeWQ"/>
+      <generalization xmi:id="_TzDwAAxJEeOjX-JbGFEH7w" general="_Hxsw0AkxEeOnVqX9VcfeWQ"/>
     </packagedElement>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="__ADTwAxLEeOjX-JbGFEH7w" name="CustomPropertyOpertorInstance"/>
     <packagedElement xmi:type="uml:Class" xmi:id="_Xxh1cBZ1EeOZwp016gnCFQ" name="IsAbstractUmlSetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_a8mqUBZ1EeOZwp016gnCFQ" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_a8mqUBZ1EeOZwp016gnCFQ" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Enumeration" xmi:id="_7cWpgFVHEeOah7Z-UYdQAA" name="EventLevel">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_ItnrQFVIEeOah7Z-UYdQAA" name="level1"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="__fkAQFVHEeOah7Z-UYdQAA" name="allLevels">
+      <ownedLiteral xmi:id="_ItnrQFVIEeOah7Z-UYdQAA" name="level1"/>
+      <ownedLiteral xmi:id="__fkAQFVHEeOah7Z-UYdQAA" name="allLevels">
         <specification xmi:type="uml:LiteralInteger" xmi:id="_gy8lIFVLEeOah7Z-UYdQAA" name="intValue" value="-1"/>
       </ownedLiteral>
     </packagedElement>
     <packagedElement xmi:type="uml:Association" xmi:id="_PznBc2Q5EeOlpfB_tZS-QA" name="layerExpression_layersStack_1" memberEnd="_PznBdGQ5EeOlpfB_tZS-QA _PznBcGQ5EeOlpfB_tZS-QA">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_KyI2MGQ6EeOlpfB_tZS-QA" annotatedElement="_PznBc2Q5EeOlpfB_tZS-QA">
+      <ownedComment xmi:id="_KyI2MGQ6EeOlpfB_tZS-QA" annotatedElement="_PznBc2Q5EeOlpfB_tZS-QA">
         <body>The LayerStack owning this LayerExpression.&#xD;
 This property is set by the LayerStack when the LayerExpression is attach to a parent.&#xD;
 The LayerStack listen to node addition/removal.&#xD;
 During the load from the Resource, this property is set by the LayerStack calling &#xD;
 layerStackChanged().</body>
       </ownedComment>
-      <ownedEnd xmi:type="uml:Property" xmi:id="_PznBdGQ5EeOlpfB_tZS-QA" name="layerExpression" type="_9IaAANjiEeKQqZMBCFd2Uw" association="_PznBc2Q5EeOlpfB_tZS-QA">
+      <ownedEnd xmi:id="_PznBdGQ5EeOlpfB_tZS-QA" name="layerExpression" type="_9IaAANjiEeKQqZMBCFd2Uw" association="_PznBc2Q5EeOlpfB_tZS-QA">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_PznBdWQ5EeOlpfB_tZS-QA" value="1"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_PznBdmQ5EeOlpfB_tZS-QA" value="1"/>
       </ownedEnd>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_ft-hUGtpEeOlpfB_tZS-QA" name="AllViewsDerivedLayer">
-      <generalization xmi:type="uml:Generalization" xmi:id="_p-dSoGtpEeOlpfB_tZS-QA" general="_51zAINa7EeKPiuTfpuvqHA"/>
+      <generalization xmi:id="_p-dSoGtpEeOlpfB_tZS-QA" general="_51zAINa7EeKPiuTfpuvqHA"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Enumeration" xmi:id="_8__xgHltEeOlpfB_tZS-QA" name="LayerState">
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_AKMcoHluEeOlpfB_tZS-QA" name="detached"/>
-      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_BUS4QHluEeOlpfB_tZS-QA" name="attached"/>
+      <ownedLiteral xmi:id="_AKMcoHluEeOlpfB_tZS-QA" name="detached"/>
+      <ownedLiteral xmi:id="_BUS4QHluEeOlpfB_tZS-QA" name="attached"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Interface" xmi:id="_RopgYHpGEeOlpfB_tZS-QA" name="LayersContainer">
-      <ownedComment xmi:type="uml:Comment" xmi:id="_igIa4HpGEeOlpfB_tZS-QA" annotatedElement="_RopgYHpGEeOlpfB_tZS-QA">
+      <ownedComment xmi:id="_igIa4HpGEeOlpfB_tZS-QA" annotatedElement="_RopgYHpGEeOlpfB_tZS-QA">
         <body>Layers implementing this interface can contains others layers.&#xD;
 The interface provide one method allowing to add a LayerExpression to the container.</body>
       </ownedComment>
-      <ownedOperation xmi:type="uml:Operation" xmi:id="_jHtYQHpGEeOlpfB_tZS-QA" name="addLayer">
-        <ownedParameter xmi:type="uml:Parameter" xmi:id="_qpEQ4HpGEeOlpfB_tZS-QA" name="layer" type="_9IaAANjiEeKQqZMBCFd2Uw"/>
+      <ownedOperation xmi:id="_jHtYQHpGEeOlpfB_tZS-QA" name="addLayer">
+        <ownedParameter xmi:id="_qpEQ4HpGEeOlpfB_tZS-QA" name="layer" type="_9IaAANjiEeKQqZMBCFd2Uw"/>
       </ownedOperation>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_DEE3EM-FEeep-sEmK3jrig" name="CSSPropertySetter">
-      <generalization xmi:type="uml:Generalization" xmi:id="_FFptQM-FEeep-sEmK3jrig" general="_fyVlIO3vEeKwLp35IbAIig"/>
+      <generalization xmi:id="_FFptQM-FEeep-sEmK3jrig" general="_fyVlIO3vEeKwLp35IbAIig"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_JqnGMM-FEeep-sEmK3jrig" name="CSSType">
-      <generalization xmi:type="uml:Generalization" xmi:id="_Lq474M-FEeep-sEmK3jrig" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+      <generalization xmi:id="_Lq474M-FEeep-sEmK3jrig" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
     </packagedElement>
     <packagedElement xmi:type="uml:Class" xmi:id="_dxmCkM-FEeep-sEmK3jrig" name="CSSInstance">
-      <generalization xmi:type="uml:Generalization" xmi:id="_iC0nMM-FEeep-sEmK3jrig" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_jnqeEM-FEeep-sEmK3jrig" name="stylesheet" aggregation="composite">
+      <generalization xmi:id="_iC0nMM-FEeep-sEmK3jrig" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_jnqeEM-FEeep-sEmK3jrig" name="stylesheet" aggregation="composite">
         <type xmi:type="uml:Interface" href="pathmap://STYLESHEETS/StyleSheets.uml#_SV34ANBHEeeeIb5NcUL5SQ"/>
       </ownedAttribute>
-      <ownedAttribute xmi:type="uml:Property" xmi:id="_cvND8Nm2Eeev9v2e6pD5eA" name="style" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+      <ownedAttribute xmi:id="_cvND8Nm2Eeev9v2e6pD5eA" name="style" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wfCroNm2Eeev9v2e6pD5eA"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wfO44Nm2Eeev9v2e6pD5eA" value="1"/>
         <defaultValue xmi:type="uml:LiteralString" xmi:id="_4YbCsNm2Eeev9v2e6pD5eA"/>
       </ownedAttribute>
     </packagedElement>
-    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_X07z8LcsEeK8_t7Rpq6ZJA">
-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_X2lZwLcsEeK8_t7Rpq6ZJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+    <packagedElement xmi:type="uml:Class" xmi:id="_0OlN0HVZEeipp8d5W3Vl9g" name="CSSHidePropertySetter">
+      <generalization xmi:id="_0OlN0XVZEeipp8d5W3Vl9g" general="_fyVlIO3vEeKwLp35IbAIig"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_0Omb8HVZEeipp8d5W3Vl9g" name="CSSHideType">
+      <generalization xmi:id="_0Omb8XVZEeipp8d5W3Vl9g" general="_EoL3oNhcEeKgkM6XJF9t4A"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_0Omb8nVZEeipp8d5W3Vl9g" name="CSSHideInstance">
+      <generalization xmi:id="_0Omb83VZEeipp8d5W3Vl9g" general="_AjTZ8Na8EeKPiuTfpuvqHA"/>
+      <ownedAttribute xmi:id="_0Omb9HVZEeipp8d5W3Vl9g" name="stylesheet" aggregation="composite">
+        <type xmi:type="uml:Interface" href="pathmap://STYLESHEETS/StyleSheets.uml#_SV34ANBHEeeeIb5NcUL5SQ"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_0Omb9XVZEeipp8d5W3Vl9g" name="style" type="_OyQ5QL1xEeKKJJ5BmR3W3Q">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_0Omb9nVZEeipp8d5W3Vl9g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_0Omb93VZEeipp8d5W3Vl9g" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_0Omb-HVZEeipp8d5W3Vl9g"/>
+      </ownedAttribute>
+    </packagedElement>
+    <profileApplication xmi:id="_X07z8LcsEeK8_t7Rpq6ZJA">
+      <eAnnotations xmi:id="_X2lZwLcsEeK8_t7Rpq6ZJA" source="http://www.eclipse.org/uml2/2.0.0/UML">
         <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
       </eAnnotations>
-      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
     </profileApplication>
   </uml:Model>
   <Ecore:EPackage xmi:id="_ZYU5ULcsEeK8_t7Rpq6ZJA" base_Package="_gAOFQLcqEeK8_t7Rpq6ZJA" packageName="layers" nsPrefix="layers" nsURI="http://www.eclipse.org/papyrus/infra/gmfdiag/layers" basePackage="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model" prefix="Layers"/>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/notation/notation.uml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/notation/notation.uml
index b9721b5..5236d37 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/notation/notation.uml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/model/notation/notation.uml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
   <uml:Model xmi:id="_AziHILcnEeKeLJDBCBPhPw" name="notation" URI="http://www.eclipse.org/gmf/runtime/1.0.2/notation">
     <packagedElement xmi:type="uml:Class" xmi:id="_AziHIbcnEeKeLJDBCBPhPw" name="Edge">
       <generalization xmi:id="_AziHIrcnEeKeLJDBCBPhPw" general="_AziHOrcnEeKeLJDBCBPhPw"/>
@@ -153,7 +153,7 @@
     <packagedElement xmi:type="uml:Association" xmi:id="_AziHeLcnEeKeLJDBCBPhPw" memberEnd="_AziHcLcnEeKeLJDBCBPhPw _AziHebcnEeKeLJDBCBPhPw">
       <ownedEnd xmi:id="_AziHebcnEeKeLJDBCBPhPw" type="_AziHbrcnEeKeLJDBCBPhPw" association="_AziHeLcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziHercnEeKeLJDBCBPhPw" clientDependency="_AziHfbcnEeKeLJDBCBPhPw" name="NamedStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziHercnEeKeLJDBCBPhPw" name="NamedStyle">
       <ownedAttribute xmi:id="_AziHe7cnEeKeLJDBCBPhPw" name="name" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziHfLcnEeKeLJDBCBPhPw"/>
@@ -229,7 +229,7 @@
     <packagedElement xmi:type="uml:Association" xmi:id="_AziHqrcnEeKeLJDBCBPhPw" memberEnd="_AziHKbcnEeKeLJDBCBPhPw _AziHq7cnEeKeLJDBCBPhPw">
       <ownedEnd xmi:id="_AziHq7cnEeKeLJDBCBPhPw" type="_AziHIbcnEeKeLJDBCBPhPw" association="_AziHqrcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziHrLcnEeKeLJDBCBPhPw" clientDependency="_AziHtbcnEeKeLJDBCBPhPw" name="FillStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziHrLcnEeKeLJDBCBPhPw" name="FillStyle">
       <ownedAttribute xmi:id="_AziHrbcnEeKeLJDBCBPhPw" name="fillColor" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziHrrcnEeKeLJDBCBPhPw"/>
@@ -250,7 +250,7 @@
       <interfaceRealization xmi:id="_AziHtbcnEeKeLJDBCBPhPw" client="_AziHrLcnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
     <packagedElement xmi:type="uml:PrimitiveType" xmi:id="_AziHtrcnEeKeLJDBCBPhPw" name="GradientData"/>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziHt7cnEeKeLJDBCBPhPw" clientDependency="_AziHvrcnEeKeLJDBCBPhPw" name="LineStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziHt7cnEeKeLJDBCBPhPw" name="LineStyle">
       <ownedAttribute xmi:id="_AziHuLcnEeKeLJDBCBPhPw" name="lineColor" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziHubcnEeKeLJDBCBPhPw"/>
@@ -267,7 +267,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziHvrcnEeKeLJDBCBPhPw" client="_AziHt7cnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziHv7cnEeKeLJDBCBPhPw" clientDependency="_AziH1bcnEeKeLJDBCBPhPw" name="FontStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziHv7cnEeKeLJDBCBPhPw" name="FontStyle">
       <ownedAttribute xmi:id="_AziHwLcnEeKeLJDBCBPhPw" name="fontColor" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziHwbcnEeKeLJDBCBPhPw"/>
@@ -319,7 +319,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziH1bcnEeKeLJDBCBPhPw" client="_AziHv7cnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziH1rcnEeKeLJDBCBPhPw" clientDependency="_AziH2rcnEeKeLJDBCBPhPw" name="TitleStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziH1rcnEeKeLJDBCBPhPw" name="TitleStyle">
       <ownedAttribute xmi:id="_AziH17cnEeKeLJDBCBPhPw" name="showTitle" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziH2LcnEeKeLJDBCBPhPw"/>
@@ -329,7 +329,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziH2rcnEeKeLJDBCBPhPw" client="_AziH1rcnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziH27cnEeKeLJDBCBPhPw" clientDependency="_AziH5LcnEeKeLJDBCBPhPw" name="SortingStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziH27cnEeKeLJDBCBPhPw" name="SortingStyle">
       <ownedAttribute xmi:id="_AziH3LcnEeKeLJDBCBPhPw" name="sorting" visibility="public" type="_AziH5bcnEeKeLJDBCBPhPw" isOrdered="true">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziH3bcnEeKeLJDBCBPhPw"/>
         <defaultValue xmi:type="uml:InstanceValue" xmi:id="_AziH3rcnEeKeLJDBCBPhPw" type="_AziH5bcnEeKeLJDBCBPhPw" instance="_AziH5rcnEeKeLJDBCBPhPw"/>
@@ -353,7 +353,7 @@
     <packagedElement xmi:type="uml:Association" xmi:id="_AziH6rcnEeKeLJDBCBPhPw" memberEnd="_AziH4bcnEeKeLJDBCBPhPw _AziH67cnEeKeLJDBCBPhPw">
       <ownedEnd xmi:id="_AziH67cnEeKeLJDBCBPhPw" type="_AziH27cnEeKeLJDBCBPhPw" association="_AziH6rcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziH7LcnEeKeLJDBCBPhPw" clientDependency="_AziH8LcnEeKeLJDBCBPhPw" name="DescriptionStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziH7LcnEeKeLJDBCBPhPw" name="DescriptionStyle">
       <ownedAttribute xmi:id="_AziH7bcnEeKeLJDBCBPhPw" name="description" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziH7rcnEeKeLJDBCBPhPw"/>
@@ -363,7 +363,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziH8LcnEeKeLJDBCBPhPw" client="_AziH7LcnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziH8bcnEeKeLJDBCBPhPw" clientDependency="_AziH-LcnEeKeLJDBCBPhPw" name="Size">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziH8bcnEeKeLJDBCBPhPw" name="Size">
       <ownedAttribute xmi:id="_AziH8rcnEeKeLJDBCBPhPw" name="width" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziH87cnEeKeLJDBCBPhPw"/>
@@ -380,7 +380,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziH-LcnEeKeLJDBCBPhPw" client="_AziH8bcnEeKeLJDBCBPhPw" supplier="_AziHd7cnEeKeLJDBCBPhPw" contract="_AziHd7cnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziH-bcnEeKeLJDBCBPhPw" clientDependency="_AziIALcnEeKeLJDBCBPhPw" name="Location">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziH-bcnEeKeLJDBCBPhPw" name="Location">
       <ownedAttribute xmi:id="_AziH-rcnEeKeLJDBCBPhPw" name="x" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziH-7cnEeKeLJDBCBPhPw"/>
@@ -401,7 +401,7 @@
       <generalization xmi:id="_AziIArcnEeKeLJDBCBPhPw" general="_AziH-bcnEeKeLJDBCBPhPw"/>
       <generalization xmi:id="_AziIA7cnEeKeLJDBCBPhPw" general="_AziH8bcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIBLcnEeKeLJDBCBPhPw" clientDependency="_AziICLcnEeKeLJDBCBPhPw" name="Ratio">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIBLcnEeKeLJDBCBPhPw" name="Ratio">
       <ownedAttribute xmi:id="_AziIBbcnEeKeLJDBCBPhPw" name="value" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EDouble"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIBrcnEeKeLJDBCBPhPw"/>
@@ -416,7 +416,7 @@
       <ownedLiteral xmi:id="_AziIC7cnEeKeLJDBCBPhPw" name="Manual"/>
       <ownedLiteral xmi:id="_AziIDLcnEeKeLJDBCBPhPw" name="Automatic"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIDbcnEeKeLJDBCBPhPw" clientDependency="_AziIEbcnEeKeLJDBCBPhPw" name="IdentityAnchor">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIDbcnEeKeLJDBCBPhPw" name="IdentityAnchor">
       <ownedAttribute xmi:id="_AziIDrcnEeKeLJDBCBPhPw" name="id" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziID7cnEeKeLJDBCBPhPw"/>
@@ -488,7 +488,7 @@
         </defaultValue>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIO7cnEeKeLJDBCBPhPw" clientDependency="_AziIP7cnEeKeLJDBCBPhPw" name="RoundedCornersStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIO7cnEeKeLJDBCBPhPw" name="RoundedCornersStyle">
       <ownedAttribute xmi:id="_AziIPLcnEeKeLJDBCBPhPw" name="roundedBendpointsRadius" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIPbcnEeKeLJDBCBPhPw"/>
@@ -498,7 +498,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziIP7cnEeKeLJDBCBPhPw" client="_AziIO7cnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIQLcnEeKeLJDBCBPhPw" clientDependency="_AziIQ7cnEeKeLJDBCBPhPw" name="RelativeBendpoints">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIQLcnEeKeLJDBCBPhPw" name="RelativeBendpoints">
       <ownedAttribute xmi:id="_AziIQbcnEeKeLJDBCBPhPw" name="points" visibility="public" type="_AziIRLcnEeKeLJDBCBPhPw" isOrdered="true">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIQrcnEeKeLJDBCBPhPw"/>
       </ownedAttribute>
@@ -511,7 +511,7 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIR7cnEeKeLJDBCBPhPw"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziISLcnEeKeLJDBCBPhPw" clientDependency="_AziITLcnEeKeLJDBCBPhPw" name="CanonicalStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziISLcnEeKeLJDBCBPhPw" name="CanonicalStyle">
       <ownedAttribute xmi:id="_AziISbcnEeKeLJDBCBPhPw" name="canonical" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziISrcnEeKeLJDBCBPhPw"/>
@@ -532,7 +532,7 @@
       <generalization xmi:id="_AziIVLcnEeKeLJDBCBPhPw" general="_AziIJLcnEeKeLJDBCBPhPw"/>
       <generalization xmi:id="_AziIVbcnEeKeLJDBCBPhPw" general="_AziHt7cnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIVrcnEeKeLJDBCBPhPw" clientDependency="_AziIY7cnEeKeLJDBCBPhPw" name="PageStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIVrcnEeKeLJDBCBPhPw" name="PageStyle">
       <ownedAttribute xmi:id="_AziIV7cnEeKeLJDBCBPhPw" name="pageX" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EInt"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIWLcnEeKeLJDBCBPhPw"/>
@@ -563,7 +563,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziIY7cnEeKeLJDBCBPhPw" client="_AziIVrcnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIZLcnEeKeLJDBCBPhPw" clientDependency="_AziIaLcnEeKeLJDBCBPhPw" name="DrawerStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIZLcnEeKeLJDBCBPhPw" name="DrawerStyle">
       <ownedAttribute xmi:id="_AziIZbcnEeKeLJDBCBPhPw" name="collapsed" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBoolean"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIZrcnEeKeLJDBCBPhPw"/>
@@ -573,7 +573,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_AziIaLcnEeKeLJDBCBPhPw" client="_AziIZLcnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIabcnEeKeLJDBCBPhPw" clientDependency="_AziIcLcnEeKeLJDBCBPhPw" name="GuideStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIabcnEeKeLJDBCBPhPw" name="GuideStyle">
       <ownedAttribute xmi:id="_AziIarcnEeKeLJDBCBPhPw" name="horizontalGuides" type="_AziIcbcnEeKeLJDBCBPhPw" isOrdered="true" aggregation="composite" association="_AziIh7cnEeKeLJDBCBPhPw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIa7cnEeKeLJDBCBPhPw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_AziIbLcnEeKeLJDBCBPhPw" value="*"/>
@@ -623,7 +623,7 @@
     <packagedElement xmi:type="uml:Association" xmi:id="_AziIibcnEeKeLJDBCBPhPw" memberEnd="_AziIbbcnEeKeLJDBCBPhPw _AziIircnEeKeLJDBCBPhPw">
       <ownedEnd xmi:id="_AziIircnEeKeLJDBCBPhPw" type="_AziIabcnEeKeLJDBCBPhPw" association="_AziIibcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIi7cnEeKeLJDBCBPhPw" clientDependency="_AziIlLcnEeKeLJDBCBPhPw" name="FilteringStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIi7cnEeKeLJDBCBPhPw" name="FilteringStyle">
       <ownedAttribute xmi:id="_AziIjLcnEeKeLJDBCBPhPw" name="filtering" visibility="public" type="_AziICbcnEeKeLJDBCBPhPw" isOrdered="true">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIjbcnEeKeLJDBCBPhPw"/>
         <defaultValue xmi:type="uml:InstanceValue" xmi:id="_AziIjrcnEeKeLJDBCBPhPw" type="_AziICbcnEeKeLJDBCBPhPw" instance="_AziICrcnEeKeLJDBCBPhPw"/>
@@ -651,7 +651,7 @@
       <generalization xmi:id="_AziInbcnEeKeLJDBCBPhPw" general="_AziIabcnEeKeLJDBCBPhPw"/>
       <generalization xmi:id="_AziInrcnEeKeLJDBCBPhPw" general="_AziH7LcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziIn7cnEeKeLJDBCBPhPw" clientDependency="_AziIp7cnEeKeLJDBCBPhPw" name="ImageStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziIn7cnEeKeLJDBCBPhPw" name="ImageStyle">
       <ownedAttribute xmi:id="_AziIoLcnEeKeLJDBCBPhPw" name="antiAlias" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EBooleanObject"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziIobcnEeKeLJDBCBPhPw"/>
@@ -771,7 +771,7 @@
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziI3rcnEeKeLJDBCBPhPw"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_AziI37cnEeKeLJDBCBPhPw" clientDependency="_AziI5LcnEeKeLJDBCBPhPw" name="PropertyValue">
+    <packagedElement xmi:type="uml:Class" xmi:id="_AziI37cnEeKeLJDBCBPhPw" name="PropertyValue">
       <ownedAttribute xmi:id="_AziI4LcnEeKeLJDBCBPhPw" name="rawValue" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_AziI4bcnEeKeLJDBCBPhPw"/>
@@ -850,7 +850,7 @@
         </ownedParameter>
       </ownedOperation>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4KLcnEeKeLJDBCBPhPw" clientDependency="_Azr4LLcnEeKeLJDBCBPhPw" name="DataTypeStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4KLcnEeKeLJDBCBPhPw" name="DataTypeStyle">
       <generalization xmi:id="_Azr4KbcnEeKeLJDBCBPhPw" general="_AziHercnEeKeLJDBCBPhPw"/>
       <ownedAttribute xmi:id="_Azr4KrcnEeKeLJDBCBPhPw" name="instanceType" isOrdered="true" association="_Azr4LbcnEeKeLJDBCBPhPw">
         <type xmi:type="uml:Class" href="ecore.uml#_A45J37cnEeKeLJDBCBPhPw"/>
@@ -957,7 +957,7 @@
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Azr4aLcnEeKeLJDBCBPhPw" value="*"/>
       </ownedAttribute>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4abcnEeKeLJDBCBPhPw" clientDependency="_Azr4bbcnEeKeLJDBCBPhPw" name="HintedDiagramLinkStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4abcnEeKeLJDBCBPhPw" name="HintedDiagramLinkStyle">
       <generalization xmi:id="_Azr4arcnEeKeLJDBCBPhPw" general="_Azr4brcnEeKeLJDBCBPhPw"/>
       <ownedAttribute xmi:id="_Azr4a7cnEeKeLJDBCBPhPw" name="hint" visibility="public" isOrdered="true">
         <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/EcorePrimitiveTypes.library.uml#EString"/>
@@ -965,7 +965,7 @@
       </ownedAttribute>
       <interfaceRealization xmi:id="_Azr4bbcnEeKeLJDBCBPhPw" client="_Azr4abcnEeKeLJDBCBPhPw" supplier="_AziHbbcnEeKeLJDBCBPhPw" contract="_AziHbbcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4brcnEeKeLJDBCBPhPw" clientDependency="_Azr4cbcnEeKeLJDBCBPhPw" name="DiagramLinkStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4brcnEeKeLJDBCBPhPw" name="DiagramLinkStyle">
       <ownedAttribute xmi:id="_Azr4b7cnEeKeLJDBCBPhPw" name="diagramLink" type="_AziHhrcnEeKeLJDBCBPhPw" isOrdered="true" association="_Azr4crcnEeKeLJDBCBPhPw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Azr4cLcnEeKeLJDBCBPhPw"/>
       </ownedAttribute>
@@ -974,7 +974,7 @@
     <packagedElement xmi:type="uml:Association" xmi:id="_Azr4crcnEeKeLJDBCBPhPw" memberEnd="_Azr4b7cnEeKeLJDBCBPhPw _Azr4c7cnEeKeLJDBCBPhPw">
       <ownedEnd xmi:id="_Azr4c7cnEeKeLJDBCBPhPw" type="_Azr4brcnEeKeLJDBCBPhPw" association="_Azr4crcnEeKeLJDBCBPhPw"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4dLcnEeKeLJDBCBPhPw" clientDependency="_Azr4eLcnEeKeLJDBCBPhPw" name="MultiDiagramLinkStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4dLcnEeKeLJDBCBPhPw" name="MultiDiagramLinkStyle">
       <ownedAttribute xmi:id="_Azr4dbcnEeKeLJDBCBPhPw" name="diagramLinks" type="_AziHhrcnEeKeLJDBCBPhPw" isOrdered="true" association="_Azr4ebcnEeKeLJDBCBPhPw">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Azr4drcnEeKeLJDBCBPhPw"/>
         <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_Azr4d7cnEeKeLJDBCBPhPw" value="*"/>
@@ -989,7 +989,7 @@
       <ownedLiteral xmi:id="_Azr4fbcnEeKeLJDBCBPhPw" name="Right"/>
       <ownedLiteral xmi:id="_Azr4frcnEeKeLJDBCBPhPw" name="Center"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4f7cnEeKeLJDBCBPhPw" clientDependency="_Azr4g7cnEeKeLJDBCBPhPw" name="TextStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4f7cnEeKeLJDBCBPhPw" name="TextStyle">
       <ownedAttribute xmi:id="_Azr4gLcnEeKeLJDBCBPhPw" name="textAlignment" visibility="public" type="_Azr4e7cnEeKeLJDBCBPhPw" isOrdered="true">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Azr4gbcnEeKeLJDBCBPhPw"/>
         <defaultValue xmi:type="uml:InstanceValue" xmi:id="_Azr4grcnEeKeLJDBCBPhPw" type="_Azr4e7cnEeKeLJDBCBPhPw" instance="_Azr4fLcnEeKeLJDBCBPhPw"/>
@@ -1004,7 +1004,7 @@
       <ownedLiteral xmi:id="_Azr4ibcnEeKeLJDBCBPhPw" name="DashDotDot"/>
       <ownedLiteral xmi:id="_Azr4ircnEeKeLJDBCBPhPw" name="Double"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4i7cnEeKeLJDBCBPhPw" clientDependency="_Azr4j7cnEeKeLJDBCBPhPw" name="LineTypeStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4i7cnEeKeLJDBCBPhPw" name="LineTypeStyle">
       <ownedAttribute xmi:id="_Azr4jLcnEeKeLJDBCBPhPw" name="lineType" visibility="public" type="_Azr4hLcnEeKeLJDBCBPhPw" isOrdered="true">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Azr4jbcnEeKeLJDBCBPhPw"/>
         <defaultValue xmi:type="uml:InstanceValue" xmi:id="_Azr4jrcnEeKeLJDBCBPhPw" type="_Azr4hLcnEeKeLJDBCBPhPw" instance="_Azr4hbcnEeKeLJDBCBPhPw"/>
@@ -1016,7 +1016,7 @@
       <ownedLiteral xmi:id="_Azr4krcnEeKeLJDBCBPhPw" name="OpenArrow"/>
       <ownedLiteral xmi:id="_Azr4k7cnEeKeLJDBCBPhPw" name="SolidArrow"/>
     </packagedElement>
-    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4lLcnEeKeLJDBCBPhPw" clientDependency="_Azr4m7cnEeKeLJDBCBPhPw" name="ArrowStyle">
+    <packagedElement xmi:type="uml:Class" xmi:id="_Azr4lLcnEeKeLJDBCBPhPw" name="ArrowStyle">
       <ownedAttribute xmi:id="_Azr4lbcnEeKeLJDBCBPhPw" name="arrowSource" visibility="public" type="_Azr4kLcnEeKeLJDBCBPhPw" isOrdered="true">
         <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_Azr4lrcnEeKeLJDBCBPhPw"/>
         <defaultValue xmi:type="uml:InstanceValue" xmi:id="_Azr4l7cnEeKeLJDBCBPhPw" type="_Azr4kLcnEeKeLJDBCBPhPw" instance="_Azr4kbcnEeKeLJDBCBPhPw"/>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHideInstance.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHideInstance.java
new file mode 100755
index 0000000..3bfb535
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHideInstance.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers;
+
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>CSS Hide Instance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStylesheet <em>Stylesheet</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStyle <em>Style</em>}</li>
+ * </ul>
+ *
+ * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage#getCSSHideInstance()
+ * @model
+ * @generated
+ */
+public interface CSSHideInstance extends TypeInstance {
+	/**
+	 * Returns the value of the '<em><b>Stylesheet</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Stylesheet</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>Stylesheet</em>' containment reference.
+	 * @see #setStylesheet(StyleSheet)
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage#getCSSHideInstance_Stylesheet()
+	 * @model containment="true" required="true" ordered="false"
+	 * @generated
+	 */
+	StyleSheet getStylesheet();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStylesheet <em>Stylesheet</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Stylesheet</em>' containment reference.
+	 * @see #getStylesheet()
+	 * @generated
+	 */
+	void setStylesheet(StyleSheet value);
+
+	/**
+	 * Returns the value of the '<em><b>Style</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Style</em>' attribute.
+	 * @see #setStyle(String)
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage#getCSSHideInstance_Style()
+	 * @model dataType="org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.String" ordered="false"
+	 * @generated
+	 */
+	String getStyle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStyle <em>Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Style</em>' attribute.
+	 * @see #getStyle()
+	 * @generated
+	 */
+	void setStyle(String value);
+
+} // CSSHideInstance
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHidePropertySetter.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHidePropertySetter.java
new file mode 100755
index 0000000..403722e
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHidePropertySetter.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>CSS Hide Property Setter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage#getCSSHidePropertySetter()
+ * @model
+ * @generated
+ */
+public interface CSSHidePropertySetter extends PropertySetter {
+} // CSSHidePropertySetter
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHideType.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHideType.java
new file mode 100755
index 0000000..72a75ff
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/CSSHideType.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>CSS Hide Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage#getCSSHideType()
+ * @model
+ * @generated
+ */
+public interface CSSHideType extends Type {
+} // CSSHideType
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersFactory.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersFactory.java
index c1fed98..d70c2ca 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersFactory.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersFactory.java
@@ -546,6 +546,33 @@
 	CSSInstance createCSSInstance();
 
 	/**
+	 * Returns a new object of class '<em>CSS Hide Property Setter</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>CSS Hide Property Setter</em>'.
+	 * @generated
+	 */
+	CSSHidePropertySetter createCSSHidePropertySetter();
+
+	/**
+	 * Returns a new object of class '<em>CSS Hide Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>CSS Hide Type</em>'.
+	 * @generated
+	 */
+	CSSHideType createCSSHideType();
+
+	/**
+	 * Returns a new object of class '<em>CSS Hide Instance</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>CSS Hide Instance</em>'.
+	 * @generated
+	 */
+	CSSHideInstance createCSSHideInstance();
+
+	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersPackage.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersPackage.java
index 42591c9..6fbdcef 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersPackage.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/LayersPackage.java
@@ -6417,6 +6417,198 @@
 	int CSS_INSTANCE_OPERATION_COUNT = TYPE_INSTANCE_OPERATION_COUNT + 0;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHidePropertySetterImpl <em>CSS Hide Property Setter</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHidePropertySetterImpl
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getCSSHidePropertySetter()
+	 * @generated
+	 */
+	int CSS_HIDE_PROPERTY_SETTER = 72;
+
+	/**
+	 * The feature id for the '<em><b>Property</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_PROPERTY_SETTER__PROPERTY = PROPERTY_SETTER__PROPERTY;
+
+	/**
+	 * The feature id for the '<em><b>Property Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_PROPERTY_SETTER__PROPERTY_NAME = PROPERTY_SETTER__PROPERTY_NAME;
+
+	/**
+	 * The number of structural features of the '<em>CSS Hide Property Setter</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_PROPERTY_SETTER_FEATURE_COUNT = PROPERTY_SETTER_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Set Value</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_PROPERTY_SETTER___SET_VALUE__VIEW_TYPEINSTANCE = PROPERTY_SETTER___SET_VALUE__VIEW_TYPEINSTANCE;
+
+	/**
+	 * The number of operations of the '<em>CSS Hide Property Setter</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_PROPERTY_SETTER_OPERATION_COUNT = PROPERTY_SETTER_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideTypeImpl <em>CSS Hide Type</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideTypeImpl
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getCSSHideType()
+	 * @generated
+	 */
+	int CSS_HIDE_TYPE = 73;
+
+	/**
+	 * The feature id for the '<em><b>Metamodel</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_TYPE__METAMODEL = TYPE__METAMODEL;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_TYPE__NAME = TYPE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_TYPE__DESCRIPTION = TYPE__DESCRIPTION;
+
+	/**
+	 * The number of structural features of the '<em>CSS Hide Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The operation id for the '<em>Create Instance</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_TYPE___CREATE_INSTANCE = TYPE___CREATE_INSTANCE;
+
+	/**
+	 * The number of operations of the '<em>CSS Hide Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_TYPE_OPERATION_COUNT = TYPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideInstanceImpl <em>CSS Hide Instance</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideInstanceImpl
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getCSSHideInstance()
+	 * @generated
+	 */
+	int CSS_HIDE_INSTANCE = 74;
+
+	/**
+	 * The feature id for the '<em><b>Stylesheet</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_INSTANCE__STYLESHEET = TYPE_INSTANCE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Style</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_INSTANCE__STYLE = TYPE_INSTANCE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>CSS Hide Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_INSTANCE_FEATURE_COUNT = TYPE_INSTANCE_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Get Cmd Value</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_INSTANCE___GET_CMD_VALUE = TYPE_INSTANCE___GET_CMD_VALUE;
+
+	/**
+	 * The operation id for the '<em>Set Value From String</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_INSTANCE___SET_VALUE_FROM_STRING__STRING = TYPE_INSTANCE___SET_VALUE_FROM_STRING__STRING;
+
+	/**
+	 * The operation id for the '<em>Set Value From Instance</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_INSTANCE___SET_VALUE_FROM_INSTANCE__TYPEINSTANCE = TYPE_INSTANCE___SET_VALUE_FROM_INSTANCE__TYPEINSTANCE;
+
+	/**
+	 * The number of operations of the '<em>CSS Hide Instance</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CSS_HIDE_INSTANCE_OPERATION_COUNT = TYPE_INSTANCE_OPERATION_COUNT + 0;
+
+	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayerState <em>Layer State</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -6424,7 +6616,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getLayerState()
 	 * @generated
 	 */
-	int LAYER_STATE = 72;
+	int LAYER_STATE = 75;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.EventLevel <em>Event Level</em>}' enum.
@@ -6434,7 +6626,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getEventLevel()
 	 * @generated
 	 */
-	int EVENT_LEVEL = 73;
+	int EVENT_LEVEL = 76;
 
 	/**
 	 * The meta object id for the '<em>String</em>' data type.
@@ -6444,7 +6636,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getString()
 	 * @generated
 	 */
-	int STRING = 74;
+	int STRING = 77;
 
 	/**
 	 * The meta object id for the '<em>boolean</em>' data type.
@@ -6453,7 +6645,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getboolean()
 	 * @generated
 	 */
-	int BOOLEAN = 75;
+	int BOOLEAN = 78;
 
 	/**
 	 * The meta object id for the '<em>EPackage</em>' data type.
@@ -6463,7 +6655,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getEPackage()
 	 * @generated
 	 */
-	int EPACKAGE = 76;
+	int EPACKAGE = 79;
 
 	/**
 	 * The meta object id for the '<em>Exception</em>' data type.
@@ -6473,7 +6665,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getLayersException()
 	 * @generated
 	 */
-	int LAYERS_EXCEPTION = 77;
+	int LAYERS_EXCEPTION = 80;
 
 	/**
 	 * The meta object id for the '<em>int</em>' data type.
@@ -6482,7 +6674,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getint()
 	 * @generated
 	 */
-	int INT = 78;
+	int INT = 81;
 
 	/**
 	 * The meta object id for the '<em>Bad State Exception</em>' data type.
@@ -6492,7 +6684,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getBadStateException()
 	 * @generated
 	 */
-	int BAD_STATE_EXCEPTION = 79;
+	int BAD_STATE_EXCEPTION = 82;
 
 	/**
 	 * The meta object id for the '<em>Not Found Exception</em>' data type.
@@ -6502,7 +6694,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getNotFoundException()
 	 * @generated
 	 */
-	int NOT_FOUND_EXCEPTION = 80;
+	int NOT_FOUND_EXCEPTION = 83;
 
 	/**
 	 * The meta object id for the '<em>Compute Property Value Command</em>' data type.
@@ -6512,7 +6704,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getComputePropertyValueCommand()
 	 * @generated
 	 */
-	int COMPUTE_PROPERTY_VALUE_COMMAND = 81;
+	int COMPUTE_PROPERTY_VALUE_COMMAND = 84;
 
 	/**
 	 * The meta object id for the '<em>Object</em>' data type.
@@ -6522,7 +6714,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getObject()
 	 * @generated
 	 */
-	int OBJECT = 82;
+	int OBJECT = 85;
 
 	/**
 	 * The meta object id for the '<em>Custom Property Opertor Instance</em>' data type.
@@ -6532,7 +6724,7 @@
 	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getCustomPropertyOpertorInstance()
 	 * @generated
 	 */
-	int CUSTOM_PROPERTY_OPERTOR_INSTANCE = 83;
+	int CUSTOM_PROPERTY_OPERTOR_INSTANCE = 86;
 
 
 	/**
@@ -8986,6 +9178,58 @@
 	EAttribute getCSSInstance_Style();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter <em>CSS Hide Property Setter</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>CSS Hide Property Setter</em>'.
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter
+	 * @generated
+	 */
+	EClass getCSSHidePropertySetter();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType <em>CSS Hide Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>CSS Hide Type</em>'.
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType
+	 * @generated
+	 */
+	EClass getCSSHideType();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance <em>CSS Hide Instance</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>CSS Hide Instance</em>'.
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance
+	 * @generated
+	 */
+	EClass getCSSHideInstance();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStylesheet <em>Stylesheet</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Stylesheet</em>'.
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStylesheet()
+	 * @see #getCSSHideInstance()
+	 * @generated
+	 */
+	EReference getCSSHideInstance_Stylesheet();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStyle <em>Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Style</em>'.
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance#getStyle()
+	 * @see #getCSSHideInstance()
+	 * @generated
+	 */
+	EAttribute getCSSHideInstance_Style();
+
+	/**
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayerState <em>Layer State</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -11155,6 +11399,52 @@
 		EAttribute CSS_INSTANCE__STYLE = eINSTANCE.getCSSInstance_Style();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHidePropertySetterImpl <em>CSS Hide Property Setter</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHidePropertySetterImpl
+		 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getCSSHidePropertySetter()
+		 * @generated
+		 */
+		EClass CSS_HIDE_PROPERTY_SETTER = eINSTANCE.getCSSHidePropertySetter();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideTypeImpl <em>CSS Hide Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideTypeImpl
+		 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getCSSHideType()
+		 * @generated
+		 */
+		EClass CSS_HIDE_TYPE = eINSTANCE.getCSSHideType();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideInstanceImpl <em>CSS Hide Instance</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideInstanceImpl
+		 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.LayersPackageImpl#getCSSHideInstance()
+		 * @generated
+		 */
+		EClass CSS_HIDE_INSTANCE = eINSTANCE.getCSSHideInstance();
+
+		/**
+		 * The meta object literal for the '<em><b>Stylesheet</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference CSS_HIDE_INSTANCE__STYLESHEET = eINSTANCE.getCSSHideInstance_Stylesheet();
+
+		/**
+		 * The meta object literal for the '<em><b>Style</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute CSS_HIDE_INSTANCE__STYLE = eINSTANCE.getCSSHideInstance_Style();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayerState <em>Layer State</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHideInstanceImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHideInstanceImpl.java
new file mode 100755
index 0000000..9e72b9b
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHideInstanceImpl.java
@@ -0,0 +1,333 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.TypeInstance;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>CSS Hide Instance</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideInstanceImpl#getStylesheet <em>Stylesheet</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.CSSHideInstanceImpl#getStyle <em>Style</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class CSSHideInstanceImpl extends TypeInstanceImpl implements CSSHideInstance {
+	/**
+	 * The cached value of the '{@link #getStylesheet() <em>Stylesheet</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getStylesheet()
+	 * @generated
+	 * @ordered
+	 */
+	protected StyleSheet stylesheet;
+
+	/**
+	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String STYLE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected String style = STYLE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected CSSHideInstanceImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return LayersPackage.Literals.CSS_HIDE_INSTANCE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public StyleSheet getStylesheet() {
+		return stylesheet;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public NotificationChain basicSetStylesheet(StyleSheet newStylesheet, NotificationChain msgs) {
+		StyleSheet oldStylesheet = stylesheet;
+		stylesheet = newStylesheet;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET, oldStylesheet, newStylesheet);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setStylesheet(StyleSheet newStylesheet) {
+		if (newStylesheet != stylesheet) {
+			NotificationChain msgs = null;
+			if (stylesheet != null)
+				msgs = ((InternalEObject) stylesheet).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET, null, msgs);
+			if (newStylesheet != null)
+				msgs = ((InternalEObject) newStylesheet).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET, null, msgs);
+			msgs = basicSetStylesheet(newStylesheet, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET, newStylesheet, newStylesheet));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String getStyle() {
+		return style;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void setStyle(String newStyle) {
+		String oldStyle = style;
+		style = newStyle;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, LayersPackage.CSS_HIDE_INSTANCE__STYLE, oldStyle, style));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET:
+			return basicSetStylesheet(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 LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET:
+			return getStylesheet();
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLE:
+			return getStyle();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET:
+			setStylesheet((StyleSheet) newValue);
+			return;
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLE:
+			setStyle((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET:
+			setStylesheet((StyleSheet) null);
+			return;
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLE:
+			setStyle(STYLE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLESHEET:
+			return stylesheet != null;
+		case LayersPackage.CSS_HIDE_INSTANCE__STYLE:
+			return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
+		}
+		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(" (style: "); //$NON-NLS-1$
+		result.append(style);
+		result.append(')');
+		return result.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void setValueFromString(String value) {
+		int i = 0;
+		i++;
+		// TODO
+		// if (value == null || value.length() == 0) {
+		// return;
+		// }
+		//
+		// // The value should contains the values, separated by comma
+		// // "FontName, FontHeight, FontColor, Bold"
+		// String[] values = value.split(",");
+		// int i = 0;
+		// try {
+		// setFontName(values[i++].trim());
+		// setFontHeigh(Integer.parseInt(values[i++].trim()));
+		// setFontColor(Integer.parseInt(values[i++].trim()));
+		// setBold(Boolean.parseBoolean(values[i++].trim()));
+		// } catch (NumberFormatException e) {
+		// // fail silently
+		// e.printStackTrace();
+		// }
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 *
+	 * @generated NOT
+	 */
+	@Override
+	public void setValueFromInstance(TypeInstance value) {
+		int i = 0;
+		i++;
+		// TODO
+		// Check if the value is of the right instance
+		// if (!getClass().isInstance(value)) {
+		// return;
+		// }
+		//
+		// FontInstance instance = (FontInstance) value;
+		// setFontName(instance.getFontName());
+		// setFontHeigh(instance.getFontHeigh());
+		// setFontColor(instance.getFontColor());
+		// setBold(instance.isBold());
+	}
+
+} // CSSHideInstanceImpl
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHidePropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHidePropertySetterImpl.java
new file mode 100755
index 0000000..4b528e6
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHidePropertySetterImpl.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.TypeInstance;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>CSS Hide Property Setter</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CSSHidePropertySetterImpl extends PropertySetterImpl implements CSSHidePropertySetter {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected CSSHidePropertySetterImpl() {
+		super();
+		setPropertyName("cssHide");
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return LayersPackage.Literals.CSS_HIDE_PROPERTY_SETTER;
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertySetterImpl#setValue(org.eclipse.gmf.runtime.notation.View, org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.TypeInstance)
+	 *
+	 * @param view
+	 * @param value
+	 */
+	@Override
+	public void setValue(View view, TypeInstance value) {
+
+
+	}
+
+} // CSSHidePropertySetterImpl
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHideTypeImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHideTypeImpl.java
new file mode 100755
index 0000000..d2d21ad
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSHideTypeImpl.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2013, 2017 CEA LIST & LIFL 
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *   Cedric Dumoulin  Cedric.dumoulin@lifl.fr - Initial API and implementation
+ *   Quentin Le Menez quentin.lemenez@cea.fr
+ * 
+ */
+package org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersFactory;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>CSS Hide Type</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class CSSHideTypeImpl extends TypeImpl implements CSSHideType {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated NOT
+	 */
+	protected CSSHideTypeImpl() {
+		super();
+		setName("CSSHideType");
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return LayersPackage.Literals.CSS_HIDE_TYPE;
+	}
+
+	@Override
+	public org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.TypeInstance createInstance() {
+		return LayersFactory.eINSTANCE.createCSSHideInstance();
+	};
+
+} // CSSHideTypeImpl
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSPropertySetterImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSPropertySetterImpl.java
index 91ad03b..695eb2e 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSPropertySetterImpl.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/CSSPropertySetterImpl.java
@@ -4,10 +4,7 @@
 
 import java.util.List;
 import java.util.ArrayList;
-import java.util.Collections;
-
 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.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -17,16 +14,11 @@
 import org.eclipse.gmf.runtime.notation.StringListValueStyle;
 import org.eclipse.gmf.runtime.notation.View;
 import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
 import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResource;
 import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
 import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddAllCSSStyleSheetCommand;
-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddAllModelStyleSheetCommand;
 import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCSSStyleSheetCommand;
 import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCssClassStyleCommand;
-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.RemoveAllCSSStyleSheetValueCommand;
-import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.RemoveCSSStyleSheetCommand;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.EmbeddedStyleSheet;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
 import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
@@ -118,6 +110,9 @@
 				String ssPath = ((StyleSheetReference) ss).getPath();
 				if (sheetPath.equals(ssPath)) {
 					sheetIsApplied = true;
+					// There may be discrepancies in the memory addresses between the layer's CSS and the model's
+					// Always revert to the model's CSS as it is the one being used
+					sheet = ss;
 					break;
 				}
 			}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersFactoryImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersFactoryImpl.java
index 59c440d..359262b 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersFactoryImpl.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersFactoryImpl.java
@@ -132,6 +132,9 @@
 			case LayersPackage.CSS_PROPERTY_SETTER: return createCSSPropertySetter();
 			case LayersPackage.CSS_TYPE: return createCSSType();
 			case LayersPackage.CSS_INSTANCE: return createCSSInstance();
+			case LayersPackage.CSS_HIDE_PROPERTY_SETTER: return createCSSHidePropertySetter();
+			case LayersPackage.CSS_HIDE_TYPE: return createCSSHideType();
+			case LayersPackage.CSS_HIDE_INSTANCE: return createCSSHideInstance();
 			default:
 				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
@@ -880,6 +883,36 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public CSSHidePropertySetter createCSSHidePropertySetter() {
+		CSSHidePropertySetterImpl cssHidePropertySetter = new CSSHidePropertySetterImpl();
+		return cssHidePropertySetter;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CSSHideType createCSSHideType() {
+		CSSHideTypeImpl cssHideType = new CSSHideTypeImpl();
+		return cssHideType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public CSSHideInstance createCSSHideInstance() {
+		CSSHideInstanceImpl cssHideInstance = new CSSHideInstanceImpl();
+		return cssHideInstance;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public LayerState createLayerStateFromString(EDataType eDataType, String initialValue) {
 		LayerState result = LayerState.get(initialValue);
 		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersPackageImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersPackageImpl.java
index 1cd698d..d7ff2d6 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersPackageImpl.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/LayersPackageImpl.java
@@ -36,6 +36,9 @@
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.ApplicationDependantElement;
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.BooleanInstance;
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.BooleanType;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType;
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSInstance;
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSPropertySetter;
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSType;
@@ -618,6 +621,27 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	private EClass cssHidePropertySetterEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cssHideTypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass cssHideInstanceEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	private EEnum layerStateEEnum = null;
 
 	/**
@@ -3105,6 +3129,51 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EClass getCSSHidePropertySetter() {
+		return cssHidePropertySetterEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCSSHideType() {
+		return cssHideTypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getCSSHideInstance() {
+		return cssHideInstanceEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getCSSHideInstance_Stylesheet() {
+		return (EReference)cssHideInstanceEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getCSSHideInstance_Style() {
+		return (EAttribute)cssHideInstanceEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public EEnum getLayerState() {
 		return layerStateEEnum;
@@ -3555,6 +3624,14 @@
 		createEReference(cssInstanceEClass, CSS_INSTANCE__STYLESHEET);
 		createEAttribute(cssInstanceEClass, CSS_INSTANCE__STYLE);
 
+		cssHidePropertySetterEClass = createEClass(CSS_HIDE_PROPERTY_SETTER);
+
+		cssHideTypeEClass = createEClass(CSS_HIDE_TYPE);
+
+		cssHideInstanceEClass = createEClass(CSS_HIDE_INSTANCE);
+		createEReference(cssHideInstanceEClass, CSS_HIDE_INSTANCE__STYLESHEET);
+		createEAttribute(cssHideInstanceEClass, CSS_HIDE_INSTANCE__STYLE);
+
 		// Create enums
 		layerStateEEnum = createEEnum(LAYER_STATE);
 		eventLevelEEnum = createEEnum(EVENT_LEVEL);
@@ -3657,6 +3734,9 @@
 		cssPropertySetterEClass.getESuperTypes().add(this.getPropertySetter());
 		cssTypeEClass.getESuperTypes().add(this.getType());
 		cssInstanceEClass.getESuperTypes().add(this.getTypeInstance());
+		cssHidePropertySetterEClass.getESuperTypes().add(this.getPropertySetter());
+		cssHideTypeEClass.getESuperTypes().add(this.getType());
+		cssHideInstanceEClass.getESuperTypes().add(this.getTypeInstance());
 
 		// Initialize classes, features, and operations; add parameters
 		initEClass(layerNamedStyleEClass, LayerNamedStyle.class, "LayerNamedStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
@@ -4117,6 +4197,14 @@
 		initEReference(getCSSInstance_Stylesheet(), theStylesheetsPackage.getStyleSheet(), null, "stylesheet", null, 1, 1, CSSInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 		initEAttribute(getCSSInstance_Style(), this.getString(), "style", null, 0, 1, CSSInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
 
+		initEClass(cssHidePropertySetterEClass, CSSHidePropertySetter.class, "CSSHidePropertySetter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(cssHideTypeEClass, CSSHideType.class, "CSSHideType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
+		initEClass(cssHideInstanceEClass, CSSHideInstance.class, "CSSHideInstance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEReference(getCSSHideInstance_Stylesheet(), theStylesheetsPackage.getStyleSheet(), null, "stylesheet", null, 1, 1, CSSHideInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getCSSHideInstance_Style(), this.getString(), "style", null, 0, 1, CSSHideInstance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED); //$NON-NLS-1$
+
 		// Initialize enums and add enum literals
 		initEEnum(layerStateEEnum, LayerState.class, "LayerState"); //$NON-NLS-1$
 		addEEnumLiteral(layerStateEEnum, LayerState.DETACHED);
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertyRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertyRegistryImpl.java
index 5b3dbb7..2b22467 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertyRegistryImpl.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertyRegistryImpl.java
@@ -42,9 +42,9 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertyRegistryImpl#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertyRegistryImpl#getTypeRegistry <em>Type Registry</em>}</li>
- *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertyRegistryImpl#getPropertiesCount <em>Properties Count</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertyRegistryImpl#getProperties <em>Properties</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertyRegistryImpl#getTypeRegistry <em>Type Registry</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertyRegistryImpl#getPropertiesCount <em>Properties Count</em>}</li>
  * </ul>
  *
  * @generated
@@ -54,6 +54,7 @@
 	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getProperties()
 	 * @generated
 	 * @ordered
@@ -64,6 +65,7 @@
 	 * The cached value of the '{@link #getTypeRegistry() <em>Type Registry</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTypeRegistry()
 	 * @generated
 	 * @ordered
@@ -74,6 +76,7 @@
 	 * The default value of the '{@link #getPropertiesCount() <em>Properties Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPropertiesCount()
 	 * @generated
 	 * @ordered
@@ -115,6 +118,7 @@
 				// "fgcolor", "Color",
 
 				"css", "CSSType", "",
+				"cssHide", "CSSHideType", "",
 				// "isVisible", "boolean", "true",
 				// "isAbstract", "boolean", "false",
 				// "fill", "Fill", "0, 15053796", // "transparency, fillColor"
@@ -145,6 +149,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -155,6 +160,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,6 +174,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -178,6 +185,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypeRegistry(TypeRegistry newTypeRegistry, NotificationChain msgs) {
@@ -185,7 +193,10 @@
 		typeRegistry = newTypeRegistry;
 		if (eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY, oldTypeRegistry, newTypeRegistry);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -193,6 +204,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -200,13 +212,13 @@
 		if (newTypeRegistry != typeRegistry) {
 			NotificationChain msgs = null;
 			if (typeRegistry != null)
-				msgs = ((InternalEObject)typeRegistry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY, null, msgs);
+				msgs = ((InternalEObject) typeRegistry).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY, null, msgs);
 			if (newTypeRegistry != null)
-				msgs = ((InternalEObject)newTypeRegistry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY, null, msgs);
+				msgs = ((InternalEObject) newTypeRegistry).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY, null, msgs);
 			msgs = basicSetTypeRegistry(newTypeRegistry, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY, newTypeRegistry, newTypeRegistry));
 	}
 
@@ -284,15 +296,16 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
-				return basicSetTypeRegistry(null, msgs);
+		case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
+			return ((InternalEList<?>) getProperties()).basicRemove(otherEnd, msgs);
+		case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
+			return basicSetTypeRegistry(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -300,17 +313,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
-				return getProperties();
-			case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
-				return getTypeRegistry();
-			case LayersPackage.PROPERTY_REGISTRY__PROPERTIES_COUNT:
-				return getPropertiesCount();
+		case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
+			return getProperties();
+		case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
+			return getTypeRegistry();
+		case LayersPackage.PROPERTY_REGISTRY__PROPERTIES_COUNT:
+			return getPropertiesCount();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -318,19 +332,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends Property>)newValue);
-				return;
-			case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
-				setTypeRegistry((TypeRegistry)newValue);
-				return;
+		case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
+			getProperties().clear();
+			getProperties().addAll((Collection<? extends Property>) newValue);
+			return;
+		case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
+			setTypeRegistry((TypeRegistry) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -338,17 +353,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
-				getProperties().clear();
-				return;
-			case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
-				setTypeRegistry((TypeRegistry)null);
-				return;
+		case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
+			getProperties().clear();
+			return;
+		case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
+			setTypeRegistry((TypeRegistry) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -356,17 +372,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
-				return typeRegistry != null;
-			case LayersPackage.PROPERTY_REGISTRY__PROPERTIES_COUNT:
-				return getPropertiesCount() != PROPERTIES_COUNT_EDEFAULT;
+		case LayersPackage.PROPERTY_REGISTRY__PROPERTIES:
+			return properties != null && !properties.isEmpty();
+		case LayersPackage.PROPERTY_REGISTRY__TYPE_REGISTRY:
+			return typeRegistry != null;
+		case LayersPackage.PROPERTY_REGISTRY__PROPERTIES_COUNT:
+			return getPropertiesCount() != PROPERTIES_COUNT_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -374,28 +391,27 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case LayersPackage.PROPERTY_REGISTRY___GET_PROPERTY_INDEX__STRING:
-				try {
-					return getPropertyIndex((String)arguments.get(0));
-				}
-				catch (Throwable throwable) {
-					throw new InvocationTargetException(throwable);
-				}
-			case LayersPackage.PROPERTY_REGISTRY___GET_PROPERTY__STRING:
-				try {
-					return getProperty((String)arguments.get(0));
-				}
-				catch (Throwable throwable) {
-					throw new InvocationTargetException(throwable);
-				}
-			case LayersPackage.PROPERTY_REGISTRY___ADD_PROPERTY__PROPERTY:
-				addProperty((Property)arguments.get(0));
-				return null;
+		case LayersPackage.PROPERTY_REGISTRY___GET_PROPERTY_INDEX__STRING:
+			try {
+				return getPropertyIndex((String) arguments.get(0));
+			} catch (Throwable throwable) {
+				throw new InvocationTargetException(throwable);
+			}
+		case LayersPackage.PROPERTY_REGISTRY___GET_PROPERTY__STRING:
+			try {
+				return getProperty((String) arguments.get(0));
+			} catch (Throwable throwable) {
+				throw new InvocationTargetException(throwable);
+			}
+		case LayersPackage.PROPERTY_REGISTRY___ADD_PROPERTY__PROPERTY:
+			addProperty((Property) arguments.get(0));
+			return null;
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertySetterRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertySetterRegistryImpl.java
index a70cedb..1791e20 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertySetterRegistryImpl.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/PropertySetterRegistryImpl.java
@@ -45,9 +45,9 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertySetterRegistryImpl#getPropertySetters <em>Property Setters</em>}</li>
- *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertySetterRegistryImpl#getSetterMap <em>Setter Map</em>}</li>
- *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertySetterRegistryImpl#getApplication <em>Application</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertySetterRegistryImpl#getPropertySetters <em>Property Setters</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertySetterRegistryImpl#getSetterMap <em>Setter Map</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.PropertySetterRegistryImpl#getApplication <em>Application</em>}</li>
  * </ul>
  *
  * @generated
@@ -57,6 +57,7 @@
 	 * The cached value of the '{@link #getPropertySetters() <em>Property Setters</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getPropertySetters()
 	 * @generated
 	 * @ordered
@@ -67,6 +68,7 @@
 	 * The cached value of the '{@link #getSetterMap() <em>Setter Map</em>}' map.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSetterMap()
 	 * @generated
 	 * @ordered
@@ -89,18 +91,20 @@
 	 */
 	protected void init() {
 
-		addPropertySetter(LayersFactory.eINSTANCE.createFillPropertySetter());
-		addPropertySetter(LayersFactory.eINSTANCE.createIsValidPropertySetter());
-		addPropertySetter(LayersFactory.eINSTANCE.createLinePropertySetter());
-		addPropertySetter(LayersFactory.eINSTANCE.createFontPropertySetter());
-		addPropertySetter(LayersFactory.eINSTANCE.createIsVisiblePropertySetter());
-		addPropertySetter(LayersFactory.eINSTANCE.createIsAbstractUmlSetter());
+		// addPropertySetter(LayersFactory.eINSTANCE.createFillPropertySetter());
+		// addPropertySetter(LayersFactory.eINSTANCE.createIsValidPropertySetter());
+		// addPropertySetter(LayersFactory.eINSTANCE.createLinePropertySetter());
+		// addPropertySetter(LayersFactory.eINSTANCE.createFontPropertySetter());
+		// addPropertySetter(LayersFactory.eINSTANCE.createIsVisiblePropertySetter());
+		// addPropertySetter(LayersFactory.eINSTANCE.createIsAbstractUmlSetter());
 		addPropertySetter(LayersFactory.eINSTANCE.createCSSPropertySetter());
+		addPropertySetter(LayersFactory.eINSTANCE.createCSSHidePropertySetter());
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -129,12 +133,13 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EMap<String, PropertySetter> getSetterMap() {
 		if (setterMap == null) {
-			setterMap = new EcoreEMap<String,PropertySetter>(LayersPackage.Literals.STRING_TO_PROPERTY_SETTER, StringToPropertySetterImpl.class, this, LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP);
+			setterMap = new EcoreEMap<String, PropertySetter>(LayersPackage.Literals.STRING_TO_PROPERTY_SETTER, StringToPropertySetterImpl.class, this, LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP);
 		}
 		return setterMap;
 	}
@@ -142,21 +147,24 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public LayersStackApplication getApplication() {
-		if (eContainerFeatureID() != LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION) return null;
-		return (LayersStackApplication)eInternalContainer();
+		if (eContainerFeatureID() != LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION)
+			return null;
+		return (LayersStackApplication) eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetApplication(LayersStackApplication newApplication, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newApplication, LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION, msgs);
+		msgs = eBasicSetContainer((InternalEObject) newApplication, LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION, msgs);
 		return msgs;
 	}
 
@@ -249,15 +257,16 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetApplication((LayersStackApplication)otherEnd, msgs);
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			return basicSetApplication((LayersStackApplication) otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -265,15 +274,16 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
-				return ((InternalEList<?>)getSetterMap()).basicRemove(otherEnd, msgs);
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
-				return basicSetApplication(null, msgs);
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
+			return ((InternalEList<?>) getSetterMap()).basicRemove(otherEnd, msgs);
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
+			return basicSetApplication(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -281,13 +291,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
-				return eInternalContainer().eInverseRemove(this, LayersPackage.LAYERS_STACK_APPLICATION__PROPERTY_SETTER_REGISTRY, LayersStackApplication.class, msgs);
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
+			return eInternalContainer().eInverseRemove(this, LayersPackage.LAYERS_STACK_APPLICATION__PROPERTY_SETTER_REGISTRY, LayersStackApplication.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -295,18 +306,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
-				return getPropertySetters();
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
-				if (coreType) return getSetterMap();
-				else return getSetterMap().map();
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
-				return getApplication();
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
+			return getPropertySetters();
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
+			if (coreType)
+				return getSetterMap();
+			else
+				return getSetterMap().map();
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
+			return getApplication();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -314,22 +328,23 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
-				getPropertySetters().clear();
-				getPropertySetters().addAll((Collection<? extends PropertySetter>)newValue);
-				return;
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
-				((EStructuralFeature.Setting)getSetterMap()).set(newValue);
-				return;
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
-				setApplication((LayersStackApplication)newValue);
-				return;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
+			getPropertySetters().clear();
+			getPropertySetters().addAll((Collection<? extends PropertySetter>) newValue);
+			return;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
+			((EStructuralFeature.Setting) getSetterMap()).set(newValue);
+			return;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
+			setApplication((LayersStackApplication) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -337,20 +352,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
-				getPropertySetters().clear();
-				return;
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
-				getSetterMap().clear();
-				return;
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
-				setApplication((LayersStackApplication)null);
-				return;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
+			getPropertySetters().clear();
+			return;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
+			getSetterMap().clear();
+			return;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
+			setApplication((LayersStackApplication) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -358,17 +374,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
-				return propertySetters != null && !propertySetters.isEmpty();
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
-				return setterMap != null && !setterMap.isEmpty();
-			case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
-				return getApplication() != null;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__PROPERTY_SETTERS:
+			return propertySetters != null && !propertySetters.isEmpty();
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__SETTER_MAP:
+			return setterMap != null && !setterMap.isEmpty();
+		case LayersPackage.PROPERTY_SETTER_REGISTRY__APPLICATION:
+			return getApplication() != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -376,28 +393,27 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
 		switch (operationID) {
-			case LayersPackage.PROPERTY_SETTER_REGISTRY___GET_PROPERTY_SETTER__PROPERTY:
-				try {
-					return getPropertySetter((Property)arguments.get(0));
-				}
-				catch (Throwable throwable) {
-					throw new InvocationTargetException(throwable);
-				}
-			case LayersPackage.PROPERTY_SETTER_REGISTRY___GET_PROPERTY_SETTER__STRING:
-				try {
-					return getPropertySetter((String)arguments.get(0));
-				}
-				catch (Throwable throwable) {
-					throw new InvocationTargetException(throwable);
-				}
-			case LayersPackage.PROPERTY_SETTER_REGISTRY___ADD_PROPERTY_SETTER__PROPERTYSETTER:
-				addPropertySetter((PropertySetter)arguments.get(0));
-				return null;
+		case LayersPackage.PROPERTY_SETTER_REGISTRY___GET_PROPERTY_SETTER__PROPERTY:
+			try {
+				return getPropertySetter((Property) arguments.get(0));
+			} catch (Throwable throwable) {
+				throw new InvocationTargetException(throwable);
+			}
+		case LayersPackage.PROPERTY_SETTER_REGISTRY___GET_PROPERTY_SETTER__STRING:
+			try {
+				return getPropertySetter((String) arguments.get(0));
+			} catch (Throwable throwable) {
+				throw new InvocationTargetException(throwable);
+			}
+		case LayersPackage.PROPERTY_SETTER_REGISTRY___ADD_PROPERTY_SETTER__PROPERTYSETTER:
+			addPropertySetter((PropertySetter) arguments.get(0));
+			return null;
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/TypeRegistryImpl.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/TypeRegistryImpl.java
index cc0b44d..d10c5f1 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/TypeRegistryImpl.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/impl/TypeRegistryImpl.java
@@ -33,7 +33,7 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.TypeRegistryImpl#getTypes <em>Types</em>}</li>
+ * <li>{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.impl.TypeRegistryImpl#getTypes <em>Types</em>}</li>
  * </ul>
  *
  * @generated
@@ -43,6 +43,7 @@
 	 * The cached value of the '{@link #getTypes() <em>Types</em>}' map.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTypes()
 	 * @generated
 	 * @ordered
@@ -75,11 +76,12 @@
 		type = LayersFactory.eINSTANCE.createStringType();
 		getTypes().put(type.getName(), type);
 
-		addType(LayersFactory.eINSTANCE.createColor());
-		addType(LayersFactory.eINSTANCE.createFill());
-		addType(LayersFactory.eINSTANCE.createLineType());
-		addType(LayersFactory.eINSTANCE.createFontType());
+		// addType(LayersFactory.eINSTANCE.createColor());
+		// addType(LayersFactory.eINSTANCE.createFill());
+		// addType(LayersFactory.eINSTANCE.createLineType());
+		// addType(LayersFactory.eINSTANCE.createFontType());
 		addType(LayersFactory.eINSTANCE.createCSSType());
+		addType(LayersFactory.eINSTANCE.createCSSHideType());
 	}
 
 	/**
@@ -96,6 +98,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -106,12 +109,13 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EMap<String, Type> getTypes() {
 		if (types == null) {
-			types = new EcoreEMap<String,Type>(LayersPackage.Literals.STRING_TO_TYPE_MAP, StringToTypeMapImpl.class, this, LayersPackage.TYPE_REGISTRY__TYPES);
+			types = new EcoreEMap<String, Type>(LayersPackage.Literals.STRING_TO_TYPE_MAP, StringToTypeMapImpl.class, this, LayersPackage.TYPE_REGISTRY__TYPES);
 		}
 		return types;
 	}
@@ -119,13 +123,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case LayersPackage.TYPE_REGISTRY__TYPES:
-				return ((InternalEList<?>)getTypes()).basicRemove(otherEnd, msgs);
+		case LayersPackage.TYPE_REGISTRY__TYPES:
+			return ((InternalEList<?>) getTypes()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -133,14 +138,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case LayersPackage.TYPE_REGISTRY__TYPES:
-				if (coreType) return getTypes();
-				else return getTypes().map();
+		case LayersPackage.TYPE_REGISTRY__TYPES:
+			if (coreType)
+				return getTypes();
+			else
+				return getTypes().map();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -148,14 +156,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case LayersPackage.TYPE_REGISTRY__TYPES:
-				((EStructuralFeature.Setting)getTypes()).set(newValue);
-				return;
+		case LayersPackage.TYPE_REGISTRY__TYPES:
+			((EStructuralFeature.Setting) getTypes()).set(newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -163,14 +172,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case LayersPackage.TYPE_REGISTRY__TYPES:
-				getTypes().clear();
-				return;
+		case LayersPackage.TYPE_REGISTRY__TYPES:
+			getTypes().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -178,13 +188,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case LayersPackage.TYPE_REGISTRY__TYPES:
-				return types != null && !types.isEmpty();
+		case LayersPackage.TYPE_REGISTRY__TYPES:
+			return types != null && !types.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersAdapterFactory.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersAdapterFactory.java
index 71f2a05..2d82207 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersAdapterFactory.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersAdapterFactory.java
@@ -367,6 +367,18 @@
 				return createCSSInstanceAdapter();
 			}
 			@Override
+			public Adapter caseCSSHidePropertySetter(CSSHidePropertySetter object) {
+				return createCSSHidePropertySetterAdapter();
+			}
+			@Override
+			public Adapter caseCSSHideType(CSSHideType object) {
+				return createCSSHideTypeAdapter();
+			}
+			@Override
+			public Adapter caseCSSHideInstance(CSSHideInstance object) {
+				return createCSSHideInstanceAdapter();
+			}
+			@Override
 			public Adapter caseStyle(Style object) {
 				return createStyleAdapter();
 			}
@@ -787,6 +799,48 @@
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter <em>CSS Hide Property Setter</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.internal.infra.gmfdiag.layers.model.layers.CSSHidePropertySetter
+	 * @generated
+	 */
+	public Adapter createCSSHidePropertySetterAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType <em>CSS Hide Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @see org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideType
+	 * @generated
+	 */
+	public Adapter createCSSHideTypeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance <em>CSS Hide Instance</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.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance
+	 * @generated
+	 */
+	public Adapter createCSSHideInstanceAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.TypeInstance <em>Type Instance</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersSwitch.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersSwitch.java
index 5e5f824..0433bcf 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersSwitch.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.model/src-gen/org/eclipse/papyrus/internal/infra/gmfdiag/layers/model/layers/util/LayersSwitch.java
@@ -606,6 +606,29 @@
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
+			case LayersPackage.CSS_HIDE_PROPERTY_SETTER: {
+				CSSHidePropertySetter cssHidePropertySetter = (CSSHidePropertySetter)theEObject;
+				T result = caseCSSHidePropertySetter(cssHidePropertySetter);
+				if (result == null) result = casePropertySetter(cssHidePropertySetter);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case LayersPackage.CSS_HIDE_TYPE: {
+				CSSHideType cssHideType = (CSSHideType)theEObject;
+				T result = caseCSSHideType(cssHideType);
+				if (result == null) result = caseType(cssHideType);
+				if (result == null) result = caseFolderElement(cssHideType);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case LayersPackage.CSS_HIDE_INSTANCE: {
+				CSSHideInstance cssHideInstance = (CSSHideInstance)theEObject;
+				T result = caseCSSHideInstance(cssHideInstance);
+				if (result == null) result = caseTypeInstance(cssHideInstance);
+				if (result == null) result = caseComputePropertyValueCommandItf(cssHideInstance);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
 			default: return defaultCase(theEObject);
 		}
 	}
@@ -1031,6 +1054,51 @@
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>CSS Hide Property Setter</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>CSS Hide Property Setter</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCSSHidePropertySetter(CSSHidePropertySetter object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>CSS Hide Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>CSS Hide Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCSSHideType(CSSHideType object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>CSS Hide Instance</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>CSS Hide Instance</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseCSSHideInstance(CSSHideInstance object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Type Instance</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayerStackSynchronizer.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayerStackSynchronizer.java
index 88d8d83..22fe44c 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayerStackSynchronizer.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayerStackSynchronizer.java
@@ -39,6 +39,9 @@
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.PropertySetter;
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.notifier.DiagramViewEventNotifier;
 import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.notifier.IDiagramViewEventListener;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.commands.ApplyLayerCSSChangedCommand;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.commands.ApplyLayerCSSCommand;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.commands.HideLayerElementsCommand;
 
 
 /**
@@ -183,6 +186,7 @@
 	 *
 	 * @param notification
 	 */
+	@SuppressWarnings("unchecked")
 	@Override
 	public void propertyValueAdded(Notification notification) {
 
@@ -196,49 +200,24 @@
 
 			// Need to recompute the associated views
 			AbstractLayer layer = LayersModelEventUtils.PropertyEvents.getAbstractLayer(notification);
-			final List<View> views = layer.getViews();
+			List<View> views = layer.getViews();
+			// The views are not supposed to be always defined (in the case of filters for example)
 			if (views.size() == 0) {
+				views = layer.getLayersStack().getDiagram().getChildren();
 				return;
 			}
 
 			checkApplication();
-			Property property = application.getPropertyRegistry().getProperty(propertyName);
-
-			final List<ComputePropertyValueCommand> commands = layersStack.getViewsComputePropertyValueCommand(views, property);
-
-			final PropertySetter setter = application.getPropertySetterRegistry().getPropertySetter(property);
-
 			try {
 				TransactionalEditingDomain ted = ServiceUtilsForResource.getInstance().getTransactionalEditingDomain(views.get(0).eResource());
 
-				Command applyLayers = new RecordingCommand(ted, "RecordingCommand aggregating the CSS and style applications from a single layer") {
+				RecordingCommand applyLayerCSSCommand = new ApplyLayerCSSCommand(ted, views, propertyName, application, layersStack, "RecordingCommand aggregating the CSS and style applications from a single layer");
 
-					@Override
-					protected void doExecute() {
-						// Walk each view and set the property
-						for (int i = 0; i < views.size(); i++) {
-
-							// set the value from the provided cmds.
-							// Do it if the cmd is not null
-							if (commands != null && commands.get(i) != null) {
-								try {
-									setter.setValue(views.get(i), commands.get(i).getCmdValue());
-								} catch (LayersException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-								}
-							} else {
-								log.info(this.getClass().getSimpleName() + "ERROR - a cmd is null " + commands);
-							}
-						}
-					}
-				};
-
-				ted.getCommandStack().execute(applyLayers);
+				// ted.getCommandStack().execute(applyLayerCSSCommand);
+				applyLayerCSSCommand.execute();
 
 			} catch (ServiceException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				Activator.log.error("PropertyValueAdded applyLayerCSSCommand has failed", e); //$NON-NLS-1$
 			}
 
 		} catch (NotFoundException e) {
@@ -254,6 +233,7 @@
 
 
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public void propertyValueRemoved(Notification notification) {
 		if (log.isDebugEnabled()) {
@@ -267,8 +247,10 @@
 			// Need to recompute the associated views
 			AbstractLayer layer = LayersModelEventUtils.PropertyEvents.getAbstractLayer(notification);
 			List<View> views = layer.getViews();
+			// The views may not be set yet, if any will be
 			if (views.size() == 0) {
-				return;
+				views = layer.getLayersStack().getDiagram().getChildren();
+				// return;
 			}
 
 			checkApplication();
@@ -300,6 +282,7 @@
 
 
 
+	@SuppressWarnings("unchecked")
 	@Override
 	public void propertyValueChanged(Notification notification) {
 		if (log.isDebugEnabled()) {
@@ -319,58 +302,25 @@
 
 			// Need to recompute the associated views
 			AbstractLayer layer = LayersModelEventUtils.PropertyEvents.getAbstractLayer(notification);
-			final List<View> views = layer.getViews();
+			List<View> views = layer.getViews();
 			if (views.size() == 0) {
-				return;
+				// The views may not be set yet, if any will be
+				views = layer.getLayersStack().getDiagram().getChildren();
+				// return;
 			}
 
 			checkApplication();
-			final Property property = application.getPropertyRegistry().getProperty(propertyName);
-
-			final List<ComputePropertyValueCommand> commands = layersStack.getViewsComputePropertyValueCommand(views, property);
-			if (commands == null) {
-				return;
-			}
 
 			try {
-				TransactionalEditingDomain ted = ServiceUtilsForResource.getInstance().getTransactionalEditingDomain(views.get(0).eResource());
+				TransactionalEditingDomain ted = ServiceUtilsForResource.getInstance().getTransactionalEditingDomain(layer.getLayersStack().getDiagram().eResource());
 
-				Command applyLayers = new RecordingCommand(ted, "RecordingCommand aggregating the CSS and style applications from a single layer") {
+				RecordingCommand applyLayerCSSChangedCommand = new ApplyLayerCSSChangedCommand(ted, views, propertyName, layer, application, layersStack, "RecordingCommand aggregating the CSS and style applications from a single layer");
 
-					@Override
-					protected void doExecute() {
-						PropertySetter setter;
-						try {
-							setter = application.getPropertySetterRegistry().getPropertySetter(property);
-
-							// Walk each view and set the property
-							for (int i = 0; i < views.size(); i++) {
-
-								// set the value from the provided cmds.
-								// Do it if the cmd is not null
-								if (commands != null && commands.get(i) != null) {
-									try {
-										setter.setValue(views.get(i), commands.get(i).getCmdValue());
-									} catch (LayersException e) {
-										// TODO Auto-generated catch block
-										e.printStackTrace();
-									}
-								} else {
-									log.info(this.getClass().getSimpleName() + "ERROR - a cmd is null " + commands);
-								}
-							}
-						} catch (NotFoundException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-					}
-				};
-
-				ted.getCommandStack().execute(applyLayers);
+				// ted.getCommandStack().execute(applyLayerCSSChangedCommand);
+				applyLayerCSSChangedCommand.execute();
 
 			} catch (ServiceException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+				Activator.log.error("PropertyValueChanged applyLayerCSSChangedCommand has failed", e); //$NON-NLS-1$
 			}
 
 		} catch (LayersException e) {
@@ -417,13 +367,18 @@
 
 
 	private void setVisibility(final AbstractLayer layer) {
-		if (layer.getViews().isEmpty()) {
-			return;
-		}
-		View view = layer.getViews().get(0);
-		Diagram diagram = view.getDiagram();
+		// This used a style in order to apply a specific strategy for 'hiding' elements
+		// Using a dedicated stylesheet removes the need to retreive the views
+		// List<View> views = new ArrayList<View>();
+		// if (layer.getViews().isEmpty()) {
+		// views = diagram.getChildren();
+		// // return;
+		// } else {
+		// views = layer.getViews();
+		// }
+
 		try {
-			final TransactionalEditingDomain ted = ServiceUtilsForResource.getInstance().getTransactionalEditingDomain(view.eResource());
+			final TransactionalEditingDomain ted = ServiceUtilsForResource.getInstance().getTransactionalEditingDomain(diagram.eResource());
 			if (ted == null) {
 				return;
 			}
@@ -432,25 +387,12 @@
 			CSSClassContentProvider cssccp = new CSSClassContentProvider("*", cssEngine);
 			cssccp.getAvailableClasses();
 
-			RecordingCommand rc = new RecordingCommand(ted, "HideLayerElementsCommand") { ////$NON-NLS-1$
-
-				@Override
-				protected void doExecute() {
-					if (!layer.isLayerEnabled()) {
-						AddCssClassStyleCommand addStyle = new AddCssClassStyleCommand(ted, layer.getViews(), "isDisabled");
-						addStyle.execute();
-					}
-					if (layer.isLayerEnabled()) {
-						RemoveCssClassStyleCommand removeStyle = new RemoveCssClassStyleCommand(ted, layer.getViews(), "isDisabled");
-						removeStyle.execute();
-					}
-				}
-			};
+			RecordingCommand rc = new HideLayerElementsCommand(ted, layer, "HideLayerElementsCommand"); //$NON-NLS-1$
 
 			rc.execute();
+
 		} catch (ServiceException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+			Activator.log.error("setVisibility hideLayerElementsCommand has failed", e); //$NON-NLS-1$
 		}
 
 	}
@@ -526,6 +468,8 @@
 
 		// Extract the affected layer
 		AbstractLayer layer = (AbstractLayer) notification.getNewValue();
+		// FIXME The layerStack is not properly set during creation phase. THis should be set elsewhere.
+		layer.setOwningLayersStack(layersStack);
 
 		try {
 			checkApplication();
@@ -569,6 +513,7 @@
 	 * @param layer
 	 * @throws LayersException
 	 */
+	@SuppressWarnings("unchecked")
 	private void recomputePropertiesForAllViewsOf(AbstractLayer layer) throws LayersException {
 		// We need the list of affected properties
 		List<Property> properties = layer.getAttachedProperties();
@@ -576,6 +521,8 @@
 		// We need the list of affected Views.
 		List<View> views = layer.getViews();
 		if (views.size() == 0) {
+			// If no views have been selected it is deemed by default that all should be
+			recompute(this.diagram.getChildren(), properties);
 			return;
 		}
 
@@ -742,8 +689,7 @@
 				}
 			}
 		} catch (LayersException e) {
-			// TODO Auto-generated catch block
-			log.error(e);
+			Activator.log.error("LayersException upon removind the view from the Layer", e); //$NON-NLS-1$
 		}
 	}
 
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayersModelEventNotifier.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayersModelEventNotifier.java
index 5ceb5dd..b0cd768 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayersModelEventNotifier.java
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/LayersModelEventNotifier.java
@@ -167,6 +167,38 @@
 				}
 
 			}
+			// Check CSS addition/deletion
+			else if (notification.getFeature() == LayersPackage.eINSTANCE.getCSSInstance_Stylesheet()) {
+				firePropertyValueChanged(notification);
+				// switch (notification.getEventType()) {
+				// case Notification.ADD: {
+				// firePropertyValueAddedEvent(notification);
+				// break;
+				// }
+				// case Notification.REMOVE: {
+				// firePropertyValueRemoved(notification);
+				// break;
+				// }
+				// default:
+				// break;
+				// }
+			}
+			// Check CSSHide addition/deletion
+			else if (notification.getFeature() == LayersPackage.eINSTANCE.getCSSHideInstance_Stylesheet()) {
+				firePropertyValueChanged(notification);
+				// switch (notification.getEventType()) {
+				// case Notification.ADD: {
+				// firePropertyValueAddedEvent(notification);
+				// break;
+				// }
+				// case Notification.REMOVE: {
+				// firePropertyValueRemoved(notification);
+				// break;
+				// }
+				// default:
+				// break;
+				// }
+			}
 			// Check if the isLayerEnabled is modified
 			// sources: LayerExpression::IsLayerEnabled
 			else if (notification.getFeature() == LayersPackage.eINSTANCE.getLayerExpression_IsLayerEnabled()) {
@@ -201,6 +233,8 @@
 						// An instance value is set
 						firePropertyValueChanged(notification);
 						break;
+					default:
+						break;
 					}
 				} catch (NotFoundException e) {
 					// lookupAncestorOfType() found nothing
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/ApplyLayerCSSChangedCommand.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/ApplyLayerCSSChangedCommand.java
new file mode 100755
index 0000000..4377894
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/ApplyLayerCSSChangedCommand.java
@@ -0,0 +1,109 @@
+/*****************************************************************************
+ * Copyright (c) 2018 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.internal.infra.gmfdiag.layers.runtime.commands;
+
+import static org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.Activator.log;
+
+import java.util.List;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.LayersException;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.NotFoundException;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.command.ComputePropertyValueCommand;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.AbstractLayer;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSInstance;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersStack;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersStackApplication;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.Property;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.PropertySetter;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.Activator;
+
+/**
+ * @author Quentin Le Menez
+ *
+ */
+public class ApplyLayerCSSChangedCommand extends RecordingCommand {
+
+	private List<View> views;
+
+	private LayersStackApplication application;
+
+	private String propertyName;
+
+	private AbstractLayer layer;
+
+	private LayersStack layerStack;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param ted
+	 * @param label
+	 */
+	public ApplyLayerCSSChangedCommand(TransactionalEditingDomain ted, List<View> views, String propertyName, AbstractLayer layer, LayersStackApplication application, LayersStack layerStack, String label) {
+		super(ted, label);
+		this.views = views;
+		this.propertyName = propertyName;
+		this.layer = layer;
+		this.application = application;
+		this.layerStack = layerStack;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+
+		try {
+			final Property property = application.getPropertyRegistry().getProperty(propertyName);
+
+			// final List<ComputePropertyValueCommand> commands = layerStack.getViewsComputePropertyValueCommand(views, property);
+			// if (commands == null) {
+			// return;
+			// }
+
+			PropertySetter setter;
+			setter = application.getPropertySetterRegistry().getPropertySetter(property);
+
+			// Walk each view and set the property
+			// for (int i = 0; i < views.size(); i++) {
+			//
+			// // set the value from the provided cmds.
+			// // Do it if the cmd is not null
+			// if (commands != null && commands.get(i) != null) {
+			// try {
+			// setter.setValue(views.get(i), commands.get(i).getCmdValue());
+			// } catch (LayersException e) {
+			// Activator.log.error("ApplyLayerCSSChangedCommand setter has failed", e); //$NON-NLS-1$
+			// }
+			// } else {
+			// log.info(this.getClass().getSimpleName() + "ERROR - a cmd is null " + commands);
+			// }
+			// }
+			for (View view : views) {
+				setter.setValue(view, layer.getPropertyInstance(propertyName));
+			}
+		} catch (NotFoundException e) {
+			Activator.log.error("ApplyLayerCSSChangedCommand could not retreive the setter associated to the property", e); //$NON-NLS-1$
+		} catch (LayersException e) {
+			Activator.log.error("ApplyLayerCSSChangedCommand could not compute the propertyValueCommand", e); //$NON-NLS-1$
+		}
+	}
+
+
+}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/ApplyLayerCSSCommand.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/ApplyLayerCSSCommand.java
new file mode 100755
index 0000000..542b7b8
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/ApplyLayerCSSCommand.java
@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * Copyright (c) 2018 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.internal.infra.gmfdiag.layers.runtime.commands;
+
+import static org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.Activator.log;
+
+import java.util.List;
+
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.LayersException;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.NotFoundException;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.command.ComputePropertyValueCommand;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersStack;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.LayersStackApplication;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.Property;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.PropertySetter;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.Activator;
+
+/**
+ * @author Quentin Le Menez
+ *
+ */
+public class ApplyLayerCSSCommand extends RecordingCommand {
+
+	private List<View> views;
+
+	private LayersStackApplication application;
+
+	private String propertyName;
+
+	private LayersStack layerStack;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param ted
+	 * @param label
+	 */
+	public ApplyLayerCSSCommand(TransactionalEditingDomain ted, List<View> views, String propertyName, LayersStackApplication application, LayersStack layerStack, String label) {
+		super(ted, label);
+		this.views = views;
+		this.application = application;
+		this.propertyName = propertyName;
+		this.layerStack = layerStack;
+	}
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+
+		Property property;
+		try {
+			property = application.getPropertyRegistry().getProperty(propertyName);
+
+			final List<ComputePropertyValueCommand> commands = layerStack.getViewsComputePropertyValueCommand(views, property);
+
+			final PropertySetter setter = application.getPropertySetterRegistry().getPropertySetter(property);
+
+			// Walk each view and set the property
+			for (int i = 0; i < views.size(); i++) {
+
+				// set the value from the provided cmds.
+				// Do it if the cmd is not null
+				if (commands != null && commands.get(i) != null) {
+					try {
+						setter.setValue(views.get(i), commands.get(i).getCmdValue());
+					} catch (LayersException e) {
+						Activator.log.error("ApplyLayerCSSCommand setter has failed", e); //$NON-NLS-1$
+					}
+				} else {
+					log.info(this.getClass().getSimpleName() + "ERROR - a cmd is null " + commands);
+				}
+			}
+		} catch (NotFoundException e) {
+			Activator.log.error("ApplyLayerCSSCommand could not retreive the setter associated to the property", e); //$NON-NLS-1$
+		} catch (LayersException e) {
+			Activator.log.error("ApplyLayerCSSCommand could not compute the propertyValueCommand", e); //$NON-NLS-1$
+		}
+	}
+
+}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/HideLayerElementsCommand.java b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/HideLayerElementsCommand.java
new file mode 100755
index 0000000..cac3c9a
--- /dev/null
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.runtime/src/org/eclipse/papyrus/internal/infra/gmfdiag/layers/runtime/commands/HideLayerElementsCommand.java
@@ -0,0 +1,139 @@
+/*****************************************************************************
+ * Copyright (c) 2018 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.internal.infra.gmfdiag.layers.runtime.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.transaction.RecordingCommand;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSDiagram;
+import org.eclipse.papyrus.infra.gmfdiag.css.notation.CSSStyles;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCSSStyleSheetCommand;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.AddCssClassStyleCommand;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.RemoveCSSStyleSheetCommand;
+import org.eclipse.papyrus.infra.gmfdiag.css.properties.databinding.RemoveCssClassStyleCommand;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheet;
+import org.eclipse.papyrus.infra.gmfdiag.css.stylesheets.StyleSheetReference;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.LayersException;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.AbstractLayer;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSHideInstance;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.CSSInstance;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.Property;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.model.layers.TypeInstance;
+import org.eclipse.papyrus.internal.infra.gmfdiag.layers.runtime.Activator;
+
+/**
+ * @author Quentin Le Menez
+ *
+ */
+public class HideLayerElementsCommand extends RecordingCommand {
+
+	private AbstractLayer layer;
+
+	private TransactionalEditingDomain ted;
+
+	private StyleSheet cssToHide;
+
+	private StyleSheet css;
+
+	private CSSDiagram cssDiagram;
+
+	private boolean isAppliedCSS;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param domain
+	 * @param label
+	 */
+	public HideLayerElementsCommand(TransactionalEditingDomain ted, AbstractLayer layer, String label) {
+		super(ted, label);
+		this.layer = layer;
+		this.ted = ted;
+
+		try {
+			Diagram diagram = layer.getLayersStack().getDiagram();
+			if (diagram instanceof CSSDiagram) {
+				this.cssDiagram = ((CSSDiagram) diagram);
+			}
+
+			List<String> layerPropertiesName = new ArrayList<String>();
+			for (Property layerProperty : layer.getAttachedProperties()) {
+				layerPropertiesName.add(layerProperty.getName());
+			}
+
+			TypeInstance cssHideInstance = layerPropertiesName.contains("cssHide") ? layer.getPropertyInstance("cssHide") : null;
+			TypeInstance cssInstance = layerPropertiesName.contains("css") ? layer.getPropertyInstance("css") : null;
+
+			if (null == cssHideInstance && null != cssInstance) {
+				this.cssToHide = ((CSSInstance) cssInstance).getStylesheet();
+			} else if (null != cssHideInstance) {
+				this.cssToHide = ((CSSHideInstance) cssHideInstance).getStylesheet();
+			}
+
+		} catch (LayersException e) {
+			Activator.log.error("There should be a CSS dedicated to hide the layer views", e);
+		}
+
+		if (cssToHide == null) {
+			return;
+		}
+		String sheetPath = ((StyleSheetReference) cssToHide).getPath();
+		for (StyleSheet ss : cssDiagram.getStyleSheets()) {
+			String ssPath = ((StyleSheetReference) ss).getPath();
+			if (sheetPath.equals(ssPath)) {
+				isAppliedCSS = true;
+				// There may be discrepancies in the memory addresses between the layer's CSS and the model's
+				// Always revert to the model's CSS as it is the one being used
+				cssToHide = ss;
+				break;
+			}
+		}
+
+	}
+
+
+	/**
+	 * @see org.eclipse.emf.transaction.RecordingCommand#doExecute()
+	 *
+	 */
+	@Override
+	protected void doExecute() {
+		// This used to call upon a style but the possibility of a style being present in multiple applied CSS broke the functionality
+		// The style strategy can be reintroduced if there is a way to only call upon one applied CSS instead of All of them
+
+		if (layer.isLayerEnabled() && !isAppliedCSS && null != cssToHide) {
+			AddCSSStyleSheetCommand acssc = new AddCSSStyleSheetCommand(ted, cssDiagram,
+					CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
+					NotationPackage.eINSTANCE.getEObjectListValueStyle(),
+					NotationPackage.eINSTANCE.getEObjectListValueStyle_EObjectListValue(),
+					cssToHide);
+			acssc.execute();
+		}
+		if (!layer.isLayerEnabled() && isAppliedCSS && null != cssToHide) {
+			RemoveCSSStyleSheetCommand rcssc = new RemoveCSSStyleSheetCommand(ted, cssDiagram,
+					CSSStyles.CSS_DIAGRAM_STYLESHEETS_KEY,
+					NotationPackage.eINSTANCE.getEObjectListValueStyle(),
+					NotationPackage.eINSTANCE.getEObjectListValueStyle_EObjectListValue(),
+					cssToHide);
+			rcssc.execute();
+		}
+	}
+
+}
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/plugin.xml b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/plugin.xml
index 51b9e80..80084a9 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/plugin.xml
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/plugin.xml
@@ -12,21 +12,6 @@
             restorable="true">
       </view>
    </extension>
-   <!--extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar">
-         <toolbar
-               id="org.eclipse.papyrus.diagram.ui.toolbar">
-            <command
-                  commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.selectAssociatedElement"
-                  label="Select Associated Elements"
-                  style="push"
-                  tooltip="Select all elements associated to the current layer">
-            </command>
-         </toolbar>
-      </menuContribution>
-   </extension-->
    <extension
          point="org.eclipse.ui.commands">
       <command
@@ -45,41 +30,18 @@
             id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createlayer"
             name="Create Basic Layer">
       </command>
-      <!--command
-            id="org.eclipse.papyrus.layers.ui.commands.createregexplayer"
-            name="Create RegExp Layer">
+      <command
+            id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachCSSToLayer"
+            name="Attach a StyleSheet to a Layer">
       </command>
       <command
-            id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createtoplayeroperator"
-            name="Create Top Layer Operator">
-      </command>
-      <command
-            id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createstackedLayerOperator"
-            name="Create Stacked Layer Operator">
-      </command>
-      <command
-            id="org.eclipse.papyrus.layers.ui.commands.attachPropertyToLayer"
-            name="Attach a Property to a Layer">
-      </command-->
-      <command
-            id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachPropertiesToLayer"
-            name="Attach Properties to a Layer">
+            id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachCSSHideToLayer"
+            name="Attach a Disable StyleSheet to a Layer">
       </command>
       <command
             id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachDiagramViewsToLayer"
             name="Attach Multiple Diagram Views to a Layer">
       </command>
-      <!--command
-            defaultHandler="org.eclipse.papyrus.layers.ui.commands.CreateLayerOperatorsFromParameter"
-            id="org.eclipse.papyrus.layers.ui.commands.createLayerOperator"
-            name="Create LayerOperators">
-         <commandParameter
-               id="org.eclipse.papyrus.layers.ui.createLayerOperator.parameters"
-               name="name"
-               optional="true"
-               values="org.eclipse.papyrus.layers.ui.commands.LayerOperatorsParameterValues">
-         </commandParameter>
-      </command-->
       <command
             id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.openlayersexplorerview"
             name="Open Layers Explorer">
@@ -96,10 +58,6 @@
             id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.showmenus"
             name="Show Menus">
       </command>
-      <!--command
-            id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createallviewsderivedlayer"
-            name="Create All View Derived Layer">
-      </command-->
    </extension>
    <extension
          name="Layers"
@@ -116,25 +74,13 @@
             class="org.eclipse.papyrus.internal.infra.gmfdiag.layers.ui.handlers.CreateLayerHandler"
             commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createlayer">
       </handler>
-      <!--handler
-            class="org.eclipse.papyrus.layers.ui.commands.CreateRegExpLayerHandler"
-            commandId="org.eclipse.papyrus.layers.ui.commands.createregexplayer">
+      <handler
+            class="org.eclipse.papyrus.internal.infra.gmfdiag.layers.ui.commands.AttachCSSToLayer"
+            commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachCSSToLayer">
       </handler>
       <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.CreateTopLayerOperatorHandler"
-            commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createtoplayeroperator">
-      </handler>
-      <handler
-            class="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.CreateStackedLayerOperatorHandler"
-            commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createstackedLayerOperator">
-      </handler>
-      <handler
-            class="org.eclipse.papyrus.layers.ui.commands.AttachPropertyToLayer"
-            commandId="org.eclipse.papyrus.layers.ui.commands.attachPropertyToLayer">
-      </handler-->
-      <handler
-            class="org.eclipse.papyrus.internal.infra.gmfdiag.layers.ui.commands.AttachPropertyFromListToLayer"
-            commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachPropertiesToLayer">
+            class="org.eclipse.papyrus.internal.infra.gmfdiag.layers.ui.commands.AttachCSSHideToLayer"
+            commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachCSSHideToLayer">
       </handler>
       <handler
             class="org.eclipse.papyrus.internal.infra.gmfdiag.layers.ui.commands.AttachDiagramViewsToLayer"
@@ -160,10 +106,6 @@
             class="org.eclipse.papyrus.internal.infra.gmfdiag.layers.ui.handlers.ShowItemHandler"
             commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.showmenus">
       </handler>
-      <!--handler
-            class="org.eclipse.papyrus.infra.gmfdiag.layers.ui.handlers.CreateAllViewsDerivedLayerHandler"
-            commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createallviewsderivedlayer">
-      </handler-->
    </extension>
    <extension
          point="org.eclipse.ui.menus">
@@ -194,10 +136,6 @@
       <menuContribution
             allPopups="false"
             locationURI="popup:org.eclipse.papyrus.infra.gmfdiag.layers.ui.popupmenu">
-            <!--locationURI="popup:org.eclipse.papyrus.infra.gmfdiag.layers.diagram.ui.contextmenu"-->
-         <!--menu
-               label="Create Layers ..."
-               tooltip="Create a new leaf layers"-->
             <command
                   commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.createlayer"
                   label="Create Layer"
@@ -217,76 +155,11 @@
 	              </and>
 	           </visibleWhen>
             </command>
-            <!--command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.createregexplayer"
-                  label="Create RegExp  Layer"
-                  style="push"
-                  tooltip="Create a RegExp  Layer">
-            </command>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.createallviewsderivedlayer"
-                  label="Create AllViews Layer"
-                  style="push"
-                  tooltip="Create a All Views Derived Layer">
-            </command-->
-         <!--/menu-->
-         <!--menu
-               commandId="org.eclipse.papyrus.layers.ui.commands.createLayerOperator"
-               id="org.eclipse.papyrus.layers.explorer.contextmenu.operators"
-               label="Create Operators ..."
-               tooltip="Create a new layer operators">
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.createLayerOperator"
-                  label="Create Stacked Layers"
-                  style="push"
-                  tooltip="Create a new Stacked Layers Operator">
-               <parameter
-                     name="org.eclipse.papyrus.layers.ui.createLayerOperator.parameters"
-                     value="stackedLayersOperator">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.createtoplayeroperator"
-                  label="Create Top Layers"
-                  style="push"
-                  tooltip="Create a new Top Layers Operator">
-            </command>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.createLayerOperator"
-                  label="Create Minimum Stacked Layers"
-                  style="push"
-                  tooltip="Create a new Stacked Layers with Operators of type &apos;Minimum&apos; ">
-               <parameter
-                     name="org.eclipse.papyrus.layers.ui.createLayerOperator.parameters"
-                     value="stackedLayersOperatorMinimum">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.createLayerOperator"
-                  label="Create Maximum Stacked Layers"
-                  style="push"
-                  tooltip="Create a new Stacked Layers with Operators of type &apos;Maximum&apos; ">
-               <parameter
-                     name="org.eclipse.papyrus.layers.ui.createLayerOperator.parameters"
-                     value="stackedLayersOperatorMaximum">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.createLayerOperator"
-                  label="Create Average Stacked Layers"
-                  style="push"
-                  tooltip="Create a new Stacked Layers with Operators of type &apos;Average&apos; ">
-               <parameter
-                     name="org.eclipse.papyrus.layers.ui.createLayerOperator.parameters"
-                     value="stackedLayersOperatorAverage">
-               </parameter>
-            </command>
-         </menu-->
          <command
-               commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachPropertiesToLayer"
-               label="Attach Properties"
+               commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachCSSToLayer"
+               label="Attach StyleSheet"
                style="push"
-               tooltip="Attach Properties to a Layer">
+               tooltip="Attach a StyleSheet to a Layer">
             <visibleWhen
                   checkEnabled="false">
                <and>
@@ -294,7 +167,26 @@
                         variable="selection">
                      <test
                            forcePluginActivation="true"
-                           property="org.eclipse.papyrus.infra.gmfdiag.layers.ui.tester.canAttachProperties"
+                           property="org.eclipse.papyrus.infra.gmfdiag.layers.ui.tester.canAttachCSS"
+                           value="true">
+                     </test>
+                  </with>
+               </and>
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.commands.attachCSSHideToLayer"
+               label="Attach Disable StyleSheet"
+               style="push"
+               tooltip="Attach a Disable StyleSheet to a Layer">
+            <visibleWhen
+                  checkEnabled="false">
+               <and>
+                  <with
+                        variable="selection">
+                     <test
+                           forcePluginActivation="true"
+                           property="org.eclipse.papyrus.infra.gmfdiag.layers.ui.tester.canAttachCSSHide"
                            value="true">
                      </test>
                   </with>
@@ -340,43 +232,10 @@
                </and>
             </visibleWhen>
          </command>
-         <!--command
-               commandId="org.eclipse.papyrus.layers.ui.commands.attachitemselectedindiagramtocurrentlayer"
-               label="Attach Selected Views to Layer"
-               style="push"
-               tooltip="Attach selected views to the layer selected in the LayersExplorer">
-         </command>
-         <command
-               commandId="org.eclipse.papyrus.layers.ui.commands.removeitemselectedindiagramfromcurrentlayer"
-               label="Remove Selected Views from Layer"
-               style="push"
-               tooltip="Remove selected views from the layer selected in the LayersExplorer">
-         </command-->
-         <!--separator
-               name="endseparator"
-               visible="true">
-         </separator>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.attachLayerStack"
-                  label="Attach Layer Stack"
-                  style="push"
-                  tooltip="Attach a Layer Stack to the diagram">
-            </command>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.detachLayerStack"
-                  label="Detach Layer Stack"
-                  style="push"
-                  tooltip="Detach a Layer Stack to the diagram">
-            </command-->
          <separator
                name="endseparator"
                visible="false">
          </separator>
-         <!--command
-               commandId="org.eclipse.papyrus.infra.gmfdiag.layers.ui.showmenus"
-               label="Show Selected Item"
-               style="push">
-         </command-->
       </menuContribution>
       <menuContribution
             locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu">
@@ -400,18 +259,6 @@
                   style="push"
                   tooltip="Open the Layers Explorer View">
             </command>
-            <!--command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.attachitemselectedindiagramtocurrentlayer"
-                  label="Attach Views to Current Layer"
-                  style="push"
-                  tooltip="Attach selected views to the layer currently selected in the LayersExplorer">
-            </command>
-            <command
-                  commandId="org.eclipse.papyrus.layers.ui.commands.removeitemselectedindiagramfromcurrentlayer"
-                  label="Remove Views from Current Layer"
-                  style="push"
-                  tooltip="Remove selected views from the layer currently selected in the LayersExplorer">
-            </command-->
          </menu>
       </menuContribution>
    </extension>
@@ -428,7 +275,7 @@
           class="org.eclipse.papyrus.internal.infra.gmfdiag.layers.ui.utils.LayersWidgetPropertyTester"
           id="org.eclipse.papyrus.infra.gmfdiag.layers.ui.tester"
           namespace="org.eclipse.papyrus.infra.gmfdiag.layers.ui.tester"
-          properties="canCreateLayer, canAttachProperties, canAttachViews, canDeleteLayer"
+          properties="canCreateLayer, canAttachProperties, canAttachCSS, canAttachCSSHide, canAttachViews, canDeleteLayer"
           type="org.eclipse.jface.viewers.IStructuredSelection">
     </propertyTester>
     </extension>
diff --git a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/properties/layers.ctx b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/properties/layers.ctx
index f84e45e..b1f6b9f 100755
--- a/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/properties/layers.ctx
+++ b/layers/plugins/org.eclipse.papyrus.infra.gmfdiag.layers.ui/properties/layers.ctx
@@ -1,1656 +1,1722 @@
 <?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_2fumEODlEee9bryn2mNvXA" name="layers">
-  <tabs xmi:id="_7WH30ODmEee9bryn2mNvXA" label="Layers" id="layers" category="" image="" priority="10">
-    <sections xmi:id="_7WUFEODmEee9bryn2mNvXA" name="Single LayerNamedStyle" sectionFile="ui/SingleLayerNamedStyle.xwt">
+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_umc1gHX6Eeipp8d5W3Vl9g" name="layers">
+  <tabs xmi:id="_Zixx8HX7Eeipp8d5W3Vl9g" label="Layers" id="layers" priority="10">
+    <sections xmi:id="_Zixx8XX7Eeipp8d5W3Vl9g" name="Single LayerNamedStyle" sectionFile="ui/SingleLayerNamedStyle.xwt">
       <widget href="ui/SingleLayerNamedStyle.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WaLsODmEee9bryn2mNvXA" name="Single LayersStack" sectionFile="ui/SingleLayersStack.xwt">
+    <sections xmi:id="_Zixx8nX7Eeipp8d5W3Vl9g" name="Single LayersStack" sectionFile="ui/SingleLayersStack.xwt">
       <widget href="ui/SingleLayersStack.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WaywODmEee9bryn2mNvXA" name="Single LayerExpression" sectionFile="ui/SingleLayerExpression.xwt">
+    <sections xmi:id="_Zixx83X7Eeipp8d5W3Vl9g" name="Single LayerExpression" sectionFile="ui/SingleLayerExpression.xwt">
       <widget href="ui/SingleLayerExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WayweDmEee9bryn2mNvXA" name="Single ApplicationDependantElement" sectionFile="ui/SingleApplicationDependantElement.xwt">
+    <sections xmi:id="_ZiyZAHX7Eeipp8d5W3Vl9g" name="Single ApplicationDependantElement" sectionFile="ui/SingleApplicationDependantElement.xwt">
       <widget href="ui/SingleApplicationDependantElement.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WaywuDmEee9bryn2mNvXA" name="Single LayersStackApplication" sectionFile="ui/SingleLayersStackApplication.xwt">
+    <sections xmi:id="_ZiyZAXX7Eeipp8d5W3Vl9g" name="Single LayersStackApplication" sectionFile="ui/SingleLayersStackApplication.xwt">
       <widget href="ui/SingleLayersStackApplication.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WbZ0ODmEee9bryn2mNvXA" name="Single FolderElement" sectionFile="ui/SingleFolderElement.xwt">
+    <sections xmi:id="_ZiyZAnX7Eeipp8d5W3Vl9g" name="Single FolderElement" sectionFile="ui/SingleFolderElement.xwt">
       <widget href="ui/SingleFolderElement.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WbZ0eDmEee9bryn2mNvXA" name="Single LayerStackDescriptorRegistry" sectionFile="ui/SingleLayerStackDescriptorRegistry.xwt">
+    <sections xmi:id="_ZiyZA3X7Eeipp8d5W3Vl9g" name="Single LayerStackDescriptorRegistry" sectionFile="ui/SingleLayerStackDescriptorRegistry.xwt">
       <widget href="ui/SingleLayerStackDescriptorRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WbZ0uDmEee9bryn2mNvXA" name="Single PropertyRegistry" sectionFile="ui/SinglePropertyRegistry.xwt">
+    <sections xmi:id="_ZiyZBHX7Eeipp8d5W3Vl9g" name="Single PropertyRegistry" sectionFile="ui/SinglePropertyRegistry.xwt">
       <widget href="ui/SinglePropertyRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WbZ0-DmEee9bryn2mNvXA" name="Single Property" sectionFile="ui/SingleProperty.xwt">
+    <sections xmi:id="_ZiyZBXX7Eeipp8d5W3Vl9g" name="Single Property" sectionFile="ui/SingleProperty.xwt">
       <widget href="ui/SingleProperty.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WbZ1ODmEee9bryn2mNvXA" name="Single Type" sectionFile="ui/SingleType.xwt">
+    <sections xmi:id="_ZiyZBnX7Eeipp8d5W3Vl9g" name="Single Type" sectionFile="ui/SingleType.xwt">
       <widget href="ui/SingleType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WcA4ODmEee9bryn2mNvXA" name="Single Metamodel" sectionFile="ui/SingleMetamodel.xwt">
+    <sections xmi:id="_ZiyZB3X7Eeipp8d5W3Vl9g" name="Single Metamodel" sectionFile="ui/SingleMetamodel.xwt">
       <widget href="ui/SingleMetamodel.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WcA4eDmEee9bryn2mNvXA" name="Single TypeInstance" sectionFile="ui/SingleTypeInstance.xwt">
+    <sections xmi:id="_ZiyZCHX7Eeipp8d5W3Vl9g" name="Single TypeInstance" sectionFile="ui/SingleTypeInstance.xwt">
       <widget href="ui/SingleTypeInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WcA4uDmEee9bryn2mNvXA" name="Single ComputePropertyValueCommandItf" sectionFile="ui/SingleComputePropertyValueCommandItf.xwt">
+    <sections xmi:id="_ZiyZCXX7Eeipp8d5W3Vl9g" name="Single ComputePropertyValueCommandItf" sectionFile="ui/SingleComputePropertyValueCommandItf.xwt">
       <widget href="ui/SingleComputePropertyValueCommandItf.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wcn8ODmEee9bryn2mNvXA" name="Single TypeRegistry" sectionFile="ui/SingleTypeRegistry.xwt">
+    <sections xmi:id="_ZiyZCnX7Eeipp8d5W3Vl9g" name="Single TypeRegistry" sectionFile="ui/SingleTypeRegistry.xwt">
       <widget href="ui/SingleTypeRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wcn8eDmEee9bryn2mNvXA" name="Single StringToTypeMap" sectionFile="ui/SingleStringToTypeMap.xwt">
+    <sections xmi:id="_ZiyZC3X7Eeipp8d5W3Vl9g" name="Single StringToTypeMap" sectionFile="ui/SingleStringToTypeMap.xwt">
       <widget href="ui/SingleStringToTypeMap.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wcn8uDmEee9bryn2mNvXA" name="Single LayerDescriptorRegistry" sectionFile="ui/SingleLayerDescriptorRegistry.xwt">
+    <sections xmi:id="_ZiyZDHX7Eeipp8d5W3Vl9g" name="Single LayerDescriptorRegistry" sectionFile="ui/SingleLayerDescriptorRegistry.xwt">
       <widget href="ui/SingleLayerDescriptorRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wcn8-DmEee9bryn2mNvXA" name="Single LayerDescriptor" sectionFile="ui/SingleLayerDescriptor.xwt">
+    <sections xmi:id="_ZiyZDXX7Eeipp8d5W3Vl9g" name="Single LayerDescriptor" sectionFile="ui/SingleLayerDescriptor.xwt">
       <widget href="ui/SingleLayerDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wcn9ODmEee9bryn2mNvXA" name="Single LayerApplicationFactory" sectionFile="ui/SingleLayerApplicationFactory.xwt">
+    <sections xmi:id="_ZiyZDnX7Eeipp8d5W3Vl9g" name="Single LayerApplicationFactory" sectionFile="ui/SingleLayerApplicationFactory.xwt">
       <widget href="ui/SingleLayerApplicationFactory.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wcn9eDmEee9bryn2mNvXA" name="Single PropertySetterRegistry" sectionFile="ui/SinglePropertySetterRegistry.xwt">
+    <sections xmi:id="_ZiyZD3X7Eeipp8d5W3Vl9g" name="Single PropertySetterRegistry" sectionFile="ui/SinglePropertySetterRegistry.xwt">
       <widget href="ui/SinglePropertySetterRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wd2EODmEee9bryn2mNvXA" name="Single PropertySetter" sectionFile="ui/SinglePropertySetter.xwt">
+    <sections xmi:id="_ZiyZEHX7Eeipp8d5W3Vl9g" name="Single PropertySetter" sectionFile="ui/SinglePropertySetter.xwt">
       <widget href="ui/SinglePropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wd2EeDmEee9bryn2mNvXA" name="Single StringToPropertySetter" sectionFile="ui/SingleStringToPropertySetter.xwt">
+    <sections xmi:id="_ZiyZEXX7Eeipp8d5W3Vl9g" name="Single StringToPropertySetter" sectionFile="ui/SingleStringToPropertySetter.xwt">
       <widget href="ui/SingleStringToPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wd2EuDmEee9bryn2mNvXA" name="Single LayerOperatorDescriptorRegistry" sectionFile="ui/SingleLayerOperatorDescriptorRegistry.xwt">
+    <sections xmi:id="_ZiyZEnX7Eeipp8d5W3Vl9g" name="Single LayerOperatorDescriptorRegistry" sectionFile="ui/SingleLayerOperatorDescriptorRegistry.xwt">
       <widget href="ui/SingleLayerOperatorDescriptorRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WedIODmEee9bryn2mNvXA" name="Single LayerOperatorDescriptor" sectionFile="ui/SingleLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_ZiyZE3X7Eeipp8d5W3Vl9g" name="Single LayerOperatorDescriptor" sectionFile="ui/SingleLayerOperatorDescriptor.xwt">
       <widget href="ui/SingleLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WedIeDmEee9bryn2mNvXA" name="Single PropertyOperator" sectionFile="ui/SinglePropertyOperator.xwt">
+    <sections xmi:id="_ZizAEHX7Eeipp8d5W3Vl9g" name="Single PropertyOperator" sectionFile="ui/SinglePropertyOperator.xwt">
       <widget href="ui/SinglePropertyOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WgSUODmEee9bryn2mNvXA" name="Single AbstractLayerOperator" sectionFile="ui/SingleAbstractLayerOperator.xwt">
+    <sections xmi:id="_ZizAEXX7Eeipp8d5W3Vl9g" name="Single AbstractLayerOperator" sectionFile="ui/SingleAbstractLayerOperator.xwt">
       <widget href="ui/SingleAbstractLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wg5YODmEee9bryn2mNvXA" name="Single LayerOperator" sectionFile="ui/SingleLayerOperator.xwt">
+    <sections xmi:id="_ZizAEnX7Eeipp8d5W3Vl9g" name="Single LayerOperator" sectionFile="ui/SingleLayerOperator.xwt">
       <widget href="ui/SingleLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wg5YeDmEee9bryn2mNvXA" name="Single LayersContainer" sectionFile="ui/SingleLayersContainer.xwt">
+    <sections xmi:id="_ZizAE3X7Eeipp8d5W3Vl9g" name="Single LayersContainer" sectionFile="ui/SingleLayersContainer.xwt">
       <widget href="ui/SingleLayersContainer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wg5YuDmEee9bryn2mNvXA" name="Single DefaultPropertyOperator" sectionFile="ui/SingleDefaultPropertyOperator.xwt">
+    <sections xmi:id="_ZizAFHX7Eeipp8d5W3Vl9g" name="Single DefaultPropertyOperator" sectionFile="ui/SingleDefaultPropertyOperator.xwt">
       <widget href="ui/SingleDefaultPropertyOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WhgcODmEee9bryn2mNvXA" name="Single AbstractLayer" sectionFile="ui/SingleAbstractLayer.xwt">
+    <sections xmi:id="_ZizAFXX7Eeipp8d5W3Vl9g" name="Single AbstractLayer" sectionFile="ui/SingleAbstractLayer.xwt">
       <widget href="ui/SingleAbstractLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WhgceDmEee9bryn2mNvXA" name="Single StringToTypeInstanceMap" sectionFile="ui/SingleStringToTypeInstanceMap.xwt">
+    <sections xmi:id="_ZizAFnX7Eeipp8d5W3Vl9g" name="Single StringToTypeInstanceMap" sectionFile="ui/SingleStringToTypeInstanceMap.xwt">
       <widget href="ui/SingleStringToTypeInstanceMap.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WhgcuDmEee9bryn2mNvXA" name="Single Folder" sectionFile="ui/SingleFolder.xwt">
+    <sections xmi:id="_ZizAF3X7Eeipp8d5W3Vl9g" name="Single Folder" sectionFile="ui/SingleFolder.xwt">
       <widget href="ui/SingleFolder.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Whgc-DmEee9bryn2mNvXA" name="Single IntInstance" sectionFile="ui/SingleIntInstance.xwt">
+    <sections xmi:id="_ZizAGHX7Eeipp8d5W3Vl9g" name="Single IntInstance" sectionFile="ui/SingleIntInstance.xwt">
       <widget href="ui/SingleIntInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WhgdODmEee9bryn2mNvXA" name="Single BooleanInstance" sectionFile="ui/SingleBooleanInstance.xwt">
+    <sections xmi:id="_ZizAGXX7Eeipp8d5W3Vl9g" name="Single BooleanInstance" sectionFile="ui/SingleBooleanInstance.xwt">
       <widget href="ui/SingleBooleanInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WhgdeDmEee9bryn2mNvXA" name="Single StringInstance" sectionFile="ui/SingleStringInstance.xwt">
+    <sections xmi:id="_ZizAGnX7Eeipp8d5W3Vl9g" name="Single StringInstance" sectionFile="ui/SingleStringInstance.xwt">
       <widget href="ui/SingleStringInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WhgduDmEee9bryn2mNvXA" name="Single IntType" sectionFile="ui/SingleIntType.xwt">
+    <sections xmi:id="_ZizAG3X7Eeipp8d5W3Vl9g" name="Single IntType" sectionFile="ui/SingleIntType.xwt">
       <widget href="ui/SingleIntType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiHgODmEee9bryn2mNvXA" name="Single BooleanType" sectionFile="ui/SingleBooleanType.xwt">
+    <sections xmi:id="_ZizAHHX7Eeipp8d5W3Vl9g" name="Single BooleanType" sectionFile="ui/SingleBooleanType.xwt">
       <widget href="ui/SingleBooleanType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiHgeDmEee9bryn2mNvXA" name="Single StringType" sectionFile="ui/SingleStringType.xwt">
+    <sections xmi:id="_ZizAHXX7Eeipp8d5W3Vl9g" name="Single StringType" sectionFile="ui/SingleStringType.xwt">
       <widget href="ui/SingleStringType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiHguDmEee9bryn2mNvXA" name="Single CustomType" sectionFile="ui/SingleCustomType.xwt">
+    <sections xmi:id="_ZizAHnX7Eeipp8d5W3Vl9g" name="Single CustomType" sectionFile="ui/SingleCustomType.xwt">
       <widget href="ui/SingleCustomType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiHg-DmEee9bryn2mNvXA" name="Single TopLayerOperator" sectionFile="ui/SingleTopLayerOperator.xwt">
+    <sections xmi:id="_ZiznIHX7Eeipp8d5W3Vl9g" name="Single TopLayerOperator" sectionFile="ui/SingleTopLayerOperator.xwt">
       <widget href="ui/SingleTopLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiukODmEee9bryn2mNvXA" name="Single StackedLayerOperator" sectionFile="ui/SingleStackedLayerOperator.xwt">
+    <sections xmi:id="_ZiznIXX7Eeipp8d5W3Vl9g" name="Single StackedLayerOperator" sectionFile="ui/SingleStackedLayerOperator.xwt">
       <widget href="ui/SingleStackedLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiukeDmEee9bryn2mNvXA" name="Single CustomLayerOperator" sectionFile="ui/SingleCustomLayerOperator.xwt">
+    <sections xmi:id="_ZiznInX7Eeipp8d5W3Vl9g" name="Single CustomLayerOperator" sectionFile="ui/SingleCustomLayerOperator.xwt">
       <widget href="ui/SingleCustomLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiukuDmEee9bryn2mNvXA" name="Single PropertyIndex" sectionFile="ui/SinglePropertyIndex.xwt">
+    <sections xmi:id="_ZiznI3X7Eeipp8d5W3Vl9g" name="Single PropertyIndex" sectionFile="ui/SinglePropertyIndex.xwt">
       <widget href="ui/SinglePropertyIndex.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wiuk-DmEee9bryn2mNvXA" name="Single StringToPropertyIndexMap" sectionFile="ui/SingleStringToPropertyIndexMap.xwt">
+    <sections xmi:id="_ZiznJHX7Eeipp8d5W3Vl9g" name="Single StringToPropertyIndexMap" sectionFile="ui/SingleStringToPropertyIndexMap.xwt">
       <widget href="ui/SingleStringToPropertyIndexMap.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiulODmEee9bryn2mNvXA" name="Single SimpleLayerDescriptor" sectionFile="ui/SingleSimpleLayerDescriptor.xwt">
+    <sections xmi:id="_ZiznJXX7Eeipp8d5W3Vl9g" name="Single SimpleLayerDescriptor" sectionFile="ui/SingleSimpleLayerDescriptor.xwt">
       <widget href="ui/SingleSimpleLayerDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WiuleDmEee9bryn2mNvXA" name="Single RegExpLayerDescriptor" sectionFile="ui/SingleRegExpLayerDescriptor.xwt">
+    <sections xmi:id="_ZiznJnX7Eeipp8d5W3Vl9g" name="Single RegExpLayerDescriptor" sectionFile="ui/SingleRegExpLayerDescriptor.xwt">
       <widget href="ui/SingleRegExpLayerDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WjVoODmEee9bryn2mNvXA" name="Single NullInstance" sectionFile="ui/SingleNullInstance.xwt">
+    <sections xmi:id="_ZiznJ3X7Eeipp8d5W3Vl9g" name="Single NullInstance" sectionFile="ui/SingleNullInstance.xwt">
       <widget href="ui/SingleNullInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WjVoeDmEee9bryn2mNvXA" name="Single RegExpLayer" sectionFile="ui/SingleRegExpLayer.xwt">
+    <sections xmi:id="_ZiznKHX7Eeipp8d5W3Vl9g" name="Single RegExpLayer" sectionFile="ui/SingleRegExpLayer.xwt">
       <widget href="ui/SingleRegExpLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WjVouDmEee9bryn2mNvXA" name="Single Layer" sectionFile="ui/SingleLayer.xwt">
+    <sections xmi:id="_ZiznKXX7Eeipp8d5W3Vl9g" name="Single Layer" sectionFile="ui/SingleLayer.xwt">
       <widget href="ui/SingleLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wj8sODmEee9bryn2mNvXA" name="Single Color" sectionFile="ui/SingleColor.xwt">
+    <sections xmi:id="_ZiznKnX7Eeipp8d5W3Vl9g" name="Single Color" sectionFile="ui/SingleColor.xwt">
       <widget href="ui/SingleColor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wj8seDmEee9bryn2mNvXA" name="Single ColorInstance" sectionFile="ui/SingleColorInstance.xwt">
+    <sections xmi:id="_ZiznK3X7Eeipp8d5W3Vl9g" name="Single ColorInstance" sectionFile="ui/SingleColorInstance.xwt">
       <widget href="ui/SingleColorInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wj8suDmEee9bryn2mNvXA" name="Single FillInstance" sectionFile="ui/SingleFillInstance.xwt">
+    <sections xmi:id="_ZiznLHX7Eeipp8d5W3Vl9g" name="Single FillInstance" sectionFile="ui/SingleFillInstance.xwt">
       <widget href="ui/SingleFillInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wj8s-DmEee9bryn2mNvXA" name="Single Fill" sectionFile="ui/SingleFill.xwt">
+    <sections xmi:id="_ZiznLXX7Eeipp8d5W3Vl9g" name="Single Fill" sectionFile="ui/SingleFill.xwt">
       <widget href="ui/SingleFill.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wj8tODmEee9bryn2mNvXA" name="Single FillPropertySetter" sectionFile="ui/SingleFillPropertySetter.xwt">
+    <sections xmi:id="_ZiznLnX7Eeipp8d5W3Vl9g" name="Single FillPropertySetter" sectionFile="ui/SingleFillPropertySetter.xwt">
       <widget href="ui/SingleFillPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WkjwODmEee9bryn2mNvXA" name="Single IsValidPropertySetter" sectionFile="ui/SingleIsValidPropertySetter.xwt">
+    <sections xmi:id="_Zi0OMHX7Eeipp8d5W3Vl9g" name="Single IsValidPropertySetter" sectionFile="ui/SingleIsValidPropertySetter.xwt">
       <widget href="ui/SingleIsValidPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WkjweDmEee9bryn2mNvXA" name="Single NullPropertySetter" sectionFile="ui/SingleNullPropertySetter.xwt">
+    <sections xmi:id="_Zi0OMXX7Eeipp8d5W3Vl9g" name="Single NullPropertySetter" sectionFile="ui/SingleNullPropertySetter.xwt">
       <widget href="ui/SingleNullPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WlK0ODmEee9bryn2mNvXA" name="Single LineType" sectionFile="ui/SingleLineType.xwt">
+    <sections xmi:id="_Zi0OMnX7Eeipp8d5W3Vl9g" name="Single LineType" sectionFile="ui/SingleLineType.xwt">
       <widget href="ui/SingleLineType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WlK0eDmEee9bryn2mNvXA" name="Single LineInstance" sectionFile="ui/SingleLineInstance.xwt">
+    <sections xmi:id="_Zi0OM3X7Eeipp8d5W3Vl9g" name="Single LineInstance" sectionFile="ui/SingleLineInstance.xwt">
       <widget href="ui/SingleLineInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WlK0uDmEee9bryn2mNvXA" name="Single LinePropertySetter" sectionFile="ui/SingleLinePropertySetter.xwt">
+    <sections xmi:id="_Zi0ONHX7Eeipp8d5W3Vl9g" name="Single LinePropertySetter" sectionFile="ui/SingleLinePropertySetter.xwt">
       <widget href="ui/SingleLinePropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WlK0-DmEee9bryn2mNvXA" name="Single FontPropertySetter" sectionFile="ui/SingleFontPropertySetter.xwt">
+    <sections xmi:id="_Zi0ONXX7Eeipp8d5W3Vl9g" name="Single FontPropertySetter" sectionFile="ui/SingleFontPropertySetter.xwt">
       <widget href="ui/SingleFontPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WlK1ODmEee9bryn2mNvXA" name="Single FontInstance" sectionFile="ui/SingleFontInstance.xwt">
+    <sections xmi:id="_Zi0ONnX7Eeipp8d5W3Vl9g" name="Single FontInstance" sectionFile="ui/SingleFontInstance.xwt">
       <widget href="ui/SingleFontInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WlK1eDmEee9bryn2mNvXA" name="Single FontType" sectionFile="ui/SingleFontType.xwt">
+    <sections xmi:id="_Zi0ON3X7Eeipp8d5W3Vl9g" name="Single FontType" sectionFile="ui/SingleFontType.xwt">
       <widget href="ui/SingleFontType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wlx4ODmEee9bryn2mNvXA" name="Single IsVisiblePropertySetter" sectionFile="ui/SingleIsVisiblePropertySetter.xwt">
+    <sections xmi:id="_Zi0OOHX7Eeipp8d5W3Vl9g" name="Single IsVisiblePropertySetter" sectionFile="ui/SingleIsVisiblePropertySetter.xwt">
       <widget href="ui/SingleIsVisiblePropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wlx4eDmEee9bryn2mNvXA" name="Single TopLayerOperatorDescriptor" sectionFile="ui/SingleTopLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_Zi0OOXX7Eeipp8d5W3Vl9g" name="Single TopLayerOperatorDescriptor" sectionFile="ui/SingleTopLayerOperatorDescriptor.xwt">
       <widget href="ui/SingleTopLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wlx4uDmEee9bryn2mNvXA" name="Single StackedLayerOperatorDescriptor" sectionFile="ui/SingleStackedLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_Zi0OOnX7Eeipp8d5W3Vl9g" name="Single StackedLayerOperatorDescriptor" sectionFile="ui/SingleStackedLayerOperatorDescriptor.xwt">
       <widget href="ui/SingleStackedLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wlx4-DmEee9bryn2mNvXA" name="Single CustomPropertyOperator" sectionFile="ui/SingleCustomPropertyOperator.xwt">
+    <sections xmi:id="_Zi0OO3X7Eeipp8d5W3Vl9g" name="Single CustomPropertyOperator" sectionFile="ui/SingleCustomPropertyOperator.xwt">
       <widget href="ui/SingleCustomPropertyOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wlx5ODmEee9bryn2mNvXA" name="Single AndStackedLayerOperatorDescriptor" sectionFile="ui/SingleAndStackedLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_Zi0OPHX7Eeipp8d5W3Vl9g" name="Single AndStackedLayerOperatorDescriptor" sectionFile="ui/SingleAndStackedLayerOperatorDescriptor.xwt">
       <widget href="ui/SingleAndStackedLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WmY8ODmEee9bryn2mNvXA" name="Single OrStackedLayerOperatorDescriptor" sectionFile="ui/SingleOrStackedLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_Zi0OPXX7Eeipp8d5W3Vl9g" name="Single OrStackedLayerOperatorDescriptor" sectionFile="ui/SingleOrStackedLayerOperatorDescriptor.xwt">
       <widget href="ui/SingleOrStackedLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WmY8eDmEee9bryn2mNvXA" name="Single IsAbstractUmlSetter" sectionFile="ui/SingleIsAbstractUmlSetter.xwt">
+    <sections xmi:id="_Zi0OPnX7Eeipp8d5W3Vl9g" name="Single IsAbstractUmlSetter" sectionFile="ui/SingleIsAbstractUmlSetter.xwt">
       <widget href="ui/SingleIsAbstractUmlSetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WmY8uDmEee9bryn2mNvXA" name="Single AllViewsDerivedLayer" sectionFile="ui/SingleAllViewsDerivedLayer.xwt">
+    <sections xmi:id="_Zi0OP3X7Eeipp8d5W3Vl9g" name="Single AllViewsDerivedLayer" sectionFile="ui/SingleAllViewsDerivedLayer.xwt">
       <widget href="ui/SingleAllViewsDerivedLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnAAODmEee9bryn2mNvXA" name="Single CSSPropertySetter" sectionFile="ui/SingleCSSPropertySetter.xwt">
+    <sections xmi:id="_Zi0OQHX7Eeipp8d5W3Vl9g" name="Single CSSPropertySetter" sectionFile="ui/SingleCSSPropertySetter.xwt">
       <widget href="ui/SingleCSSPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnAAeDmEee9bryn2mNvXA" name="Single CSSType" sectionFile="ui/SingleCSSType.xwt">
+    <sections xmi:id="_Zi0OQXX7Eeipp8d5W3Vl9g" name="Single CSSType" sectionFile="ui/SingleCSSType.xwt">
       <widget href="ui/SingleCSSType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnAAuDmEee9bryn2mNvXA" name="Single CSSInstance" sectionFile="ui/SingleCSSInstance.xwt">
+    <sections xmi:id="_Zi01QHX7Eeipp8d5W3Vl9g" name="Single CSSInstance" sectionFile="ui/SingleCSSInstance.xwt">
       <widget href="ui/SingleCSSInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnAA-DmEee9bryn2mNvXA" name="Multiple LayerNamedStyle" sectionFile="ui/MultipleLayerNamedStyle.xwt">
+    <sections xmi:id="_Zi01QXX7Eeipp8d5W3Vl9g" name="Single CSSHidePropertySetter" sectionFile="ui/SingleCSSHidePropertySetter.xwt">
+      <widget href="ui/SingleCSSHidePropertySetter.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Zi01QnX7Eeipp8d5W3Vl9g" name="Single CSSHideType" sectionFile="ui/SingleCSSHideType.xwt">
+      <widget href="ui/SingleCSSHideType.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Zi01Q3X7Eeipp8d5W3Vl9g" name="Single CSSHideInstance" sectionFile="ui/SingleCSSHideInstance.xwt">
+      <widget href="ui/SingleCSSHideInstance.xwt#/"/>
+    </sections>
+    <sections xmi:id="_Zi01RHX7Eeipp8d5W3Vl9g" name="Multiple LayerNamedStyle" sectionFile="ui/MultipleLayerNamedStyle.xwt">
       <widget href="ui/MultipleLayerNamedStyle.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnABODmEee9bryn2mNvXA" name="Multiple LayersStack" sectionFile="ui/MultipleLayersStack.xwt">
+    <sections xmi:id="_Zi01RXX7Eeipp8d5W3Vl9g" name="Multiple LayersStack" sectionFile="ui/MultipleLayersStack.xwt">
       <widget href="ui/MultipleLayersStack.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnnEODmEee9bryn2mNvXA" name="Multiple LayerExpression" sectionFile="ui/MultipleLayerExpression.xwt">
+    <sections xmi:id="_Zi01RnX7Eeipp8d5W3Vl9g" name="Multiple LayerExpression" sectionFile="ui/MultipleLayerExpression.xwt">
       <widget href="ui/MultipleLayerExpression.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnnEeDmEee9bryn2mNvXA" name="Multiple ApplicationDependantElement" sectionFile="ui/MultipleApplicationDependantElement.xwt">
+    <sections xmi:id="_Zi01R3X7Eeipp8d5W3Vl9g" name="Multiple ApplicationDependantElement" sectionFile="ui/MultipleApplicationDependantElement.xwt">
       <widget href="ui/MultipleApplicationDependantElement.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnnEuDmEee9bryn2mNvXA" name="Multiple LayersStackApplication" sectionFile="ui/MultipleLayersStackApplication.xwt">
+    <sections xmi:id="_Zi01SHX7Eeipp8d5W3Vl9g" name="Multiple LayersStackApplication" sectionFile="ui/MultipleLayersStackApplication.xwt">
       <widget href="ui/MultipleLayersStackApplication.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnnE-DmEee9bryn2mNvXA" name="Multiple FolderElement" sectionFile="ui/MultipleFolderElement.xwt">
+    <sections xmi:id="_Zi01SXX7Eeipp8d5W3Vl9g" name="Multiple FolderElement" sectionFile="ui/MultipleFolderElement.xwt">
       <widget href="ui/MultipleFolderElement.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnnFODmEee9bryn2mNvXA" name="Multiple LayerStackDescriptorRegistry" sectionFile="ui/MultipleLayerStackDescriptorRegistry.xwt">
+    <sections xmi:id="_Zi01SnX7Eeipp8d5W3Vl9g" name="Multiple LayerStackDescriptorRegistry" sectionFile="ui/MultipleLayerStackDescriptorRegistry.xwt">
       <widget href="ui/MultipleLayerStackDescriptorRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnnFeDmEee9bryn2mNvXA" name="Multiple PropertyRegistry" sectionFile="ui/MultiplePropertyRegistry.xwt">
+    <sections xmi:id="_Zi01S3X7Eeipp8d5W3Vl9g" name="Multiple PropertyRegistry" sectionFile="ui/MultiplePropertyRegistry.xwt">
       <widget href="ui/MultiplePropertyRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WnnFuDmEee9bryn2mNvXA" name="Multiple Property" sectionFile="ui/MultipleProperty.xwt">
+    <sections xmi:id="_Zi01THX7Eeipp8d5W3Vl9g" name="Multiple Property" sectionFile="ui/MultipleProperty.xwt">
       <widget href="ui/MultipleProperty.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WoOIODmEee9bryn2mNvXA" name="Multiple Type" sectionFile="ui/MultipleType.xwt">
+    <sections xmi:id="_Zi01TXX7Eeipp8d5W3Vl9g" name="Multiple Type" sectionFile="ui/MultipleType.xwt">
       <widget href="ui/MultipleType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WoOIeDmEee9bryn2mNvXA" name="Multiple Metamodel" sectionFile="ui/MultipleMetamodel.xwt">
+    <sections xmi:id="_Zi01TnX7Eeipp8d5W3Vl9g" name="Multiple Metamodel" sectionFile="ui/MultipleMetamodel.xwt">
       <widget href="ui/MultipleMetamodel.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WoOIuDmEee9bryn2mNvXA" name="Multiple TypeInstance" sectionFile="ui/MultipleTypeInstance.xwt">
+    <sections xmi:id="_Zi01T3X7Eeipp8d5W3Vl9g" name="Multiple TypeInstance" sectionFile="ui/MultipleTypeInstance.xwt">
       <widget href="ui/MultipleTypeInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WoOI-DmEee9bryn2mNvXA" name="Multiple ComputePropertyValueCommandItf" sectionFile="ui/MultipleComputePropertyValueCommandItf.xwt">
+    <sections xmi:id="_Zi01UHX7Eeipp8d5W3Vl9g" name="Multiple ComputePropertyValueCommandItf" sectionFile="ui/MultipleComputePropertyValueCommandItf.xwt">
       <widget href="ui/MultipleComputePropertyValueCommandItf.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WoOJODmEee9bryn2mNvXA" name="Multiple TypeRegistry" sectionFile="ui/MultipleTypeRegistry.xwt">
+    <sections xmi:id="_Zi1cUHX7Eeipp8d5W3Vl9g" name="Multiple TypeRegistry" sectionFile="ui/MultipleTypeRegistry.xwt">
       <widget href="ui/MultipleTypeRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wo1MODmEee9bryn2mNvXA" name="Multiple StringToTypeMap" sectionFile="ui/MultipleStringToTypeMap.xwt">
+    <sections xmi:id="_Zi1cUXX7Eeipp8d5W3Vl9g" name="Multiple StringToTypeMap" sectionFile="ui/MultipleStringToTypeMap.xwt">
       <widget href="ui/MultipleStringToTypeMap.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WpcQODmEee9bryn2mNvXA" name="Multiple LayerDescriptorRegistry" sectionFile="ui/MultipleLayerDescriptorRegistry.xwt">
+    <sections xmi:id="_Zi1cUnX7Eeipp8d5W3Vl9g" name="Multiple LayerDescriptorRegistry" sectionFile="ui/MultipleLayerDescriptorRegistry.xwt">
       <widget href="ui/MultipleLayerDescriptorRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WqDUODmEee9bryn2mNvXA" name="Multiple LayerDescriptor" sectionFile="ui/MultipleLayerDescriptor.xwt">
+    <sections xmi:id="_Zi1cU3X7Eeipp8d5W3Vl9g" name="Multiple LayerDescriptor" sectionFile="ui/MultipleLayerDescriptor.xwt">
       <widget href="ui/MultipleLayerDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WtGoODmEee9bryn2mNvXA" name="Multiple LayerApplicationFactory" sectionFile="ui/MultipleLayerApplicationFactory.xwt">
+    <sections xmi:id="_Zi1cVHX7Eeipp8d5W3Vl9g" name="Multiple LayerApplicationFactory" sectionFile="ui/MultipleLayerApplicationFactory.xwt">
       <widget href="ui/MultipleLayerApplicationFactory.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WtGoeDmEee9bryn2mNvXA" name="Multiple PropertySetterRegistry" sectionFile="ui/MultiplePropertySetterRegistry.xwt">
+    <sections xmi:id="_Zi1cVXX7Eeipp8d5W3Vl9g" name="Multiple PropertySetterRegistry" sectionFile="ui/MultiplePropertySetterRegistry.xwt">
       <widget href="ui/MultiplePropertySetterRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WtGouDmEee9bryn2mNvXA" name="Multiple PropertySetter" sectionFile="ui/MultiplePropertySetter.xwt">
+    <sections xmi:id="_Zi1cVnX7Eeipp8d5W3Vl9g" name="Multiple PropertySetter" sectionFile="ui/MultiplePropertySetter.xwt">
       <widget href="ui/MultiplePropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WtGo-DmEee9bryn2mNvXA" name="Multiple StringToPropertySetter" sectionFile="ui/MultipleStringToPropertySetter.xwt">
+    <sections xmi:id="_Zi1cV3X7Eeipp8d5W3Vl9g" name="Multiple StringToPropertySetter" sectionFile="ui/MultipleStringToPropertySetter.xwt">
       <widget href="ui/MultipleStringToPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WttsODmEee9bryn2mNvXA" name="Multiple LayerOperatorDescriptorRegistry" sectionFile="ui/MultipleLayerOperatorDescriptorRegistry.xwt">
+    <sections xmi:id="_Zi1cWHX7Eeipp8d5W3Vl9g" name="Multiple LayerOperatorDescriptorRegistry" sectionFile="ui/MultipleLayerOperatorDescriptorRegistry.xwt">
       <widget href="ui/MultipleLayerOperatorDescriptorRegistry.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WttseDmEee9bryn2mNvXA" name="Multiple LayerOperatorDescriptor" sectionFile="ui/MultipleLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_Zi1cWXX7Eeipp8d5W3Vl9g" name="Multiple LayerOperatorDescriptor" sectionFile="ui/MultipleLayerOperatorDescriptor.xwt">
       <widget href="ui/MultipleLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WuUwODmEee9bryn2mNvXA" name="Multiple PropertyOperator" sectionFile="ui/MultiplePropertyOperator.xwt">
+    <sections xmi:id="_Zi1cWnX7Eeipp8d5W3Vl9g" name="Multiple PropertyOperator" sectionFile="ui/MultiplePropertyOperator.xwt">
       <widget href="ui/MultiplePropertyOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WuUweDmEee9bryn2mNvXA" name="Multiple AbstractLayerOperator" sectionFile="ui/MultipleAbstractLayerOperator.xwt">
+    <sections xmi:id="_Zi1cW3X7Eeipp8d5W3Vl9g" name="Multiple AbstractLayerOperator" sectionFile="ui/MultipleAbstractLayerOperator.xwt">
       <widget href="ui/MultipleAbstractLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wu70ODmEee9bryn2mNvXA" name="Multiple LayerOperator" sectionFile="ui/MultipleLayerOperator.xwt">
+    <sections xmi:id="_Zi1cXHX7Eeipp8d5W3Vl9g" name="Multiple LayerOperator" sectionFile="ui/MultipleLayerOperator.xwt">
       <widget href="ui/MultipleLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wu70eDmEee9bryn2mNvXA" name="Multiple LayersContainer" sectionFile="ui/MultipleLayersContainer.xwt">
+    <sections xmi:id="_Zi1cXXX7Eeipp8d5W3Vl9g" name="Multiple LayersContainer" sectionFile="ui/MultipleLayersContainer.xwt">
       <widget href="ui/MultipleLayersContainer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wvi4ODmEee9bryn2mNvXA" name="Multiple DefaultPropertyOperator" sectionFile="ui/MultipleDefaultPropertyOperator.xwt">
+    <sections xmi:id="_Zi1cXnX7Eeipp8d5W3Vl9g" name="Multiple DefaultPropertyOperator" sectionFile="ui/MultipleDefaultPropertyOperator.xwt">
       <widget href="ui/MultipleDefaultPropertyOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WwJ8ODmEee9bryn2mNvXA" name="Multiple AbstractLayer" sectionFile="ui/MultipleAbstractLayer.xwt">
+    <sections xmi:id="_Zi2DYHX7Eeipp8d5W3Vl9g" name="Multiple AbstractLayer" sectionFile="ui/MultipleAbstractLayer.xwt">
       <widget href="ui/MultipleAbstractLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WwxAODmEee9bryn2mNvXA" name="Multiple StringToTypeInstanceMap" sectionFile="ui/MultipleStringToTypeInstanceMap.xwt">
+    <sections xmi:id="_Zi2DYXX7Eeipp8d5W3Vl9g" name="Multiple StringToTypeInstanceMap" sectionFile="ui/MultipleStringToTypeInstanceMap.xwt">
       <widget href="ui/MultipleStringToTypeInstanceMap.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WwxAeDmEee9bryn2mNvXA" name="Multiple Folder" sectionFile="ui/MultipleFolder.xwt">
+    <sections xmi:id="_Zi2DYnX7Eeipp8d5W3Vl9g" name="Multiple Folder" sectionFile="ui/MultipleFolder.xwt">
       <widget href="ui/MultipleFolder.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WwxAuDmEee9bryn2mNvXA" name="Multiple IntInstance" sectionFile="ui/MultipleIntInstance.xwt">
+    <sections xmi:id="_Zi2DY3X7Eeipp8d5W3Vl9g" name="Multiple IntInstance" sectionFile="ui/MultipleIntInstance.xwt">
       <widget href="ui/MultipleIntInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WwxA-DmEee9bryn2mNvXA" name="Multiple BooleanInstance" sectionFile="ui/MultipleBooleanInstance.xwt">
+    <sections xmi:id="_Zi2DZHX7Eeipp8d5W3Vl9g" name="Multiple BooleanInstance" sectionFile="ui/MultipleBooleanInstance.xwt">
       <widget href="ui/MultipleBooleanInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WxYEODmEee9bryn2mNvXA" name="Multiple StringInstance" sectionFile="ui/MultipleStringInstance.xwt">
+    <sections xmi:id="_Zi2DZXX7Eeipp8d5W3Vl9g" name="Multiple StringInstance" sectionFile="ui/MultipleStringInstance.xwt">
       <widget href="ui/MultipleStringInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WxYEeDmEee9bryn2mNvXA" name="Multiple IntType" sectionFile="ui/MultipleIntType.xwt">
+    <sections xmi:id="_Zi2DZnX7Eeipp8d5W3Vl9g" name="Multiple IntType" sectionFile="ui/MultipleIntType.xwt">
       <widget href="ui/MultipleIntType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WxYEuDmEee9bryn2mNvXA" name="Multiple BooleanType" sectionFile="ui/MultipleBooleanType.xwt">
+    <sections xmi:id="_Zi2DZ3X7Eeipp8d5W3Vl9g" name="Multiple BooleanType" sectionFile="ui/MultipleBooleanType.xwt">
       <widget href="ui/MultipleBooleanType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WxYE-DmEee9bryn2mNvXA" name="Multiple StringType" sectionFile="ui/MultipleStringType.xwt">
+    <sections xmi:id="_Zi2DaHX7Eeipp8d5W3Vl9g" name="Multiple StringType" sectionFile="ui/MultipleStringType.xwt">
       <widget href="ui/MultipleStringType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WxYFODmEee9bryn2mNvXA" name="Multiple CustomType" sectionFile="ui/MultipleCustomType.xwt">
+    <sections xmi:id="_Zi2DaXX7Eeipp8d5W3Vl9g" name="Multiple CustomType" sectionFile="ui/MultipleCustomType.xwt">
       <widget href="ui/MultipleCustomType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WxYFeDmEee9bryn2mNvXA" name="Multiple TopLayerOperator" sectionFile="ui/MultipleTopLayerOperator.xwt">
+    <sections xmi:id="_Zi2DanX7Eeipp8d5W3Vl9g" name="Multiple TopLayerOperator" sectionFile="ui/MultipleTopLayerOperator.xwt">
       <widget href="ui/MultipleTopLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WxYFuDmEee9bryn2mNvXA" name="Multiple StackedLayerOperator" sectionFile="ui/MultipleStackedLayerOperator.xwt">
+    <sections xmi:id="_Zi2Da3X7Eeipp8d5W3Vl9g" name="Multiple StackedLayerOperator" sectionFile="ui/MultipleStackedLayerOperator.xwt">
       <widget href="ui/MultipleStackedLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wx_IODmEee9bryn2mNvXA" name="Multiple CustomLayerOperator" sectionFile="ui/MultipleCustomLayerOperator.xwt">
+    <sections xmi:id="_Zi2DbHX7Eeipp8d5W3Vl9g" name="Multiple CustomLayerOperator" sectionFile="ui/MultipleCustomLayerOperator.xwt">
       <widget href="ui/MultipleCustomLayerOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wx_IeDmEee9bryn2mNvXA" name="Multiple PropertyIndex" sectionFile="ui/MultiplePropertyIndex.xwt">
+    <sections xmi:id="_Zi2DbXX7Eeipp8d5W3Vl9g" name="Multiple PropertyIndex" sectionFile="ui/MultiplePropertyIndex.xwt">
       <widget href="ui/MultiplePropertyIndex.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wx_IuDmEee9bryn2mNvXA" name="Multiple StringToPropertyIndexMap" sectionFile="ui/MultipleStringToPropertyIndexMap.xwt">
+    <sections xmi:id="_Zi2qcHX7Eeipp8d5W3Vl9g" name="Multiple StringToPropertyIndexMap" sectionFile="ui/MultipleStringToPropertyIndexMap.xwt">
       <widget href="ui/MultipleStringToPropertyIndexMap.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wx_I-DmEee9bryn2mNvXA" name="Multiple SimpleLayerDescriptor" sectionFile="ui/MultipleSimpleLayerDescriptor.xwt">
+    <sections xmi:id="_Zi2qcXX7Eeipp8d5W3Vl9g" name="Multiple SimpleLayerDescriptor" sectionFile="ui/MultipleSimpleLayerDescriptor.xwt">
       <widget href="ui/MultipleSimpleLayerDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wx_JODmEee9bryn2mNvXA" name="Multiple RegExpLayerDescriptor" sectionFile="ui/MultipleRegExpLayerDescriptor.xwt">
+    <sections xmi:id="_Zi2qcnX7Eeipp8d5W3Vl9g" name="Multiple RegExpLayerDescriptor" sectionFile="ui/MultipleRegExpLayerDescriptor.xwt">
       <widget href="ui/MultipleRegExpLayerDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wx_JeDmEee9bryn2mNvXA" name="Multiple NullInstance" sectionFile="ui/MultipleNullInstance.xwt">
+    <sections xmi:id="_Zi2qc3X7Eeipp8d5W3Vl9g" name="Multiple NullInstance" sectionFile="ui/MultipleNullInstance.xwt">
       <widget href="ui/MultipleNullInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7Wx_JuDmEee9bryn2mNvXA" name="Multiple RegExpLayer" sectionFile="ui/MultipleRegExpLayer.xwt">
+    <sections xmi:id="_Zi2qdHX7Eeipp8d5W3Vl9g" name="Multiple RegExpLayer" sectionFile="ui/MultipleRegExpLayer.xwt">
       <widget href="ui/MultipleRegExpLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WymMODmEee9bryn2mNvXA" name="Multiple Layer" sectionFile="ui/MultipleLayer.xwt">
+    <sections xmi:id="_ZjCQoHX7Eeipp8d5W3Vl9g" name="Multiple Layer" sectionFile="ui/MultipleLayer.xwt">
       <widget href="ui/MultipleLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WymMeDmEee9bryn2mNvXA" name="Multiple Color" sectionFile="ui/MultipleColor.xwt">
+    <sections xmi:id="_ZjCQoXX7Eeipp8d5W3Vl9g" name="Multiple Color" sectionFile="ui/MultipleColor.xwt">
       <widget href="ui/MultipleColor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WymMuDmEee9bryn2mNvXA" name="Multiple ColorInstance" sectionFile="ui/MultipleColorInstance.xwt">
+    <sections xmi:id="_ZjCQonX7Eeipp8d5W3Vl9g" name="Multiple ColorInstance" sectionFile="ui/MultipleColorInstance.xwt">
       <widget href="ui/MultipleColorInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WymM-DmEee9bryn2mNvXA" name="Multiple FillInstance" sectionFile="ui/MultipleFillInstance.xwt">
+    <sections xmi:id="_ZjCQo3X7Eeipp8d5W3Vl9g" name="Multiple FillInstance" sectionFile="ui/MultipleFillInstance.xwt">
       <widget href="ui/MultipleFillInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WymNODmEee9bryn2mNvXA" name="Multiple Fill" sectionFile="ui/MultipleFill.xwt">
+    <sections xmi:id="_ZjCQpHX7Eeipp8d5W3Vl9g" name="Multiple Fill" sectionFile="ui/MultipleFill.xwt">
       <widget href="ui/MultipleFill.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WymNeDmEee9bryn2mNvXA" name="Multiple FillPropertySetter" sectionFile="ui/MultipleFillPropertySetter.xwt">
+    <sections xmi:id="_ZjCQpXX7Eeipp8d5W3Vl9g" name="Multiple FillPropertySetter" sectionFile="ui/MultipleFillPropertySetter.xwt">
       <widget href="ui/MultipleFillPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WymNuDmEee9bryn2mNvXA" name="Multiple IsValidPropertySetter" sectionFile="ui/MultipleIsValidPropertySetter.xwt">
+    <sections xmi:id="_ZjCQpnX7Eeipp8d5W3Vl9g" name="Multiple IsValidPropertySetter" sectionFile="ui/MultipleIsValidPropertySetter.xwt">
       <widget href="ui/MultipleIsValidPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WzNQODmEee9bryn2mNvXA" name="Multiple NullPropertySetter" sectionFile="ui/MultipleNullPropertySetter.xwt">
+    <sections xmi:id="_ZjCQp3X7Eeipp8d5W3Vl9g" name="Multiple NullPropertySetter" sectionFile="ui/MultipleNullPropertySetter.xwt">
       <widget href="ui/MultipleNullPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WzNQeDmEee9bryn2mNvXA" name="Multiple LineType" sectionFile="ui/MultipleLineType.xwt">
+    <sections xmi:id="_ZjCQqHX7Eeipp8d5W3Vl9g" name="Multiple LineType" sectionFile="ui/MultipleLineType.xwt">
       <widget href="ui/MultipleLineType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WzNQuDmEee9bryn2mNvXA" name="Multiple LineInstance" sectionFile="ui/MultipleLineInstance.xwt">
+    <sections xmi:id="_ZjCQqXX7Eeipp8d5W3Vl9g" name="Multiple LineInstance" sectionFile="ui/MultipleLineInstance.xwt">
       <widget href="ui/MultipleLineInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WzNQ-DmEee9bryn2mNvXA" name="Multiple LinePropertySetter" sectionFile="ui/MultipleLinePropertySetter.xwt">
+    <sections xmi:id="_ZjCQqnX7Eeipp8d5W3Vl9g" name="Multiple LinePropertySetter" sectionFile="ui/MultipleLinePropertySetter.xwt">
       <widget href="ui/MultipleLinePropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WzNRODmEee9bryn2mNvXA" name="Multiple FontPropertySetter" sectionFile="ui/MultipleFontPropertySetter.xwt">
+    <sections xmi:id="_ZjCQq3X7Eeipp8d5W3Vl9g" name="Multiple FontPropertySetter" sectionFile="ui/MultipleFontPropertySetter.xwt">
       <widget href="ui/MultipleFontPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WzNReDmEee9bryn2mNvXA" name="Multiple FontInstance" sectionFile="ui/MultipleFontInstance.xwt">
+    <sections xmi:id="_ZjCQrHX7Eeipp8d5W3Vl9g" name="Multiple FontInstance" sectionFile="ui/MultipleFontInstance.xwt">
       <widget href="ui/MultipleFontInstance.xwt#/"/>
     </sections>
-    <sections xmi:id="_7WzNRuDmEee9bryn2mNvXA" name="Multiple FontType" sectionFile="ui/MultipleFontType.xwt">
+    <sections xmi:id="_ZjCQrXX7Eeipp8d5W3Vl9g" name="Multiple FontType" sectionFile="ui/MultipleFontType.xwt">
       <widget href="ui/MultipleFontType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W0bYODmEee9bryn2mNvXA" name="Multiple IsVisiblePropertySetter" sectionFile="ui/MultipleIsVisiblePropertySetter.xwt">
+    <sections xmi:id="_ZjCQrnX7Eeipp8d5W3Vl9g" name="Multiple IsVisiblePropertySetter" sectionFile="ui/MultipleIsVisiblePropertySetter.xwt">
       <widget href="ui/MultipleIsVisiblePropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W0bYeDmEee9bryn2mNvXA" name="Multiple TopLayerOperatorDescriptor" sectionFile="ui/MultipleTopLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_ZjC3sHX7Eeipp8d5W3Vl9g" name="Multiple TopLayerOperatorDescriptor" sectionFile="ui/MultipleTopLayerOperatorDescriptor.xwt">
       <widget href="ui/MultipleTopLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W0bYuDmEee9bryn2mNvXA" name="Multiple StackedLayerOperatorDescriptor" sectionFile="ui/MultipleStackedLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_ZjC3sXX7Eeipp8d5W3Vl9g" name="Multiple StackedLayerOperatorDescriptor" sectionFile="ui/MultipleStackedLayerOperatorDescriptor.xwt">
       <widget href="ui/MultipleStackedLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1CcODmEee9bryn2mNvXA" name="Multiple CustomPropertyOperator" sectionFile="ui/MultipleCustomPropertyOperator.xwt">
+    <sections xmi:id="_ZjC3snX7Eeipp8d5W3Vl9g" name="Multiple CustomPropertyOperator" sectionFile="ui/MultipleCustomPropertyOperator.xwt">
       <widget href="ui/MultipleCustomPropertyOperator.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1CceDmEee9bryn2mNvXA" name="Multiple AndStackedLayerOperatorDescriptor" sectionFile="ui/MultipleAndStackedLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_ZjC3s3X7Eeipp8d5W3Vl9g" name="Multiple AndStackedLayerOperatorDescriptor" sectionFile="ui/MultipleAndStackedLayerOperatorDescriptor.xwt">
       <widget href="ui/MultipleAndStackedLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1CcuDmEee9bryn2mNvXA" name="Multiple OrStackedLayerOperatorDescriptor" sectionFile="ui/MultipleOrStackedLayerOperatorDescriptor.xwt">
+    <sections xmi:id="_ZjC3tHX7Eeipp8d5W3Vl9g" name="Multiple OrStackedLayerOperatorDescriptor" sectionFile="ui/MultipleOrStackedLayerOperatorDescriptor.xwt">
       <widget href="ui/MultipleOrStackedLayerOperatorDescriptor.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1Cc-DmEee9bryn2mNvXA" name="Multiple IsAbstractUmlSetter" sectionFile="ui/MultipleIsAbstractUmlSetter.xwt">
+    <sections xmi:id="_ZjC3tXX7Eeipp8d5W3Vl9g" name="Multiple IsAbstractUmlSetter" sectionFile="ui/MultipleIsAbstractUmlSetter.xwt">
       <widget href="ui/MultipleIsAbstractUmlSetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1pgODmEee9bryn2mNvXA" name="Multiple AllViewsDerivedLayer" sectionFile="ui/MultipleAllViewsDerivedLayer.xwt">
+    <sections xmi:id="_ZjC3tnX7Eeipp8d5W3Vl9g" name="Multiple AllViewsDerivedLayer" sectionFile="ui/MultipleAllViewsDerivedLayer.xwt">
       <widget href="ui/MultipleAllViewsDerivedLayer.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1pgeDmEee9bryn2mNvXA" name="Multiple CSSPropertySetter" sectionFile="ui/MultipleCSSPropertySetter.xwt">
+    <sections xmi:id="_ZjC3t3X7Eeipp8d5W3Vl9g" name="Multiple CSSPropertySetter" sectionFile="ui/MultipleCSSPropertySetter.xwt">
       <widget href="ui/MultipleCSSPropertySetter.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1pguDmEee9bryn2mNvXA" name="Multiple CSSType" sectionFile="ui/MultipleCSSType.xwt">
+    <sections xmi:id="_ZjC3uHX7Eeipp8d5W3Vl9g" name="Multiple CSSType" sectionFile="ui/MultipleCSSType.xwt">
       <widget href="ui/MultipleCSSType.xwt#/"/>
     </sections>
-    <sections xmi:id="_7W1pg-DmEee9bryn2mNvXA" name="Multiple CSSInstance" sectionFile="ui/MultipleCSSInstance.xwt">
+    <sections xmi:id="_ZjC3uXX7Eeipp8d5W3Vl9g" name="Multiple CSSInstance" sectionFile="ui/MultipleCSSInstance.xwt">
       <widget href="ui/MultipleCSSInstance.xwt#/"/>
     </sections>
+    <sections xmi:id="_ZjC3unX7Eeipp8d5W3Vl9g" name="Multiple CSSHidePropertySetter" sectionFile="ui/MultipleCSSHidePropertySetter.xwt">
+      <widget href="ui/MultipleCSSHidePropertySetter.xwt#/"/>
+    </sections>
+    <sections xmi:id="_ZjC3u3X7Eeipp8d5W3Vl9g" name="Multiple CSSHideType" sectionFile="ui/MultipleCSSHideType.xwt">
+      <widget href="ui/MultipleCSSHideType.xwt#/"/>
+    </sections>
+    <sections xmi:id="_ZjC3vHX7Eeipp8d5W3Vl9g" name="Multiple CSSHideInstance" sectionFile="ui/MultipleCSSHideInstance.xwt">
+      <widget href="ui/MultipleCSSHideInstance.xwt#/"/>
+    </sections>
   </tabs>
-  <views xmi:id="_2fvNIODlEee9bryn2mNvXA" name="Single LayerNamedStyle" sections="_7WUFEODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPYeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNIeDlEee9bryn2mNvXA" name="isSingleLayerNamedStyle">
+  <views xmi:id="_umc1gXX6Eeipp8d5W3Vl9g" name="Single LayerNamedStyle" sections="_Zixx8XX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc32nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1gnX6Eeipp8d5W3Vl9g" name="isSingleLayerNamedStyle">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNIuDlEee9bryn2mNvXA" name="className" value="LayerNamedStyle"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNI-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1g3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1hHX6Eeipp8d5W3Vl9g" name="className" value="LayerNamedStyle"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNJODlEee9bryn2mNvXA" name="Single LayersStack" sections="_7WaLsODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPY-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNJeDlEee9bryn2mNvXA" name="isSingleLayersStack">
+  <views xmi:id="_umc1hXX6Eeipp8d5W3Vl9g" name="Single LayersStack" sections="_Zixx8nX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc33HX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1hnX6Eeipp8d5W3Vl9g" name="isSingleLayersStack">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNJuDlEee9bryn2mNvXA" name="className" value="LayersStack"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNJ-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1h3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1iHX6Eeipp8d5W3Vl9g" name="className" value="LayersStack"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNKODlEee9bryn2mNvXA" name="Single LayerExpression" sections="_7WaywODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPaeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNKeDlEee9bryn2mNvXA" name="isSingleLayerExpression">
+  <views xmi:id="_umc1iXX6Eeipp8d5W3Vl9g" name="Single LayerExpression" sections="_Zixx83X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc34nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1inX6Eeipp8d5W3Vl9g" name="isSingleLayerExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNKuDlEee9bryn2mNvXA" name="className" value="LayerExpression"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNK-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1i3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1jHX6Eeipp8d5W3Vl9g" name="className" value="LayerExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNLODlEee9bryn2mNvXA" name="Single ApplicationDependantElement" sections="_7WayweDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPceDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNLeDlEee9bryn2mNvXA" name="isSingleApplicationDependantElement">
+  <views xmi:id="_umc1jXX6Eeipp8d5W3Vl9g" name="Single ApplicationDependantElement" sections="_ZiyZAHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc36nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1jnX6Eeipp8d5W3Vl9g" name="isSingleApplicationDependantElement">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNLuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNL-DlEee9bryn2mNvXA" name="className" value="ApplicationDependantElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1j3X6Eeipp8d5W3Vl9g" name="className" value="ApplicationDependantElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1kHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNMODlEee9bryn2mNvXA" name="Single LayersStackApplication" sections="_7WaywuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0MeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNMeDlEee9bryn2mNvXA" name="isSingleLayersStackApplication">
+  <views xmi:id="_umc1kXX6Eeipp8d5W3Vl9g" name="Single LayersStackApplication" sections="_ZiyZAXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc37HX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1knX6Eeipp8d5W3Vl9g" name="isSingleLayersStackApplication">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNMuDlEee9bryn2mNvXA" name="className" value="LayersStackApplication"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNM-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1k3X6Eeipp8d5W3Vl9g" name="className" value="LayersStackApplication"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1lHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNNODlEee9bryn2mNvXA" name="Single FolderElement" sections="_7WbZ0ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0OeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNNeDlEee9bryn2mNvXA" name="isSingleFolderElement">
+  <views xmi:id="_umc1lXX6Eeipp8d5W3Vl9g" name="Single FolderElement" sections="_ZiyZAnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc39HX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1lnX6Eeipp8d5W3Vl9g" name="isSingleFolderElement">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNNuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNN-DlEee9bryn2mNvXA" name="className" value="FolderElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1l3X6Eeipp8d5W3Vl9g" name="className" value="FolderElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1mHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNOODlEee9bryn2mNvXA" name="Single LayerStackDescriptorRegistry" sections="_7WbZ0eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0OuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNOeDlEee9bryn2mNvXA" name="isSingleLayerStackDescriptorRegistry">
+  <views xmi:id="_umc1mXX6Eeipp8d5W3Vl9g" name="Single LayerStackDescriptorRegistry" sections="_ZiyZA3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc39XX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1mnX6Eeipp8d5W3Vl9g" name="isSingleLayerStackDescriptorRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNOuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNO-DlEee9bryn2mNvXA" name="className" value="LayerStackDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1m3X6Eeipp8d5W3Vl9g" name="className" value="LayerStackDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1nHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNPODlEee9bryn2mNvXA" name="Single PropertyRegistry" sections="_7WbZ0uDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0O-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNPeDlEee9bryn2mNvXA" name="isSinglePropertyRegistry">
+  <views xmi:id="_umc1nXX6Eeipp8d5W3Vl9g" name="Single PropertyRegistry" sections="_ZiyZBHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc39nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1nnX6Eeipp8d5W3Vl9g" name="isSinglePropertyRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNPuDlEee9bryn2mNvXA" name="className" value="PropertyRegistry"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNP-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1n3X6Eeipp8d5W3Vl9g" name="className" value="PropertyRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1oHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNQODlEee9bryn2mNvXA" name="Single Property" sections="_7WbZ0-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0P-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNQeDlEee9bryn2mNvXA" name="isSingleProperty">
+  <views xmi:id="_umc1oXX6Eeipp8d5W3Vl9g" name="Single Property" sections="_ZiyZBXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc3-nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1onX6Eeipp8d5W3Vl9g" name="isSingleProperty">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNQuDlEee9bryn2mNvXA" name="className" value="Property"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNQ-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1o3X6Eeipp8d5W3Vl9g" name="className" value="Property"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1pHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNRODlEee9bryn2mNvXA" name="Single Type" sections="_7WbZ1ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ReDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNReDlEee9bryn2mNvXA" name="isSingleType">
+  <views xmi:id="_umc1pXX6Eeipp8d5W3Vl9g" name="Single Type" sections="_ZiyZBnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4AHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1pnX6Eeipp8d5W3Vl9g" name="isSingleType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNRuDlEee9bryn2mNvXA" name="className" value="Type"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNR-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1p3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1qHX6Eeipp8d5W3Vl9g" name="className" value="Type"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNSODlEee9bryn2mNvXA" name="Single Metamodel" sections="_7WcA4ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0SeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNSeDlEee9bryn2mNvXA" name="isSingleMetamodel">
+  <views xmi:id="_umc1qXX6Eeipp8d5W3Vl9g" name="Single Metamodel" sections="_ZiyZB3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4BHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1qnX6Eeipp8d5W3Vl9g" name="isSingleMetamodel">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNSuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNS-DlEee9bryn2mNvXA" name="className" value="Metamodel"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1q3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1rHX6Eeipp8d5W3Vl9g" name="className" value="Metamodel"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNTODlEee9bryn2mNvXA" name="Single TypeInstance" sections="_7WcA4eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0UODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNTeDlEee9bryn2mNvXA" name="isSingleTypeInstance">
+  <views xmi:id="_umc1rXX6Eeipp8d5W3Vl9g" name="Single TypeInstance" sections="_ZiyZCHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4C3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1rnX6Eeipp8d5W3Vl9g" name="isSingleTypeInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNTuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNT-DlEee9bryn2mNvXA" name="className" value="TypeInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1r3X6Eeipp8d5W3Vl9g" name="className" value="TypeInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1sHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNUODlEee9bryn2mNvXA" name="Single ComputePropertyValueCommandItf" sections="_7WcA4uDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0UeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNUeDlEee9bryn2mNvXA" name="isSingleComputePropertyValueCommandItf">
+  <views xmi:id="_umc1sXX6Eeipp8d5W3Vl9g" name="Single ComputePropertyValueCommandItf" sections="_ZiyZCXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4DHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1snX6Eeipp8d5W3Vl9g" name="isSingleComputePropertyValueCommandItf">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNUuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNU-DlEee9bryn2mNvXA" name="className" value="ComputePropertyValueCommandItf"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1s3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1tHX6Eeipp8d5W3Vl9g" name="className" value="ComputePropertyValueCommandItf"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNVODlEee9bryn2mNvXA" name="Single TypeRegistry" sections="_7Wcn8ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0UuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNVeDlEee9bryn2mNvXA" name="isSingleTypeRegistry">
+  <views xmi:id="_umc1tXX6Eeipp8d5W3Vl9g" name="Single TypeRegistry" sections="_ZiyZCnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4DXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1tnX6Eeipp8d5W3Vl9g" name="isSingleTypeRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNVuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNV-DlEee9bryn2mNvXA" name="className" value="TypeRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1t3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1uHX6Eeipp8d5W3Vl9g" name="className" value="TypeRegistry"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNWODlEee9bryn2mNvXA" name="Single StringToTypeMap" sections="_7Wcn8eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0VODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNWeDlEee9bryn2mNvXA" name="isSingleStringToTypeMap">
+  <views xmi:id="_umc1uXX6Eeipp8d5W3Vl9g" name="Single StringToTypeMap" sections="_ZiyZC3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4D3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1unX6Eeipp8d5W3Vl9g" name="isSingleStringToTypeMap">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNWuDlEee9bryn2mNvXA" name="className" value="StringToTypeMap"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNW-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1u3X6Eeipp8d5W3Vl9g" name="className" value="StringToTypeMap"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1vHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNXODlEee9bryn2mNvXA" name="Single LayerDescriptorRegistry" sections="_7Wcn8uDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0V-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNXeDlEee9bryn2mNvXA" name="isSingleLayerDescriptorRegistry">
+  <views xmi:id="_umc1vXX6Eeipp8d5W3Vl9g" name="Single LayerDescriptorRegistry" sections="_ZiyZDHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4EnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1vnX6Eeipp8d5W3Vl9g" name="isSingleLayerDescriptorRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNXuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNX-DlEee9bryn2mNvXA" name="className" value="LayerDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1v3X6Eeipp8d5W3Vl9g" name="className" value="LayerDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1wHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNYODlEee9bryn2mNvXA" name="Single LayerDescriptor" sections="_7Wcn8-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0WeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNYeDlEee9bryn2mNvXA" name="isSingleLayerDescriptor">
+  <views xmi:id="_umc1wXX6Eeipp8d5W3Vl9g" name="Single LayerDescriptor" sections="_ZiyZDXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4FHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1wnX6Eeipp8d5W3Vl9g" name="isSingleLayerDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNYuDlEee9bryn2mNvXA" name="className" value="LayerDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNY-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1w3X6Eeipp8d5W3Vl9g" name="className" value="LayerDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1xHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNZODlEee9bryn2mNvXA" name="Single LayerApplicationFactory" sections="_7Wcn9ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0W-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNZeDlEee9bryn2mNvXA" name="isSingleLayerApplicationFactory">
+  <views xmi:id="_umc1xXX6Eeipp8d5W3Vl9g" name="Single LayerApplicationFactory" sections="_ZiyZDnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4FnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1xnX6Eeipp8d5W3Vl9g" name="isSingleLayerApplicationFactory">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNZuDlEee9bryn2mNvXA" name="className" value="LayerApplicationFactory"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNZ-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1x3X6Eeipp8d5W3Vl9g" name="className" value="LayerApplicationFactory"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1yHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNaODlEee9bryn2mNvXA" name="Single PropertySetterRegistry" sections="_7Wcn9eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0XeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNaeDlEee9bryn2mNvXA" name="isSinglePropertySetterRegistry">
+  <views xmi:id="_umc1yXX6Eeipp8d5W3Vl9g" name="Single PropertySetterRegistry" sections="_ZiyZD3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4GHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1ynX6Eeipp8d5W3Vl9g" name="isSinglePropertySetterRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNauDlEee9bryn2mNvXA" name="className" value="PropertySetterRegistry"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNa-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1y3X6Eeipp8d5W3Vl9g" name="className" value="PropertySetterRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1zHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNbODlEee9bryn2mNvXA" name="Single PropertySetter" sections="_7Wd2EODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0YeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNbeDlEee9bryn2mNvXA" name="isSinglePropertySetter">
+  <views xmi:id="_umc1zXX6Eeipp8d5W3Vl9g" name="Single PropertySetter" sections="_ZiyZEHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4HHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1znX6Eeipp8d5W3Vl9g" name="isSinglePropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNbuDlEee9bryn2mNvXA" name="className" value="PropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNb-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1z3X6Eeipp8d5W3Vl9g" name="className" value="PropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc10HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNcODlEee9bryn2mNvXA" name="Single StringToPropertySetter" sections="_7Wd2EeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ZODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNceDlEee9bryn2mNvXA" name="isSingleStringToPropertySetter">
+  <views xmi:id="_umc10XX6Eeipp8d5W3Vl9g" name="Single StringToPropertySetter" sections="_ZiyZEXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4H3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc10nX6Eeipp8d5W3Vl9g" name="isSingleStringToPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNcuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNc-DlEee9bryn2mNvXA" name="className" value="StringToPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc103X6Eeipp8d5W3Vl9g" name="className" value="StringToPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc11HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNdODlEee9bryn2mNvXA" name="Single LayerOperatorDescriptorRegistry" sections="_7Wd2EuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0Z-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNdeDlEee9bryn2mNvXA" name="isSingleLayerOperatorDescriptorRegistry">
+  <views xmi:id="_umc11XX6Eeipp8d5W3Vl9g" name="Single LayerOperatorDescriptorRegistry" sections="_ZiyZEnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4InX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc11nX6Eeipp8d5W3Vl9g" name="isSingleLayerOperatorDescriptorRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNduDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNd-DlEee9bryn2mNvXA" name="className" value="LayerOperatorDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc113X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc12HX6Eeipp8d5W3Vl9g" name="className" value="LayerOperatorDescriptorRegistry"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNeODlEee9bryn2mNvXA" name="Single LayerOperatorDescriptor" sections="_7WedIODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0bODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNeeDlEee9bryn2mNvXA" name="isSingleLayerOperatorDescriptor">
+  <views xmi:id="_umc12XX6Eeipp8d5W3Vl9g" name="Single LayerOperatorDescriptor" sections="_ZiyZE3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4J3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc12nX6Eeipp8d5W3Vl9g" name="isSingleLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNeuDlEee9bryn2mNvXA" name="className" value="LayerOperatorDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNe-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc123X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc13HX6Eeipp8d5W3Vl9g" name="className" value="LayerOperatorDescriptor"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNfODlEee9bryn2mNvXA" name="Single PropertyOperator" sections="_7WedIeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0b-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNfeDlEee9bryn2mNvXA" name="isSinglePropertyOperator">
+  <views xmi:id="_umc13XX6Eeipp8d5W3Vl9g" name="Single PropertyOperator" sections="_ZizAEHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4KnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc13nX6Eeipp8d5W3Vl9g" name="isSinglePropertyOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNfuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNf-DlEee9bryn2mNvXA" name="className" value="PropertyOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc133X6Eeipp8d5W3Vl9g" name="className" value="PropertyOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc14HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNgODlEee9bryn2mNvXA" name="Single AbstractLayerOperator" sections="_7WgSUODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ceDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNgeDlEee9bryn2mNvXA" name="isSingleAbstractLayerOperator">
+  <views xmi:id="_umc14XX6Eeipp8d5W3Vl9g" name="Single AbstractLayerOperator" sections="_ZizAEXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4LHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc14nX6Eeipp8d5W3Vl9g" name="isSingleAbstractLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNguDlEee9bryn2mNvXA" name="className" value="AbstractLayerOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNg-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc143X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc15HX6Eeipp8d5W3Vl9g" name="className" value="AbstractLayerOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNhODlEee9bryn2mNvXA" name="Single LayerOperator" sections="_7Wg5YODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0dODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNheDlEee9bryn2mNvXA" name="isSingleLayerOperator">
+  <views xmi:id="_umc15XX6Eeipp8d5W3Vl9g" name="Single LayerOperator" sections="_ZizAEnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4L3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc15nX6Eeipp8d5W3Vl9g" name="isSingleLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNhuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNh-DlEee9bryn2mNvXA" name="className" value="LayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc153X6Eeipp8d5W3Vl9g" name="className" value="LayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc16HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNiODlEee9bryn2mNvXA" name="Single LayersContainer" sections="_7Wg5YeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0duDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNieDlEee9bryn2mNvXA" name="isSingleLayersContainer">
+  <views xmi:id="_umc16XX6Eeipp8d5W3Vl9g" name="Single LayersContainer" sections="_ZizAE3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4MXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc16nX6Eeipp8d5W3Vl9g" name="isSingleLayersContainer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNiuDlEee9bryn2mNvXA" name="className" value="LayersContainer"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNi-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc163X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc17HX6Eeipp8d5W3Vl9g" name="className" value="LayersContainer"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNjODlEee9bryn2mNvXA" name="Single DefaultPropertyOperator" sections="_7Wg5YuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0d-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNjeDlEee9bryn2mNvXA" name="isSingleDefaultPropertyOperator">
+  <views xmi:id="_umc17XX6Eeipp8d5W3Vl9g" name="Single DefaultPropertyOperator" sections="_ZizAFHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4MnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc17nX6Eeipp8d5W3Vl9g" name="isSingleDefaultPropertyOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNjuDlEee9bryn2mNvXA" name="className" value="DefaultPropertyOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNj-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc173X6Eeipp8d5W3Vl9g" name="className" value="DefaultPropertyOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc18HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNkODlEee9bryn2mNvXA" name="Single AbstractLayer" sections="_7WhgcODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0eODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNkeDlEee9bryn2mNvXA" name="isSingleAbstractLayer">
+  <views xmi:id="_umc18XX6Eeipp8d5W3Vl9g" name="Single AbstractLayer" sections="_ZizAFXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4M3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc18nX6Eeipp8d5W3Vl9g" name="isSingleAbstractLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNkuDlEee9bryn2mNvXA" name="className" value="AbstractLayer"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNk-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc183X6Eeipp8d5W3Vl9g" name="className" value="AbstractLayer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc19HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNlODlEee9bryn2mNvXA" name="Single StringToTypeInstanceMap" sections="_7WhgceDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0fuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNleDlEee9bryn2mNvXA" name="isSingleStringToTypeInstanceMap">
+  <views xmi:id="_umc19XX6Eeipp8d5W3Vl9g" name="Single StringToTypeInstanceMap" sections="_ZizAFnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4OXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc19nX6Eeipp8d5W3Vl9g" name="isSingleStringToTypeInstanceMap">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNluDlEee9bryn2mNvXA" name="className" value="StringToTypeInstanceMap"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNl-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc193X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1-HX6Eeipp8d5W3Vl9g" name="className" value="StringToTypeInstanceMap"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNmODlEee9bryn2mNvXA" name="Single Folder" sections="_7WhgcuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0geDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNmeDlEee9bryn2mNvXA" name="isSingleFolder">
+  <views xmi:id="_umc1-XX6Eeipp8d5W3Vl9g" name="Single Folder" sections="_ZizAF3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4PHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1-nX6Eeipp8d5W3Vl9g" name="isSingleFolder">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNmuDlEee9bryn2mNvXA" name="className" value="Folder"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNm-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1-3X6Eeipp8d5W3Vl9g" name="className" value="Folder"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1_HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNnODlEee9bryn2mNvXA" name="Single IntInstance" sections="_7Whgc-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0hODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNneDlEee9bryn2mNvXA" name="isSingleIntInstance">
+  <views xmi:id="_umc1_XX6Eeipp8d5W3Vl9g" name="Single IntInstance" sections="_ZizAGHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4P3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc1_nX6Eeipp8d5W3Vl9g" name="isSingleIntInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNnuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNn-DlEee9bryn2mNvXA" name="className" value="IntInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc1_3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2AHX6Eeipp8d5W3Vl9g" name="className" value="IntInstance"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNoODlEee9bryn2mNvXA" name="Single BooleanInstance" sections="_7WhgdODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0huDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNoeDlEee9bryn2mNvXA" name="isSingleBooleanInstance">
+  <views xmi:id="_umc2AXX6Eeipp8d5W3Vl9g" name="Single BooleanInstance" sections="_ZizAGXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4QXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2AnX6Eeipp8d5W3Vl9g" name="isSingleBooleanInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNouDlEee9bryn2mNvXA" name="className" value="BooleanInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNo-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2A3X6Eeipp8d5W3Vl9g" name="className" value="BooleanInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2BHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNpODlEee9bryn2mNvXA" name="Single StringInstance" sections="_7WhgdeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0iODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNpeDlEee9bryn2mNvXA" name="isSingleStringInstance">
+  <views xmi:id="_umc2BXX6Eeipp8d5W3Vl9g" name="Single StringInstance" sections="_ZizAGnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4Q3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2BnX6Eeipp8d5W3Vl9g" name="isSingleStringInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNpuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNp-DlEee9bryn2mNvXA" name="className" value="StringInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2B3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2CHX6Eeipp8d5W3Vl9g" name="className" value="StringInstance"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNqODlEee9bryn2mNvXA" name="Single IntType" sections="_7WhgduDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0iuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNqeDlEee9bryn2mNvXA" name="isSingleIntType">
+  <views xmi:id="_umc2CXX6Eeipp8d5W3Vl9g" name="Single IntType" sections="_ZizAG3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4RXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2CnX6Eeipp8d5W3Vl9g" name="isSingleIntType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNquDlEee9bryn2mNvXA" name="className" value="IntType"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNq-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2C3X6Eeipp8d5W3Vl9g" name="className" value="IntType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2DHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNrODlEee9bryn2mNvXA" name="Single BooleanType" sections="_7WiHgODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0i-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNreDlEee9bryn2mNvXA" name="isSingleBooleanType">
+  <views xmi:id="_umc2DXX6Eeipp8d5W3Vl9g" name="Single BooleanType" sections="_ZizAHHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4RnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2DnX6Eeipp8d5W3Vl9g" name="isSingleBooleanType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNruDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNr-DlEee9bryn2mNvXA" name="className" value="BooleanType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2D3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2EHX6Eeipp8d5W3Vl9g" name="className" value="BooleanType"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNsODlEee9bryn2mNvXA" name="Single StringType" sections="_7WiHgeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0jODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNseDlEee9bryn2mNvXA" name="isSingleStringType">
+  <views xmi:id="_umc2EXX6Eeipp8d5W3Vl9g" name="Single StringType" sections="_ZizAHXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4R3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2EnX6Eeipp8d5W3Vl9g" name="isSingleStringType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNsuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNs-DlEee9bryn2mNvXA" name="className" value="StringType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2E3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2FHX6Eeipp8d5W3Vl9g" name="className" value="StringType"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNtODlEee9bryn2mNvXA" name="Single CustomType" sections="_7WiHguDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0jeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNteDlEee9bryn2mNvXA" name="isSingleCustomType">
+  <views xmi:id="_umc2FXX6Eeipp8d5W3Vl9g" name="Single CustomType" sections="_ZizAHnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4SHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2FnX6Eeipp8d5W3Vl9g" name="isSingleCustomType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNtuDlEee9bryn2mNvXA" name="className" value="CustomType"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNt-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2F3X6Eeipp8d5W3Vl9g" name="className" value="CustomType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2GHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNuODlEee9bryn2mNvXA" name="Single TopLayerOperator" sections="_7WiHg-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0j-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNueDlEee9bryn2mNvXA" name="isSingleTopLayerOperator">
+  <views xmi:id="_umc2GXX6Eeipp8d5W3Vl9g" name="Single TopLayerOperator" sections="_ZiznIHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4SnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2GnX6Eeipp8d5W3Vl9g" name="isSingleTopLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNuuDlEee9bryn2mNvXA" name="className" value="TopLayerOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNu-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2G3X6Eeipp8d5W3Vl9g" name="className" value="TopLayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2HHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNvODlEee9bryn2mNvXA" name="Single StackedLayerOperator" sections="_7WiukODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0kODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNveDlEee9bryn2mNvXA" name="isSingleStackedLayerOperator">
+  <views xmi:id="_umc2HXX6Eeipp8d5W3Vl9g" name="Single StackedLayerOperator" sections="_ZiznIXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4S3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2HnX6Eeipp8d5W3Vl9g" name="isSingleStackedLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNvuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNv-DlEee9bryn2mNvXA" name="className" value="StackedLayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2H3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2IHX6Eeipp8d5W3Vl9g" name="className" value="StackedLayerOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNwODlEee9bryn2mNvXA" name="Single CustomLayerOperator" sections="_7WiukeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0keDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNweDlEee9bryn2mNvXA" name="isSingleCustomLayerOperator">
+  <views xmi:id="_umc2IXX6Eeipp8d5W3Vl9g" name="Single CustomLayerOperator" sections="_ZiznInX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4THX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2InX6Eeipp8d5W3Vl9g" name="isSingleCustomLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNwuDlEee9bryn2mNvXA" name="className" value="CustomLayerOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNw-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2I3X6Eeipp8d5W3Vl9g" name="className" value="CustomLayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2JHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNxODlEee9bryn2mNvXA" name="Single PropertyIndex" sections="_7WiukuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0kuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNxeDlEee9bryn2mNvXA" name="isSinglePropertyIndex">
+  <views xmi:id="_umc2JXX6Eeipp8d5W3Vl9g" name="Single PropertyIndex" sections="_ZiznI3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4TXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2JnX6Eeipp8d5W3Vl9g" name="isSinglePropertyIndex">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNxuDlEee9bryn2mNvXA" name="className" value="PropertyIndex"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNx-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2J3X6Eeipp8d5W3Vl9g" name="className" value="PropertyIndex"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2KHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNyODlEee9bryn2mNvXA" name="Single StringToPropertyIndexMap" sections="_7Wiuk-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0leDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNyeDlEee9bryn2mNvXA" name="isSingleStringToPropertyIndexMap">
+  <views xmi:id="_umc2KXX6Eeipp8d5W3Vl9g" name="Single StringToPropertyIndexMap" sections="_ZiznJHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4UHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2KnX6Eeipp8d5W3Vl9g" name="isSingleStringToPropertyIndexMap">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNyuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNy-DlEee9bryn2mNvXA" name="className" value="StringToPropertyIndexMap"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2K3X6Eeipp8d5W3Vl9g" name="className" value="StringToPropertyIndexMap"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2LHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvNzODlEee9bryn2mNvXA" name="Single SimpleLayerDescriptor" sections="_7WiulODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0mODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvNzeDlEee9bryn2mNvXA" name="isSingleSimpleLayerDescriptor">
+  <views xmi:id="_umc2LXX6Eeipp8d5W3Vl9g" name="Single SimpleLayerDescriptor" sections="_ZiznJXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4U3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2LnX6Eeipp8d5W3Vl9g" name="isSingleSimpleLayerDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNzuDlEee9bryn2mNvXA" name="className" value="SimpleLayerDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvNz-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2L3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2MHX6Eeipp8d5W3Vl9g" name="className" value="SimpleLayerDescriptor"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN0ODlEee9bryn2mNvXA" name="Single RegExpLayerDescriptor" sections="_7WiuleDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0meDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN0eDlEee9bryn2mNvXA" name="isSingleRegExpLayerDescriptor">
+  <views xmi:id="_umc2MXX6Eeipp8d5W3Vl9g" name="Single RegExpLayerDescriptor" sections="_ZiznJnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4VHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2MnX6Eeipp8d5W3Vl9g" name="isSingleRegExpLayerDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN0uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN0-DlEee9bryn2mNvXA" name="className" value="RegExpLayerDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2M3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2NHX6Eeipp8d5W3Vl9g" name="className" value="RegExpLayerDescriptor"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN1ODlEee9bryn2mNvXA" name="Single NullInstance" sections="_7WjVoODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0muDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN1eDlEee9bryn2mNvXA" name="isSingleNullInstance">
+  <views xmi:id="_umc2NXX6Eeipp8d5W3Vl9g" name="Single NullInstance" sections="_ZiznJ3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4VXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2NnX6Eeipp8d5W3Vl9g" name="isSingleNullInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN1uDlEee9bryn2mNvXA" name="className" value="NullInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN1-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2N3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2OHX6Eeipp8d5W3Vl9g" name="className" value="NullInstance"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN2ODlEee9bryn2mNvXA" name="Single RegExpLayer" sections="_7WjVoeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0m-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN2eDlEee9bryn2mNvXA" name="isSingleRegExpLayer">
+  <views xmi:id="_umc2OXX6Eeipp8d5W3Vl9g" name="Single RegExpLayer" sections="_ZiznKHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4VnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2OnX6Eeipp8d5W3Vl9g" name="isSingleRegExpLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN2uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN2-DlEee9bryn2mNvXA" name="className" value="RegExpLayer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2O3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2PHX6Eeipp8d5W3Vl9g" name="className" value="RegExpLayer"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN3ODlEee9bryn2mNvXA" name="Single Layer" sections="_7WjVouDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0o-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN3eDlEee9bryn2mNvXA" name="isSingleLayer">
+  <views xmi:id="_umc2PXX6Eeipp8d5W3Vl9g" name="Single Layer" sections="_ZiznKXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4XnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2PnX6Eeipp8d5W3Vl9g" name="isSingleLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN3uDlEee9bryn2mNvXA" name="className" value="Layer"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN3-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2P3X6Eeipp8d5W3Vl9g" name="className" value="Layer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2QHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN4ODlEee9bryn2mNvXA" name="Single Color" sections="_7Wj8sODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0pODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN4eDlEee9bryn2mNvXA" name="isSingleColor">
+  <views xmi:id="_umc2QXX6Eeipp8d5W3Vl9g" name="Single Color" sections="_ZiznKnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4X3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2QnX6Eeipp8d5W3Vl9g" name="isSingleColor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN4uDlEee9bryn2mNvXA" name="className" value="Color"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN4-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2Q3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2RHX6Eeipp8d5W3Vl9g" name="className" value="Color"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN5ODlEee9bryn2mNvXA" name="Single ColorInstance" sections="_7Wj8seDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0peDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN5eDlEee9bryn2mNvXA" name="isSingleColorInstance">
+  <views xmi:id="_umc2RXX6Eeipp8d5W3Vl9g" name="Single ColorInstance" sections="_ZiznK3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4YHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2RnX6Eeipp8d5W3Vl9g" name="isSingleColorInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN5uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN5-DlEee9bryn2mNvXA" name="className" value="ColorInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2R3X6Eeipp8d5W3Vl9g" name="className" value="ColorInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2SHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN6ODlEee9bryn2mNvXA" name="Single FillInstance" sections="_7Wj8suDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0p-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN6eDlEee9bryn2mNvXA" name="isSingleFillInstance">
+  <views xmi:id="_umc2SXX6Eeipp8d5W3Vl9g" name="Single FillInstance" sections="_ZiznLHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4YnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2SnX6Eeipp8d5W3Vl9g" name="isSingleFillInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN6uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN6-DlEee9bryn2mNvXA" name="className" value="FillInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2S3X6Eeipp8d5W3Vl9g" name="className" value="FillInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2THX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN7ODlEee9bryn2mNvXA" name="Single Fill" sections="_7Wj8s-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0quDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN7eDlEee9bryn2mNvXA" name="isSingleFill">
+  <views xmi:id="_umc2TXX6Eeipp8d5W3Vl9g" name="Single Fill" sections="_ZiznLXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4ZXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2TnX6Eeipp8d5W3Vl9g" name="isSingleFill">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN7uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN7-DlEee9bryn2mNvXA" name="className" value="Fill"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2T3X6Eeipp8d5W3Vl9g" name="className" value="Fill"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2UHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN8ODlEee9bryn2mNvXA" name="Single FillPropertySetter" sections="_7Wj8tODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0q-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN8eDlEee9bryn2mNvXA" name="isSingleFillPropertySetter">
+  <views xmi:id="_umc2UXX6Eeipp8d5W3Vl9g" name="Single FillPropertySetter" sections="_ZiznLnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4ZnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2UnX6Eeipp8d5W3Vl9g" name="isSingleFillPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN8uDlEee9bryn2mNvXA" name="className" value="FillPropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN8-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2U3X6Eeipp8d5W3Vl9g" name="className" value="FillPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2VHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN9ODlEee9bryn2mNvXA" name="Single IsValidPropertySetter" sections="_7WkjwODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0rODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN9eDlEee9bryn2mNvXA" name="isSingleIsValidPropertySetter">
+  <views xmi:id="_umc2VXX6Eeipp8d5W3Vl9g" name="Single IsValidPropertySetter" sections="_Zi0OMHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4Z3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2VnX6Eeipp8d5W3Vl9g" name="isSingleIsValidPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN9uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN9-DlEee9bryn2mNvXA" name="className" value="IsValidPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2V3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2WHX6Eeipp8d5W3Vl9g" name="className" value="IsValidPropertySetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN-ODlEee9bryn2mNvXA" name="Single NullPropertySetter" sections="_7WkjweDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0reDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN-eDlEee9bryn2mNvXA" name="isSingleNullPropertySetter">
+  <views xmi:id="_umc2WXX6Eeipp8d5W3Vl9g" name="Single NullPropertySetter" sections="_Zi0OMXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4aHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2WnX6Eeipp8d5W3Vl9g" name="isSingleNullPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN-uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN--DlEee9bryn2mNvXA" name="className" value="NullPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2W3X6Eeipp8d5W3Vl9g" name="className" value="NullPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2XHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvN_ODlEee9bryn2mNvXA" name="Single LineType" sections="_7WlK0ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ruDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvN_eDlEee9bryn2mNvXA" name="isSingleLineType">
+  <views xmi:id="_umc2XXX6Eeipp8d5W3Vl9g" name="Single LineType" sections="_Zi0OMnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4aXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2XnX6Eeipp8d5W3Vl9g" name="isSingleLineType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN_uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvN_-DlEee9bryn2mNvXA" name="className" value="LineType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2X3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2YHX6Eeipp8d5W3Vl9g" name="className" value="LineType"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOAODlEee9bryn2mNvXA" name="Single LineInstance" sections="_7WlK0eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0r-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOAeDlEee9bryn2mNvXA" name="isSingleLineInstance">
+  <views xmi:id="_umc2YXX6Eeipp8d5W3Vl9g" name="Single LineInstance" sections="_Zi0OM3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4anX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2YnX6Eeipp8d5W3Vl9g" name="isSingleLineInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOAuDlEee9bryn2mNvXA" name="className" value="LineInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOA-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2Y3X6Eeipp8d5W3Vl9g" name="className" value="LineInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2ZHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOBODlEee9bryn2mNvXA" name="Single LinePropertySetter" sections="_7WlK0uDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0suDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOBeDlEee9bryn2mNvXA" name="isSingleLinePropertySetter">
+  <views xmi:id="_umc2ZXX6Eeipp8d5W3Vl9g" name="Single LinePropertySetter" sections="_Zi0ONHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4bXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2ZnX6Eeipp8d5W3Vl9g" name="isSingleLinePropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOBuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOB-DlEee9bryn2mNvXA" name="className" value="LinePropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2Z3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2aHX6Eeipp8d5W3Vl9g" name="className" value="LinePropertySetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOCODlEee9bryn2mNvXA" name="Single FontPropertySetter" sections="_7WlK0-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0s-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOCeDlEee9bryn2mNvXA" name="isSingleFontPropertySetter">
+  <views xmi:id="_umc2aXX6Eeipp8d5W3Vl9g" name="Single FontPropertySetter" sections="_Zi0ONXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4bnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2anX6Eeipp8d5W3Vl9g" name="isSingleFontPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOCuDlEee9bryn2mNvXA" name="className" value="FontPropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOC-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2a3X6Eeipp8d5W3Vl9g" name="className" value="FontPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2bHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvODODlEee9bryn2mNvXA" name="Single FontInstance" sections="_7WlK1ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0tODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvODeDlEee9bryn2mNvXA" name="isSingleFontInstance">
+  <views xmi:id="_umc2bXX6Eeipp8d5W3Vl9g" name="Single FontInstance" sections="_Zi0ONnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4b3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2bnX6Eeipp8d5W3Vl9g" name="isSingleFontInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvODuDlEee9bryn2mNvXA" name="className" value="FontInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOD-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2b3X6Eeipp8d5W3Vl9g" name="className" value="FontInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2cHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOEODlEee9bryn2mNvXA" name="Single FontType" sections="_7WlK1eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ueDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOEeDlEee9bryn2mNvXA" name="isSingleFontType">
+  <views xmi:id="_umc2cXX6Eeipp8d5W3Vl9g" name="Single FontType" sections="_Zi0ON3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4dHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2cnX6Eeipp8d5W3Vl9g" name="isSingleFontType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOEuDlEee9bryn2mNvXA" name="className" value="FontType"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOE-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2c3X6Eeipp8d5W3Vl9g" name="className" value="FontType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2dHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOFODlEee9bryn2mNvXA" name="Single IsVisiblePropertySetter" sections="_7Wlx4ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0uuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOFeDlEee9bryn2mNvXA" name="isSingleIsVisiblePropertySetter">
+  <views xmi:id="_umc2dXX6Eeipp8d5W3Vl9g" name="Single IsVisiblePropertySetter" sections="_Zi0OOHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4dXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2dnX6Eeipp8d5W3Vl9g" name="isSingleIsVisiblePropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOFuDlEee9bryn2mNvXA" name="className" value="IsVisiblePropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOF-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2d3X6Eeipp8d5W3Vl9g" name="className" value="IsVisiblePropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2eHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOGODlEee9bryn2mNvXA" name="Single TopLayerOperatorDescriptor" sections="_7Wlx4eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0u-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOGeDlEee9bryn2mNvXA" name="isSingleTopLayerOperatorDescriptor">
+  <views xmi:id="_umc2eXX6Eeipp8d5W3Vl9g" name="Single TopLayerOperatorDescriptor" sections="_Zi0OOXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4dnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2enX6Eeipp8d5W3Vl9g" name="isSingleTopLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOGuDlEee9bryn2mNvXA" name="className" value="TopLayerOperatorDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOG-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2e3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2fHX6Eeipp8d5W3Vl9g" name="className" value="TopLayerOperatorDescriptor"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOHODlEee9bryn2mNvXA" name="Single StackedLayerOperatorDescriptor" sections="_7Wlx4uDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0vODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOHeDlEee9bryn2mNvXA" name="isSingleStackedLayerOperatorDescriptor">
+  <views xmi:id="_umc2fXX6Eeipp8d5W3Vl9g" name="Single StackedLayerOperatorDescriptor" sections="_Zi0OOnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4d3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2fnX6Eeipp8d5W3Vl9g" name="isSingleStackedLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOHuDlEee9bryn2mNvXA" name="className" value="StackedLayerOperatorDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOH-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2f3X6Eeipp8d5W3Vl9g" name="className" value="StackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2gHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOIODlEee9bryn2mNvXA" name="Single CustomPropertyOperator" sections="_7Wlx4-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0veDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOIeDlEee9bryn2mNvXA" name="isSingleCustomPropertyOperator">
+  <views xmi:id="_umc2gXX6Eeipp8d5W3Vl9g" name="Single CustomPropertyOperator" sections="_Zi0OO3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4eHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2gnX6Eeipp8d5W3Vl9g" name="isSingleCustomPropertyOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOIuDlEee9bryn2mNvXA" name="className" value="CustomPropertyOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOI-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2g3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2hHX6Eeipp8d5W3Vl9g" name="className" value="CustomPropertyOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOJODlEee9bryn2mNvXA" name="Single AndStackedLayerOperatorDescriptor" sections="_7Wlx5ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0weDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOJeDlEee9bryn2mNvXA" name="isSingleAndStackedLayerOperatorDescriptor">
+  <views xmi:id="_umc2hXX6Eeipp8d5W3Vl9g" name="Single AndStackedLayerOperatorDescriptor" sections="_Zi0OPHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4fHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2hnX6Eeipp8d5W3Vl9g" name="isSingleAndStackedLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOJuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOJ-DlEee9bryn2mNvXA" name="className" value="AndStackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2h3X6Eeipp8d5W3Vl9g" name="className" value="AndStackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2iHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOKODlEee9bryn2mNvXA" name="Single OrStackedLayerOperatorDescriptor" sections="_7WmY8ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0wuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOKeDlEee9bryn2mNvXA" name="isSingleOrStackedLayerOperatorDescriptor">
+  <views xmi:id="_umc2iXX6Eeipp8d5W3Vl9g" name="Single OrStackedLayerOperatorDescriptor" sections="_Zi0OPXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4fXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2inX6Eeipp8d5W3Vl9g" name="isSingleOrStackedLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOKuDlEee9bryn2mNvXA" name="className" value="OrStackedLayerOperatorDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOK-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2i3X6Eeipp8d5W3Vl9g" name="className" value="OrStackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2jHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOLODlEee9bryn2mNvXA" name="Single IsAbstractUmlSetter" sections="_7WmY8eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0w-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOLeDlEee9bryn2mNvXA" name="isSingleIsAbstractUmlSetter">
+  <views xmi:id="_umc2jXX6Eeipp8d5W3Vl9g" name="Single IsAbstractUmlSetter" sections="_Zi0OPnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4fnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2jnX6Eeipp8d5W3Vl9g" name="isSingleIsAbstractUmlSetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOLuDlEee9bryn2mNvXA" name="className" value="IsAbstractUmlSetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOL-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2j3X6Eeipp8d5W3Vl9g" name="className" value="IsAbstractUmlSetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2kHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOMODlEee9bryn2mNvXA" name="Single AllViewsDerivedLayer" sections="_7WmY8uDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0xODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOMeDlEee9bryn2mNvXA" name="isSingleAllViewsDerivedLayer">
+  <views xmi:id="_umc2kXX6Eeipp8d5W3Vl9g" name="Single AllViewsDerivedLayer" sections="_Zi0OP3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4f3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2knX6Eeipp8d5W3Vl9g" name="isSingleAllViewsDerivedLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOMuDlEee9bryn2mNvXA" name="className" value="AllViewsDerivedLayer"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOM-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2k3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2lHX6Eeipp8d5W3Vl9g" name="className" value="AllViewsDerivedLayer"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvONODlEee9bryn2mNvXA" name="Single CSSPropertySetter" sections="_7WnAAODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0xeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvONeDlEee9bryn2mNvXA" name="isSingleCSSPropertySetter">
+  <views xmi:id="_umc2lXX6Eeipp8d5W3Vl9g" name="Single CSSPropertySetter" sections="_Zi0OQHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4gHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2lnX6Eeipp8d5W3Vl9g" name="isSingleCSSPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvONuDlEee9bryn2mNvXA" name="className" value="CSSPropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvON-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2l3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2mHX6Eeipp8d5W3Vl9g" name="className" value="CSSPropertySetter"/>
+    </constraints>
+  </views>
+  <views xmi:id="_umc2mXX6Eeipp8d5W3Vl9g" name="Single CSSType" sections="_Zi0OQXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4gXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2mnX6Eeipp8d5W3Vl9g" name="isSingleCSSType">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2m3X6Eeipp8d5W3Vl9g" name="className" value="CSSType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2nHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+    </constraints>
+  </views>
+  <views xmi:id="_umc2nXX6Eeipp8d5W3Vl9g" name="Single CSSInstance" sections="_Zi01QHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4gnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2nnX6Eeipp8d5W3Vl9g" name="isSingleCSSInstance">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2n3X6Eeipp8d5W3Vl9g" name="className" value="CSSInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2oHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+    </constraints>
+  </views>
+  <views xmi:id="_umc2oXX6Eeipp8d5W3Vl9g" name="Single CSSHidePropertySetter" sections="_Zi01QXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4hXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2onX6Eeipp8d5W3Vl9g" name="isSingleCSSHidePropertySetter">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2o3X6Eeipp8d5W3Vl9g" name="className" value="CSSHidePropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2pHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+    </constraints>
+  </views>
+  <views xmi:id="_umc2pXX6Eeipp8d5W3Vl9g" name="Single CSSHideType" sections="_Zi01QnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4hnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2pnX6Eeipp8d5W3Vl9g" name="isSingleCSSHideType">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2p3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2qHX6Eeipp8d5W3Vl9g" name="className" value="CSSHideType"/>
+    </constraints>
+  </views>
+  <views xmi:id="_umc2qXX6Eeipp8d5W3Vl9g" name="Single CSSHideInstance" sections="_Zi01Q3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4h3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2qnX6Eeipp8d5W3Vl9g" name="isSingleCSSHideInstance">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2q3X6Eeipp8d5W3Vl9g" name="className" value="CSSHideInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2rHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+    </constraints>
+  </views>
+  <views xmi:id="_umc2rXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerNamedStyle" sections="_Zi01RHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc32nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2rnX6Eeipp8d5W3Vl9g" name="isMultipleLayerNamedStyle">
+      <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2r3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2sHX6Eeipp8d5W3Vl9g" name="className" value="LayerNamedStyle"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOOODlEee9bryn2mNvXA" name="Single CSSType" sections="_7WnAAeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0xuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOOeDlEee9bryn2mNvXA" name="isSingleCSSType">
+  <views xmi:id="_umc2sXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayersStack" sections="_Zi01RXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc33HX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2snX6Eeipp8d5W3Vl9g" name="isMultipleLayersStack">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOOuDlEee9bryn2mNvXA" name="className" value="CSSType"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOO-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2s3X6Eeipp8d5W3Vl9g" name="className" value="LayersStack"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2tHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOPODlEee9bryn2mNvXA" name="Single CSSInstance" sections="_7WnAAuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0x-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOPeDlEee9bryn2mNvXA" name="isSingleCSSInstance">
+  <views xmi:id="_umc2tXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerExpression" sections="_Zi01RnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc34nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2tnX6Eeipp8d5W3Vl9g" name="isMultipleLayerExpression">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOPuDlEee9bryn2mNvXA" name="className" value="CSSInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOP-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2t3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2uHX6Eeipp8d5W3Vl9g" name="className" value="LayerExpression"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOQODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerNamedStyle" sections="_7WnAA-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPYeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOQeDlEee9bryn2mNvXA" name="isMultipleLayerNamedStyle">
+  <views xmi:id="_umc2uXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple ApplicationDependantElement" sections="_Zi01R3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc36nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2unX6Eeipp8d5W3Vl9g" name="isMultipleApplicationDependantElement">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOQuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOQ-DlEee9bryn2mNvXA" name="className" value="LayerNamedStyle"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2u3X6Eeipp8d5W3Vl9g" name="className" value="ApplicationDependantElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2vHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvORODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayersStack" sections="_7WnABODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPY-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOReDlEee9bryn2mNvXA" name="isMultipleLayersStack">
+  <views xmi:id="_umc2vXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayersStackApplication" sections="_Zi01SHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc37HX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2vnX6Eeipp8d5W3Vl9g" name="isMultipleLayersStackApplication">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvORuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOR-DlEee9bryn2mNvXA" name="className" value="LayersStack"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2v3X6Eeipp8d5W3Vl9g" name="className" value="LayersStackApplication"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2wHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOSODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerExpression" sections="_7WnnEODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPaeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOSeDlEee9bryn2mNvXA" name="isMultipleLayerExpression">
+  <views xmi:id="_umc2wXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple FolderElement" sections="_Zi01SXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc39HX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2wnX6Eeipp8d5W3Vl9g" name="isMultipleFolderElement">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOSuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOS-DlEee9bryn2mNvXA" name="className" value="LayerExpression"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2w3X6Eeipp8d5W3Vl9g" name="className" value="FolderElement"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2xHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOTODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple ApplicationDependantElement" sections="_7WnnEeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fvPceDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOTeDlEee9bryn2mNvXA" name="isMultipleApplicationDependantElement">
+  <views xmi:id="_umc2xXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerStackDescriptorRegistry" sections="_Zi01SnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc39XX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2xnX6Eeipp8d5W3Vl9g" name="isMultipleLayerStackDescriptorRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOTuDlEee9bryn2mNvXA" name="className" value="ApplicationDependantElement"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOT-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2x3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2yHX6Eeipp8d5W3Vl9g" name="className" value="LayerStackDescriptorRegistry"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOUODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayersStackApplication" sections="_7WnnEuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0MeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOUeDlEee9bryn2mNvXA" name="isMultipleLayersStackApplication">
+  <views xmi:id="_umc2yXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple PropertyRegistry" sections="_Zi01S3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc39nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2ynX6Eeipp8d5W3Vl9g" name="isMultiplePropertyRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOUuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOU-DlEee9bryn2mNvXA" name="className" value="LayersStackApplication"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2y3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2zHX6Eeipp8d5W3Vl9g" name="className" value="PropertyRegistry"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOVODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple FolderElement" sections="_7WnnE-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0OeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOVeDlEee9bryn2mNvXA" name="isMultipleFolderElement">
+  <views xmi:id="_umc2zXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple Property" sections="_Zi01THX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc3-nX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2znX6Eeipp8d5W3Vl9g" name="isMultipleProperty">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOVuDlEee9bryn2mNvXA" name="className" value="FolderElement"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOV-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2z3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc20HX6Eeipp8d5W3Vl9g" name="className" value="Property"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOWODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerStackDescriptorRegistry" sections="_7WnnFODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0OuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOWeDlEee9bryn2mNvXA" name="isMultipleLayerStackDescriptorRegistry">
+  <views xmi:id="_umc20XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple Type" sections="_Zi01TXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4AHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc20nX6Eeipp8d5W3Vl9g" name="isMultipleType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOWuDlEee9bryn2mNvXA" name="className" value="LayerStackDescriptorRegistry"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOW-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc203X6Eeipp8d5W3Vl9g" name="className" value="Type"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc21HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOXODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple PropertyRegistry" sections="_7WnnFeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0O-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOXeDlEee9bryn2mNvXA" name="isMultiplePropertyRegistry">
+  <views xmi:id="_umc21XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple Metamodel" sections="_Zi01TnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4BHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc21nX6Eeipp8d5W3Vl9g" name="isMultipleMetamodel">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOXuDlEee9bryn2mNvXA" name="className" value="PropertyRegistry"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOX-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc213X6Eeipp8d5W3Vl9g" name="className" value="Metamodel"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc22HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOYODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple Property" sections="_7WnnFuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0P-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOYeDlEee9bryn2mNvXA" name="isMultipleProperty">
+  <views xmi:id="_umc22XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple TypeInstance" sections="_Zi01T3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4C3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc22nX6Eeipp8d5W3Vl9g" name="isMultipleTypeInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOYuDlEee9bryn2mNvXA" name="className" value="Property"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOY-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc223X6Eeipp8d5W3Vl9g" name="className" value="TypeInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc23HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOZODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple Type" sections="_7WoOIODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ReDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOZeDlEee9bryn2mNvXA" name="isMultipleType">
+  <views xmi:id="_umc23XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple ComputePropertyValueCommandItf" sections="_Zi01UHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4DHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc23nX6Eeipp8d5W3Vl9g" name="isMultipleComputePropertyValueCommandItf">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOZuDlEee9bryn2mNvXA" name="className" value="Type"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOZ-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc233X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc24HX6Eeipp8d5W3Vl9g" name="className" value="ComputePropertyValueCommandItf"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOaODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple Metamodel" sections="_7WoOIeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0SeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOaeDlEee9bryn2mNvXA" name="isMultipleMetamodel">
+  <views xmi:id="_umc24XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple TypeRegistry" sections="_Zi1cUHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4DXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc24nX6Eeipp8d5W3Vl9g" name="isMultipleTypeRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOauDlEee9bryn2mNvXA" name="className" value="Metamodel"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOa-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc243X6Eeipp8d5W3Vl9g" name="className" value="TypeRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc25HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvObODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple TypeInstance" sections="_7WoOIuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0UODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvObeDlEee9bryn2mNvXA" name="isMultipleTypeInstance">
+  <views xmi:id="_umc25XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StringToTypeMap" sections="_Zi1cUXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4D3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc25nX6Eeipp8d5W3Vl9g" name="isMultipleStringToTypeMap">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvObuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOb-DlEee9bryn2mNvXA" name="className" value="TypeInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc253X6Eeipp8d5W3Vl9g" name="className" value="StringToTypeMap"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc26HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOcODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple ComputePropertyValueCommandItf" sections="_7WoOI-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0UeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOceDlEee9bryn2mNvXA" name="isMultipleComputePropertyValueCommandItf">
+  <views xmi:id="_umc26XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerDescriptorRegistry" sections="_Zi1cUnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4EnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc26nX6Eeipp8d5W3Vl9g" name="isMultipleLayerDescriptorRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOcuDlEee9bryn2mNvXA" name="className" value="ComputePropertyValueCommandItf"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOc-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc263X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc27HX6Eeipp8d5W3Vl9g" name="className" value="LayerDescriptorRegistry"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOdODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple TypeRegistry" sections="_7WoOJODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0UuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOdeDlEee9bryn2mNvXA" name="isMultipleTypeRegistry">
+  <views xmi:id="_umc27XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerDescriptor" sections="_Zi1cU3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4FHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc27nX6Eeipp8d5W3Vl9g" name="isMultipleLayerDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOduDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOd-DlEee9bryn2mNvXA" name="className" value="TypeRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc273X6Eeipp8d5W3Vl9g" name="className" value="LayerDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc28HX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOeODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StringToTypeMap" sections="_7Wo1MODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0VODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOeeDlEee9bryn2mNvXA" name="isMultipleStringToTypeMap">
+  <views xmi:id="_umc28XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerApplicationFactory" sections="_Zi1cVHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4FnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc28nX6Eeipp8d5W3Vl9g" name="isMultipleLayerApplicationFactory">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOeuDlEee9bryn2mNvXA" name="className" value="StringToTypeMap"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOe-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc283X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc29HX6Eeipp8d5W3Vl9g" name="className" value="LayerApplicationFactory"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOfODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerDescriptorRegistry" sections="_7WpcQODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0V-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOfeDlEee9bryn2mNvXA" name="isMultipleLayerDescriptorRegistry">
+  <views xmi:id="_umc29XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple PropertySetterRegistry" sections="_Zi1cVXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4GHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc29nX6Eeipp8d5W3Vl9g" name="isMultiplePropertySetterRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOfuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOf-DlEee9bryn2mNvXA" name="className" value="LayerDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc293X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2-HX6Eeipp8d5W3Vl9g" name="className" value="PropertySetterRegistry"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOgODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerDescriptor" sections="_7WqDUODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0WeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOgeDlEee9bryn2mNvXA" name="isMultipleLayerDescriptor">
+  <views xmi:id="_umc2-XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple PropertySetter" sections="_Zi1cVnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4HHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2-nX6Eeipp8d5W3Vl9g" name="isMultiplePropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOguDlEee9bryn2mNvXA" name="className" value="LayerDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOg-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2-3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2_HX6Eeipp8d5W3Vl9g" name="className" value="PropertySetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOhODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerApplicationFactory" sections="_7WtGoODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0W-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOheDlEee9bryn2mNvXA" name="isMultipleLayerApplicationFactory">
+  <views xmi:id="_umc2_XX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StringToPropertySetter" sections="_Zi1cV3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4H3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc2_nX6Eeipp8d5W3Vl9g" name="isMultipleStringToPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOhuDlEee9bryn2mNvXA" name="className" value="LayerApplicationFactory"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOh-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc2_3X6Eeipp8d5W3Vl9g" name="className" value="StringToPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3AHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOiODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple PropertySetterRegistry" sections="_7WtGoeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0XeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOieDlEee9bryn2mNvXA" name="isMultiplePropertySetterRegistry">
+  <views xmi:id="_umc3AXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerOperatorDescriptorRegistry" sections="_Zi1cWHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4InX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3AnX6Eeipp8d5W3Vl9g" name="isMultipleLayerOperatorDescriptorRegistry">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOiuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOi-DlEee9bryn2mNvXA" name="className" value="PropertySetterRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3A3X6Eeipp8d5W3Vl9g" name="className" value="LayerOperatorDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3BHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOjODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple PropertySetter" sections="_7WtGouDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0YeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOjeDlEee9bryn2mNvXA" name="isMultiplePropertySetter">
+  <views xmi:id="_umc3BXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerOperatorDescriptor" sections="_Zi1cWXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4J3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3BnX6Eeipp8d5W3Vl9g" name="isMultipleLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOjuDlEee9bryn2mNvXA" name="className" value="PropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOj-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3B3X6Eeipp8d5W3Vl9g" name="className" value="LayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3CHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOkODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StringToPropertySetter" sections="_7WtGo-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ZODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOkeDlEee9bryn2mNvXA" name="isMultipleStringToPropertySetter">
+  <views xmi:id="_umc3CXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple PropertyOperator" sections="_Zi1cWnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4KnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3CnX6Eeipp8d5W3Vl9g" name="isMultiplePropertyOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOkuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOk-DlEee9bryn2mNvXA" name="className" value="StringToPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3C3X6Eeipp8d5W3Vl9g" name="className" value="PropertyOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3DHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOlODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerOperatorDescriptorRegistry" sections="_7WttsODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0Z-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOleDlEee9bryn2mNvXA" name="isMultipleLayerOperatorDescriptorRegistry">
+  <views xmi:id="_umc3DXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple AbstractLayerOperator" sections="_Zi1cW3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4LHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3DnX6Eeipp8d5W3Vl9g" name="isMultipleAbstractLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOluDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOl-DlEee9bryn2mNvXA" name="className" value="LayerOperatorDescriptorRegistry"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3D3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3EHX6Eeipp8d5W3Vl9g" name="className" value="AbstractLayerOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOmODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerOperatorDescriptor" sections="_7WttseDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0bODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOmeDlEee9bryn2mNvXA" name="isMultipleLayerOperatorDescriptor">
+  <views xmi:id="_umc3EXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayerOperator" sections="_Zi1cXHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4L3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3EnX6Eeipp8d5W3Vl9g" name="isMultipleLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOmuDlEee9bryn2mNvXA" name="className" value="LayerOperatorDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOm-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3E3X6Eeipp8d5W3Vl9g" name="className" value="LayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3FHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOnODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple PropertyOperator" sections="_7WuUwODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0b-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOneDlEee9bryn2mNvXA" name="isMultiplePropertyOperator">
+  <views xmi:id="_umc3FXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LayersContainer" sections="_Zi1cXXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4MXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3FnX6Eeipp8d5W3Vl9g" name="isMultipleLayersContainer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOnuDlEee9bryn2mNvXA" name="className" value="PropertyOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOn-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3F3X6Eeipp8d5W3Vl9g" name="className" value="LayersContainer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3GHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOoODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple AbstractLayerOperator" sections="_7WuUweDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ceDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOoeDlEee9bryn2mNvXA" name="isMultipleAbstractLayerOperator">
+  <views xmi:id="_umc3GXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple DefaultPropertyOperator" sections="_Zi1cXnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4MnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3GnX6Eeipp8d5W3Vl9g" name="isMultipleDefaultPropertyOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOouDlEee9bryn2mNvXA" name="className" value="AbstractLayerOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOo-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3G3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3HHX6Eeipp8d5W3Vl9g" name="className" value="DefaultPropertyOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOpODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayerOperator" sections="_7Wu70ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0dODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOpeDlEee9bryn2mNvXA" name="isMultipleLayerOperator">
+  <views xmi:id="_umc3HXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple AbstractLayer" sections="_Zi2DYHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4M3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3HnX6Eeipp8d5W3Vl9g" name="isMultipleAbstractLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOpuDlEee9bryn2mNvXA" name="className" value="LayerOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOp-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3H3X6Eeipp8d5W3Vl9g" name="className" value="AbstractLayer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3IHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOqODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LayersContainer" sections="_7Wu70eDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0duDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOqeDlEee9bryn2mNvXA" name="isMultipleLayersContainer">
+  <views xmi:id="_umc3IXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StringToTypeInstanceMap" sections="_Zi2DYXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4OXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3InX6Eeipp8d5W3Vl9g" name="isMultipleStringToTypeInstanceMap">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOquDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOq-DlEee9bryn2mNvXA" name="className" value="LayersContainer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3I3X6Eeipp8d5W3Vl9g" name="className" value="StringToTypeInstanceMap"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3JHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOrODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple DefaultPropertyOperator" sections="_7Wvi4ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0d-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOreDlEee9bryn2mNvXA" name="isMultipleDefaultPropertyOperator">
+  <views xmi:id="_umc3JXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple Folder" sections="_Zi2DYnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4PHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3JnX6Eeipp8d5W3Vl9g" name="isMultipleFolder">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOruDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOr-DlEee9bryn2mNvXA" name="className" value="DefaultPropertyOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3J3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3KHX6Eeipp8d5W3Vl9g" name="className" value="Folder"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOsODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple AbstractLayer" sections="_7WwJ8ODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0eODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOseDlEee9bryn2mNvXA" name="isMultipleAbstractLayer">
+  <views xmi:id="_umc3KXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple IntInstance" sections="_Zi2DY3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4P3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3KnX6Eeipp8d5W3Vl9g" name="isMultipleIntInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOsuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOs-DlEee9bryn2mNvXA" name="className" value="AbstractLayer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3K3X6Eeipp8d5W3Vl9g" name="className" value="IntInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3LHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOtODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StringToTypeInstanceMap" sections="_7WwxAODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0fuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOteDlEee9bryn2mNvXA" name="isMultipleStringToTypeInstanceMap">
+  <views xmi:id="_umc3LXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple BooleanInstance" sections="_Zi2DZHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4QXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3LnX6Eeipp8d5W3Vl9g" name="isMultipleBooleanInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOtuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOt-DlEee9bryn2mNvXA" name="className" value="StringToTypeInstanceMap"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3L3X6Eeipp8d5W3Vl9g" name="className" value="BooleanInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3MHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOuODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple Folder" sections="_7WwxAeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0geDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOueDlEee9bryn2mNvXA" name="isMultipleFolder">
+  <views xmi:id="_umc3MXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StringInstance" sections="_Zi2DZXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4Q3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3MnX6Eeipp8d5W3Vl9g" name="isMultipleStringInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOuuDlEee9bryn2mNvXA" name="className" value="Folder"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOu-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3M3X6Eeipp8d5W3Vl9g" name="className" value="StringInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3NHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOvODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple IntInstance" sections="_7WwxAuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0hODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOveDlEee9bryn2mNvXA" name="isMultipleIntInstance">
+  <views xmi:id="_umc3NXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple IntType" sections="_Zi2DZnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4RXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3NnX6Eeipp8d5W3Vl9g" name="isMultipleIntType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOvuDlEee9bryn2mNvXA" name="className" value="IntInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOv-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3N3X6Eeipp8d5W3Vl9g" name="className" value="IntType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3OHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOwODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple BooleanInstance" sections="_7WwxA-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0huDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOweDlEee9bryn2mNvXA" name="isMultipleBooleanInstance">
+  <views xmi:id="_umc3OXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple BooleanType" sections="_Zi2DZ3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4RnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3OnX6Eeipp8d5W3Vl9g" name="isMultipleBooleanType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOwuDlEee9bryn2mNvXA" name="className" value="BooleanInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOw-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3O3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3PHX6Eeipp8d5W3Vl9g" name="className" value="BooleanType"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOxODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StringInstance" sections="_7WxYEODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0iODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOxeDlEee9bryn2mNvXA" name="isMultipleStringInstance">
+  <views xmi:id="_umc3PXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StringType" sections="_Zi2DaHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4R3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3PnX6Eeipp8d5W3Vl9g" name="isMultipleStringType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOxuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOx-DlEee9bryn2mNvXA" name="className" value="StringInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3P3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3QHX6Eeipp8d5W3Vl9g" name="className" value="StringType"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOyODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple IntType" sections="_7WxYEeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0iuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOyeDlEee9bryn2mNvXA" name="isMultipleIntType">
+  <views xmi:id="_umc3QXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple CustomType" sections="_Zi2DaXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4SHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3QnX6Eeipp8d5W3Vl9g" name="isMultipleCustomType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOyuDlEee9bryn2mNvXA" name="className" value="IntType"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOy-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3Q3X6Eeipp8d5W3Vl9g" name="className" value="CustomType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3RHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvOzODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple BooleanType" sections="_7WxYEuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0i-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvOzeDlEee9bryn2mNvXA" name="isMultipleBooleanType">
+  <views xmi:id="_umc3RXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple TopLayerOperator" sections="_Zi2DanX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4SnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3RnX6Eeipp8d5W3Vl9g" name="isMultipleTopLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOzuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvOz-DlEee9bryn2mNvXA" name="className" value="BooleanType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3R3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3SHX6Eeipp8d5W3Vl9g" name="className" value="TopLayerOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO0ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StringType" sections="_7WxYE-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0jODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO0eDlEee9bryn2mNvXA" name="isMultipleStringType">
+  <views xmi:id="_umc3SXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StackedLayerOperator" sections="_Zi2Da3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4S3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3SnX6Eeipp8d5W3Vl9g" name="isMultipleStackedLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO0uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO0-DlEee9bryn2mNvXA" name="className" value="StringType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3S3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3THX6Eeipp8d5W3Vl9g" name="className" value="StackedLayerOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO1ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple CustomType" sections="_7WxYFODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0jeDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO1eDlEee9bryn2mNvXA" name="isMultipleCustomType">
+  <views xmi:id="_umc3TXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple CustomLayerOperator" sections="_Zi2DbHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4THX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3TnX6Eeipp8d5W3Vl9g" name="isMultipleCustomLayerOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO1uDlEee9bryn2mNvXA" name="className" value="CustomType"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO1-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3T3X6Eeipp8d5W3Vl9g" name="className" value="CustomLayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3UHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO2ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple TopLayerOperator" sections="_7WxYFeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0j-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO2eDlEee9bryn2mNvXA" name="isMultipleTopLayerOperator">
+  <views xmi:id="_umc3UXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple PropertyIndex" sections="_Zi2DbXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4TXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3UnX6Eeipp8d5W3Vl9g" name="isMultiplePropertyIndex">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO2uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO2-DlEee9bryn2mNvXA" name="className" value="TopLayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3U3X6Eeipp8d5W3Vl9g" name="className" value="PropertyIndex"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3VHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO3ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StackedLayerOperator" sections="_7WxYFuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0kODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO3eDlEee9bryn2mNvXA" name="isMultipleStackedLayerOperator">
+  <views xmi:id="_umc3VXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StringToPropertyIndexMap" sections="_Zi2qcHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4UHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3VnX6Eeipp8d5W3Vl9g" name="isMultipleStringToPropertyIndexMap">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO3uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO3-DlEee9bryn2mNvXA" name="className" value="StackedLayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3V3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3WHX6Eeipp8d5W3Vl9g" name="className" value="StringToPropertyIndexMap"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO4ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple CustomLayerOperator" sections="_7Wx_IODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0keDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO4eDlEee9bryn2mNvXA" name="isMultipleCustomLayerOperator">
+  <views xmi:id="_umc3WXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple SimpleLayerDescriptor" sections="_Zi2qcXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4U3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3WnX6Eeipp8d5W3Vl9g" name="isMultipleSimpleLayerDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO4uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO4-DlEee9bryn2mNvXA" name="className" value="CustomLayerOperator"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3W3X6Eeipp8d5W3Vl9g" name="className" value="SimpleLayerDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3XHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO5ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple PropertyIndex" sections="_7Wx_IeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0kuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO5eDlEee9bryn2mNvXA" name="isMultiplePropertyIndex">
+  <views xmi:id="_umc3XXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple RegExpLayerDescriptor" sections="_Zi2qcnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4VHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3XnX6Eeipp8d5W3Vl9g" name="isMultipleRegExpLayerDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO5uDlEee9bryn2mNvXA" name="className" value="PropertyIndex"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO5-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3X3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3YHX6Eeipp8d5W3Vl9g" name="className" value="RegExpLayerDescriptor"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO6ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StringToPropertyIndexMap" sections="_7Wx_IuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0leDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO6eDlEee9bryn2mNvXA" name="isMultipleStringToPropertyIndexMap">
+  <views xmi:id="_umc3YXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple NullInstance" sections="_Zi2qc3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4VXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3YnX6Eeipp8d5W3Vl9g" name="isMultipleNullInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO6uDlEee9bryn2mNvXA" name="className" value="StringToPropertyIndexMap"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO6-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3Y3X6Eeipp8d5W3Vl9g" name="className" value="NullInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3ZHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO7ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple SimpleLayerDescriptor" sections="_7Wx_I-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0mODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO7eDlEee9bryn2mNvXA" name="isMultipleSimpleLayerDescriptor">
+  <views xmi:id="_umc3ZXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple RegExpLayer" sections="_Zi2qdHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4VnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3ZnX6Eeipp8d5W3Vl9g" name="isMultipleRegExpLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO7uDlEee9bryn2mNvXA" name="className" value="SimpleLayerDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO7-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3Z3X6Eeipp8d5W3Vl9g" name="className" value="RegExpLayer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3aHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO8ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple RegExpLayerDescriptor" sections="_7Wx_JODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0meDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO8eDlEee9bryn2mNvXA" name="isMultipleRegExpLayerDescriptor">
+  <views xmi:id="_umc3aXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple Layer" sections="_ZjCQoHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4XnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3anX6Eeipp8d5W3Vl9g" name="isMultipleLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO8uDlEee9bryn2mNvXA" name="className" value="RegExpLayerDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO8-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3a3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3bHX6Eeipp8d5W3Vl9g" name="className" value="Layer"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO9ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple NullInstance" sections="_7Wx_JeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0muDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO9eDlEee9bryn2mNvXA" name="isMultipleNullInstance">
+  <views xmi:id="_umc3bXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple Color" sections="_ZjCQoXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4X3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3bnX6Eeipp8d5W3Vl9g" name="isMultipleColor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO9uDlEee9bryn2mNvXA" name="className" value="NullInstance"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO9-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3b3X6Eeipp8d5W3Vl9g" name="className" value="Color"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3cHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO-ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple RegExpLayer" sections="_7Wx_JuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0m-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO-eDlEee9bryn2mNvXA" name="isMultipleRegExpLayer">
+  <views xmi:id="_umc3cXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple ColorInstance" sections="_ZjCQonX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4YHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3cnX6Eeipp8d5W3Vl9g" name="isMultipleColorInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO-uDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO--DlEee9bryn2mNvXA" name="className" value="RegExpLayer"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3c3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3dHX6Eeipp8d5W3Vl9g" name="className" value="ColorInstance"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvO_ODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple Layer" sections="_7WymMODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0o-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvO_eDlEee9bryn2mNvXA" name="isMultipleLayer">
+  <views xmi:id="_umc3dXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple FillInstance" sections="_ZjCQo3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4YnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3dnX6Eeipp8d5W3Vl9g" name="isMultipleFillInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO_uDlEee9bryn2mNvXA" name="className" value="Layer"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvO_-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3d3X6Eeipp8d5W3Vl9g" name="className" value="FillInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3eHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPAODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple Color" sections="_7WymMeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0pODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPAeDlEee9bryn2mNvXA" name="isMultipleColor">
+  <views xmi:id="_umc3eXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple Fill" sections="_ZjCQpHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4ZXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3enX6Eeipp8d5W3Vl9g" name="isMultipleFill">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPAuDlEee9bryn2mNvXA" name="className" value="Color"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPA-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3e3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3fHX6Eeipp8d5W3Vl9g" name="className" value="Fill"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPBODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple ColorInstance" sections="_7WymMuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0peDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPBeDlEee9bryn2mNvXA" name="isMultipleColorInstance">
+  <views xmi:id="_umc3fXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple FillPropertySetter" sections="_ZjCQpXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4ZnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3fnX6Eeipp8d5W3Vl9g" name="isMultipleFillPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPBuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPB-DlEee9bryn2mNvXA" name="className" value="ColorInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3f3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3gHX6Eeipp8d5W3Vl9g" name="className" value="FillPropertySetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPCODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple FillInstance" sections="_7WymM-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0p-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPCeDlEee9bryn2mNvXA" name="isMultipleFillInstance">
+  <views xmi:id="_umc3gXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple IsValidPropertySetter" sections="_ZjCQpnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4Z3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3gnX6Eeipp8d5W3Vl9g" name="isMultipleIsValidPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPCuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPC-DlEee9bryn2mNvXA" name="className" value="FillInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3g3X6Eeipp8d5W3Vl9g" name="className" value="IsValidPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3hHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPDODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple Fill" sections="_7WymNODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0quDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPDeDlEee9bryn2mNvXA" name="isMultipleFill">
+  <views xmi:id="_umc3hXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple NullPropertySetter" sections="_ZjCQp3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4aHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3hnX6Eeipp8d5W3Vl9g" name="isMultipleNullPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPDuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPD-DlEee9bryn2mNvXA" name="className" value="Fill"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3h3X6Eeipp8d5W3Vl9g" name="className" value="NullPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3iHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPEODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple FillPropertySetter" sections="_7WymNeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0q-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPEeDlEee9bryn2mNvXA" name="isMultipleFillPropertySetter">
+  <views xmi:id="_umc3iXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LineType" sections="_ZjCQqHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4aXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3inX6Eeipp8d5W3Vl9g" name="isMultipleLineType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPEuDlEee9bryn2mNvXA" name="className" value="FillPropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPE-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3i3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3jHX6Eeipp8d5W3Vl9g" name="className" value="LineType"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPFODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple IsValidPropertySetter" sections="_7WymNuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0rODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPFeDlEee9bryn2mNvXA" name="isMultipleIsValidPropertySetter">
+  <views xmi:id="_umc3jXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LineInstance" sections="_ZjCQqXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4anX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3jnX6Eeipp8d5W3Vl9g" name="isMultipleLineInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPFuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPF-DlEee9bryn2mNvXA" name="className" value="IsValidPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3j3X6Eeipp8d5W3Vl9g" name="className" value="LineInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3kHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPGODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple NullPropertySetter" sections="_7WzNQODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0reDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPGeDlEee9bryn2mNvXA" name="isMultipleNullPropertySetter">
+  <views xmi:id="_umc3kXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple LinePropertySetter" sections="_ZjCQqnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4bXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3knX6Eeipp8d5W3Vl9g" name="isMultipleLinePropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPGuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPG-DlEee9bryn2mNvXA" name="className" value="NullPropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3k3X6Eeipp8d5W3Vl9g" name="className" value="LinePropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3lHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPHODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LineType" sections="_7WzNQeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ruDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPHeDlEee9bryn2mNvXA" name="isMultipleLineType">
+  <views xmi:id="_umc3lXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple FontPropertySetter" sections="_ZjCQq3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4bnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3lnX6Eeipp8d5W3Vl9g" name="isMultipleFontPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPHuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPH-DlEee9bryn2mNvXA" name="className" value="LineType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3l3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3mHX6Eeipp8d5W3Vl9g" name="className" value="FontPropertySetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPIODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LineInstance" sections="_7WzNQuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0r-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPIeDlEee9bryn2mNvXA" name="isMultipleLineInstance">
+  <views xmi:id="_umc3mXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple FontInstance" sections="_ZjCQrHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4b3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3mnX6Eeipp8d5W3Vl9g" name="isMultipleFontInstance">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPIuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPI-DlEee9bryn2mNvXA" name="className" value="LineInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3m3X6Eeipp8d5W3Vl9g" name="className" value="FontInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3nHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPJODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple LinePropertySetter" sections="_7WzNQ-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0suDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPJeDlEee9bryn2mNvXA" name="isMultipleLinePropertySetter">
+  <views xmi:id="_umc3nXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple FontType" sections="_ZjCQrXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4dHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3nnX6Eeipp8d5W3Vl9g" name="isMultipleFontType">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPJuDlEee9bryn2mNvXA" name="className" value="LinePropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPJ-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3n3X6Eeipp8d5W3Vl9g" name="className" value="FontType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3oHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPKODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple FontPropertySetter" sections="_7WzNRODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0s-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPKeDlEee9bryn2mNvXA" name="isMultipleFontPropertySetter">
+  <views xmi:id="_umc3oXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple IsVisiblePropertySetter" sections="_ZjCQrnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4dXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3onX6Eeipp8d5W3Vl9g" name="isMultipleIsVisiblePropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPKuDlEee9bryn2mNvXA" name="className" value="FontPropertySetter"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPK-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3o3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3pHX6Eeipp8d5W3Vl9g" name="className" value="IsVisiblePropertySetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPLODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple FontInstance" sections="_7WzNReDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0tODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPLeDlEee9bryn2mNvXA" name="isMultipleFontInstance">
+  <views xmi:id="_umc3pXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple TopLayerOperatorDescriptor" sections="_ZjC3sHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4dnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3pnX6Eeipp8d5W3Vl9g" name="isMultipleTopLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPLuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPL-DlEee9bryn2mNvXA" name="className" value="FontInstance"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3p3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3qHX6Eeipp8d5W3Vl9g" name="className" value="TopLayerOperatorDescriptor"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPMODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple FontType" sections="_7WzNRuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0ueDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPMeDlEee9bryn2mNvXA" name="isMultipleFontType">
+  <views xmi:id="_umc3qXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple StackedLayerOperatorDescriptor" sections="_ZjC3sXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4d3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3qnX6Eeipp8d5W3Vl9g" name="isMultipleStackedLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPMuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPM-DlEee9bryn2mNvXA" name="className" value="FontType"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3q3X6Eeipp8d5W3Vl9g" name="className" value="StackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3rHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPNODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple IsVisiblePropertySetter" sections="_7W0bYODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0uuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPNeDlEee9bryn2mNvXA" name="isMultipleIsVisiblePropertySetter">
+  <views xmi:id="_umc3rXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple CustomPropertyOperator" sections="_ZjC3snX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4eHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3rnX6Eeipp8d5W3Vl9g" name="isMultipleCustomPropertyOperator">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPNuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPN-DlEee9bryn2mNvXA" name="className" value="IsVisiblePropertySetter"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3r3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3sHX6Eeipp8d5W3Vl9g" name="className" value="CustomPropertyOperator"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPOODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple TopLayerOperatorDescriptor" sections="_7W0bYeDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0u-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPOeDlEee9bryn2mNvXA" name="isMultipleTopLayerOperatorDescriptor">
+  <views xmi:id="_umc3sXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple AndStackedLayerOperatorDescriptor" sections="_ZjC3s3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4fHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3snX6Eeipp8d5W3Vl9g" name="isMultipleAndStackedLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPOuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPO-DlEee9bryn2mNvXA" name="className" value="TopLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3s3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3tHX6Eeipp8d5W3Vl9g" name="className" value="AndStackedLayerOperatorDescriptor"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPPODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple StackedLayerOperatorDescriptor" sections="_7W0bYuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0vODlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPPeDlEee9bryn2mNvXA" name="isMultipleStackedLayerOperatorDescriptor">
+  <views xmi:id="_umc3tXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple OrStackedLayerOperatorDescriptor" sections="_ZjC3tHX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4fXX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3tnX6Eeipp8d5W3Vl9g" name="isMultipleOrStackedLayerOperatorDescriptor">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPPuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPP-DlEee9bryn2mNvXA" name="className" value="StackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3t3X6Eeipp8d5W3Vl9g" name="className" value="OrStackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3uHX6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPQODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple CustomPropertyOperator" sections="_7W1CcODmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0veDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPQeDlEee9bryn2mNvXA" name="isMultipleCustomPropertyOperator">
+  <views xmi:id="_umc3uXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple IsAbstractUmlSetter" sections="_ZjC3tXX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4fnX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3unX6Eeipp8d5W3Vl9g" name="isMultipleIsAbstractUmlSetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPQuDlEee9bryn2mNvXA" name="className" value="CustomPropertyOperator"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPQ-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3u3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3vHX6Eeipp8d5W3Vl9g" name="className" value="IsAbstractUmlSetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPRODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple AndStackedLayerOperatorDescriptor" sections="_7W1CceDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0weDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPReDlEee9bryn2mNvXA" name="isMultipleAndStackedLayerOperatorDescriptor">
+  <views xmi:id="_umc3vXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple AllViewsDerivedLayer" sections="_ZjC3tnX7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4f3X6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3vnX6Eeipp8d5W3Vl9g" name="isMultipleAllViewsDerivedLayer">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPRuDlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPR-DlEee9bryn2mNvXA" name="className" value="AndStackedLayerOperatorDescriptor"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3v3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3wHX6Eeipp8d5W3Vl9g" name="className" value="AllViewsDerivedLayer"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPSODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple OrStackedLayerOperatorDescriptor" sections="_7W1CcuDmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0wuDlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_2fvPSeDlEee9bryn2mNvXA" name="isMultipleOrStackedLayerOperatorDescriptor">
+  <views xmi:id="_umc3wXX6Eeipp8d5W3Vl9g" elementMultiplicity="-1" name="Multiple CSSPropertySetter" sections="_ZjC3t3X7Eeipp8d5W3Vl9g" automaticContext="true" datacontexts="_umc4gHX6Eeipp8d5W3Vl9g">
+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_umc3wnX6Eeipp8d5W3Vl9g" name="isMultipleCSSPropertySetter">
       <constraintType href="ppe:/environment/org.eclipse.papyrus.infra.properties.ui/model/Environment.xmi#//@constraintTypes.0"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPSuDlEee9bryn2mNvXA" name="className" value="OrStackedLayerOperatorDescriptor"/>
-      <properties xsi:type="constraints:ValueProperty" xmi:id="_2fvPS-DlEee9bryn2mNvXA" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3w3X6Eeipp8d5W3Vl9g" name="nsUri" value="http://www.eclipse.org/papyrus/infra/gmfdiag/layers"/>
+      <properties xsi:type="constraints:ValueProperty" xmi:id="_umc3xHX6Eeipp8d5W3Vl9g" name="className" value="CSSPropertySetter"/>
     </constraints>
   </views>
-  <views xmi:id="_2fvPTODlEee9bryn2mNvXA" elementMultiplicity="-1" name="Multiple IsAbstractUmlSetter" sections="_7W1Cc-DmEee9bryn2mNvXA" automaticContext="true" datacontexts="_2fv0w-DlEee9bryn2mNvXA">
-    <constraints xsi:type="constraints:SimpleConstraint" x