regen model/edit with EMF 2.5

7 files changed, 225 insertions, 115 deletions

diff --git a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsEditPlugin.java b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsEditPlugin.java
index 393012182..299d2815d 100644
--- a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsEditPlugin.java
+++ b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsEditPlugin.java
@@ -9,12 +9,14 @@
  *      Obeo - initial API and implementation
  * 
  *
- * $Id: ComponentsEditPlugin.java,v 1.2 2009/04/30 17:49:47 nlepine Exp $
+ * $Id: ComponentsEditPlugin.java,v 1.3 2009/09/10 09:57:41 sbouchet Exp $
  */
 package org.eclipse.emf.eef.components.provider;
 
 import org.eclipse.emf.codegen.ecore.genmodel.provider.GenModelEditPlugin;
+
 import org.eclipse.emf.common.EMFPlugin;
+
 import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.EValidator;
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
@@ -53,8 +55,9 @@ public final class ComponentsEditPlugin extends EMFPlugin {
 	 * @generated
 	 */
 	public ComponentsEditPlugin() {
-		super(new ResourceLocator[] {EcoreEditPlugin.INSTANCE, GenModelEditPlugin.INSTANCE,
-				MappingEditPlugin.INSTANCE, ViewsEditPlugin.INSTANCE,});
+		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE,
+				GenModelEditPlugin.INSTANCE, MappingEditPlugin.INSTANCE,
+				ViewsEditPlugin.INSTANCE, });
 	}
 
 	/**
diff --git a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsItemProviderAdapterFactory.java
index 4cdb553aa..2b7d6527b 100644
--- a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/ComponentsItemProviderAdapterFactory.java
@@ -9,7 +9,7 @@
  *      Obeo - initial API and implementation
  * 
  *
- * $Id: ComponentsItemProviderAdapterFactory.java,v 1.2 2009/04/30 17:49:48 nlepine Exp $
+ * $Id: ComponentsItemProviderAdapterFactory.java,v 1.3 2009/09/10 09:57:41 sbouchet Exp $
  */
 package org.eclipse.emf.eef.components.provider;
 
@@ -20,10 +20,15 @@ import java.util.List;
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.ecore.EObject;
+
 import org.eclipse.emf.edit.command.CommandParameter;
+
 import org.eclipse.emf.edit.domain.EditingDomain;
+
 import org.eclipse.emf.edit.provider.ChangeNotifier;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
@@ -36,12 +41,16 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.emf.eef.components.ComponentsFactory;
+
 import org.eclipse.emf.eef.components.util.ComponentsAdapterFactory;
+
 import org.eclipse.emf.eef.mapping.AbstractElementBinding;
 import org.eclipse.emf.eef.mapping.Category;
 import org.eclipse.emf.eef.mapping.Databinding;
 import org.eclipse.emf.eef.mapping.MappingPackage;
+
 import org.eclipse.emf.eef.mapping.util.MappingSwitch;
 
 /**
@@ -53,7 +62,9 @@ import org.eclipse.emf.eef.mapping.util.MappingSwitch;
  * <!-- end-user-doc -->
  * @generated
  */
-public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class ComponentsItemProviderAdapterFactory extends
+		ComponentsAdapterFactory implements ComposeableAdapterFactory,
+		IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
@@ -109,7 +120,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	@Override
 	public Adapter createPropertiesEditionContextAdapter() {
 		if (propertiesEditionContextItemProvider == null) {
-			propertiesEditionContextItemProvider = new PropertiesEditionContextItemProvider(this);
+			propertiesEditionContextItemProvider = new PropertiesEditionContextItemProvider(
+					this);
 		}
 
 		return propertiesEditionContextItemProvider;
@@ -132,7 +144,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	@Override
 	public Adapter createPropertiesEditionComponentAdapter() {
 		if (propertiesEditionComponentItemProvider == null) {
-			propertiesEditionComponentItemProvider = new PropertiesEditionComponentItemProvider(this);
+			propertiesEditionComponentItemProvider = new PropertiesEditionComponentItemProvider(
+					this);
 		}
 
 		return propertiesEditionComponentItemProvider;
@@ -155,7 +168,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	@Override
 	public Adapter createPropertiesEditionElementAdapter() {
 		if (propertiesEditionElementItemProvider == null) {
-			propertiesEditionElementItemProvider = new PropertiesEditionElementItemProvider(this);
+			propertiesEditionElementItemProvider = new PropertiesEditionElementItemProvider(
+					this);
 		}
 
 		return propertiesEditionElementItemProvider;
@@ -178,7 +192,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	@Override
 	public Adapter createPropertiesMultiEditionElementAdapter() {
 		if (propertiesMultiEditionElementItemProvider == null) {
-			propertiesMultiEditionElementItemProvider = new PropertiesMultiEditionElementItemProvider(this);
+			propertiesMultiEditionElementItemProvider = new PropertiesMultiEditionElementItemProvider(
+					this);
 		}
 
 		return propertiesMultiEditionElementItemProvider;
@@ -191,7 +206,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+		return parentAdapterFactory == null ? this : parentAdapterFactory
+				.getRootAdapterFactory();
 	}
 
 	/**
@@ -200,7 +216,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+	public void setParentAdapterFactory(
+			ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
@@ -234,7 +251,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	public Object adapt(Object object, Object type) {
 		if (isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class) || (((Class<?>)type).isInstance(adapter))) {
+			if (!(type instanceof Class<?>)
+					|| (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -299,7 +317,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static class MappingChildCreationExtender implements IChildCreationExtender {
+	public static class MappingChildCreationExtender implements
+			IChildCreationExtender {
 		/**
 		 * The switch for creating child descriptors specific to each extended class.
 		 * <!-- begin-user-doc -->
@@ -329,7 +348,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 			 * <!-- end-user-doc -->
 			 * @generated
 			 */
-			CreationSwitch(List<Object> newChildDescriptors, EditingDomain editingDomain) {
+			CreationSwitch(List<Object> newChildDescriptors,
+					EditingDomain editingDomain) {
 				this.newChildDescriptors = newChildDescriptors;
 				this.editingDomain = editingDomain;
 			}
@@ -341,8 +361,10 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 			 */
 			@Override
 			public Object caseDatabinding(Databinding object) {
-				newChildDescriptors.add(createChildParameter(MappingPackage.Literals.DATABINDING__BINDINGS,
-						ComponentsFactory.eINSTANCE.createPropertiesEditionComponent()));
+				newChildDescriptors.add(createChildParameter(
+						MappingPackage.Literals.DATABINDING__BINDINGS,
+						ComponentsFactory.eINSTANCE
+								.createPropertiesEditionComponent()));
 
 				return null;
 			}
@@ -353,18 +375,25 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 			 * @generated
 			 */
 			@Override
-			public Object caseAbstractElementBinding(AbstractElementBinding object) {
-				newChildDescriptors.add(createChildParameter(
-						MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__SUB_ELEMENTS,
-						ComponentsFactory.eINSTANCE.createPropertiesEditionComponent()));
-
-				newChildDescriptors.add(createChildParameter(
-						MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES,
-						ComponentsFactory.eINSTANCE.createPropertiesEditionElement()));
-
-				newChildDescriptors.add(createChildParameter(
-						MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES,
-						ComponentsFactory.eINSTANCE.createPropertiesMultiEditionElement()));
+			public Object caseAbstractElementBinding(
+					AbstractElementBinding object) {
+				newChildDescriptors
+						.add(createChildParameter(
+								MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__SUB_ELEMENTS,
+								ComponentsFactory.eINSTANCE
+										.createPropertiesEditionComponent()));
+
+				newChildDescriptors
+						.add(createChildParameter(
+								MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES,
+								ComponentsFactory.eINSTANCE
+										.createPropertiesEditionElement()));
+
+				newChildDescriptors
+						.add(createChildParameter(
+								MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES,
+								ComponentsFactory.eINSTANCE
+										.createPropertiesMultiEditionElement()));
 
 				return null;
 			}
@@ -376,8 +405,10 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 			 */
 			@Override
 			public Object caseCategory(Category object) {
-				newChildDescriptors.add(createChildParameter(MappingPackage.Literals.CATEGORY__BINDINGS,
-						ComponentsFactory.eINSTANCE.createPropertiesEditionComponent()));
+				newChildDescriptors.add(createChildParameter(
+						MappingPackage.Literals.CATEGORY__BINDINGS,
+						ComponentsFactory.eINSTANCE
+								.createPropertiesEditionComponent()));
 
 				return null;
 			}
@@ -387,7 +418,8 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 			 * <!-- end-user-doc -->
 			 * @generated
 			 */
-			protected CommandParameter createChildParameter(Object feature, Object child) {
+			protected CommandParameter createChildParameter(Object feature,
+					Object child) {
 				return new CommandParameter(null, feature, child);
 			}
 
@@ -398,9 +430,11 @@ public class ComponentsItemProviderAdapterFactory extends ComponentsAdapterFacto
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		public Collection<Object> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
+		public Collection<Object> getNewChildDescriptors(Object object,
+				EditingDomain editingDomain) {
 			ArrayList<Object> result = new ArrayList<Object>();
-			new CreationSwitch(result, editingDomain).doSwitch((EObject)object);
+			new CreationSwitch(result, editingDomain)
+					.doSwitch((EObject) object);
 			return result;
 		}
 
diff --git a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/EEFElementItemProvider.java b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/EEFElementItemProvider.java
index fddfbfd56..d8d40814b 100644
--- a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/EEFElementItemProvider.java
+++ b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/EEFElementItemProvider.java
@@ -9,7 +9,7 @@
  *      Obeo - initial API and implementation
  * 
  *
- * $Id: EEFElementItemProvider.java,v 1.2 2009/04/30 17:49:47 nlepine Exp $
+ * $Id: EEFElementItemProvider.java,v 1.3 2009/09/10 09:57:41 sbouchet Exp $
  */
 package org.eclipse.emf.eef.components.provider;
 
@@ -18,7 +18,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -29,6 +31,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.emf.eef.components.ComponentsPackage;
 import org.eclipse.emf.eef.components.EEFElement;
 
@@ -38,7 +41,9 @@ import org.eclipse.emf.eef.components.EEFElement;
  * <!-- end-user-doc -->
  * @generated
  */
-public class EEFElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class EEFElementItemProvider extends ItemProviderAdapter implements
+		IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -72,11 +77,13 @@ public class EEFElementItemProvider extends ItemProviderAdapter implements IEdit
 	 * @generated
 	 */
 	protected void addHelpIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-				.getRootAdapterFactory(), getResourceLocator(), getString("_UI_EEFElement_helpID_feature"),
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(
+				((ComposeableAdapterFactory) adapterFactory)
+						.getRootAdapterFactory(), getResourceLocator(),
+				getString("_UI_EEFElement_helpID_feature"),
 				getString("_UI_EEFElement_helpID_description"),
-				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false,
+				false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -87,7 +94,8 @@ public class EEFElementItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/EEFElement"));
+		return overlayImage(object, getResourceLocator().getImage(
+				"full/obj16/EEFElement"));
 	}
 
 	/**
@@ -98,7 +106,7 @@ public class EEFElementItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((EEFElement)object).getHelpID();
+		String label = ((EEFElement) object).getHelpID();
 		return label == null || label.length() == 0 ? getString("_UI_EEFElement_type")
 				: getString("_UI_EEFElement_type") + " " + label;
 	}
@@ -115,10 +123,10 @@ public class EEFElementItemProvider extends ItemProviderAdapter implements IEdit
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(EEFElement.class)) {
-			case ComponentsPackage.EEF_ELEMENT__HELP_ID:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
+		case ComponentsPackage.EEF_ELEMENT__HELP_ID:
+			fireNotifyChanged(new ViewerNotification(notification, notification
+					.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -131,7 +139,8 @@ public class EEFElementItemProvider extends ItemProviderAdapter implements IEdit
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(
+			Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionComponentItemProvider.java b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionComponentItemProvider.java
index 81eaed75c..65361007f 100644
--- a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionComponentItemProvider.java
+++ b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionComponentItemProvider.java
@@ -9,7 +9,7 @@
  *      Obeo - initial API and implementation
  * 
  *
- * $Id: PropertiesEditionComponentItemProvider.java,v 1.1 2009/04/30 17:09:48 glefur Exp $
+ * $Id: PropertiesEditionComponentItemProvider.java,v 1.2 2009/09/10 09:57:41 sbouchet Exp $
  */
 package org.eclipse.emf.eef.components.provider;
 
@@ -18,7 +18,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,11 +30,13 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.emf.eef.components.ComponentsFactory;
 import org.eclipse.emf.eef.components.ComponentsPackage;
 import org.eclipse.emf.eef.components.PropertiesEditionComponent;
 import org.eclipse.emf.eef.mapping.MappingFactory;
 import org.eclipse.emf.eef.mapping.MappingPackage;
+
 import org.eclipse.emf.eef.mapping.provider.EMFElementBindingItemProvider;
 
 /**
@@ -41,7 +45,10 @@ import org.eclipse.emf.eef.mapping.provider.EMFElementBindingItemProvider;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PropertiesEditionComponentItemProvider extends EMFElementBindingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PropertiesEditionComponentItemProvider extends
+		EMFElementBindingItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider,
+		IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -76,11 +83,13 @@ public class PropertiesEditionComponentItemProvider extends EMFElementBindingIte
 	 * @generated
 	 */
 	protected void addHelpIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-				.getRootAdapterFactory(), getResourceLocator(), getString("_UI_EEFElement_helpID_feature"),
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(
+				((ComposeableAdapterFactory) adapterFactory)
+						.getRootAdapterFactory(), getResourceLocator(),
+				getString("_UI_EEFElement_helpID_feature"),
 				getString("_UI_EEFElement_helpID_description"),
-				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false,
+				false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -90,12 +99,16 @@ public class PropertiesEditionComponentItemProvider extends EMFElementBindingIte
 	 * @generated
 	 */
 	protected void addExplicitPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-				.getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_PropertiesEditionComponent_explicit_feature"),
-				getString("_UI_PropertiesEditionComponent_explicit_description"),
-				ComponentsPackage.Literals.PROPERTIES_EDITION_COMPONENT__EXPLICIT, true, false, false,
-				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+				.add(createItemPropertyDescriptor(
+						((ComposeableAdapterFactory) adapterFactory)
+								.getRootAdapterFactory(),
+						getResourceLocator(),
+						getString("_UI_PropertiesEditionComponent_explicit_feature"),
+						getString("_UI_PropertiesEditionComponent_explicit_description"),
+						ComponentsPackage.Literals.PROPERTIES_EDITION_COMPONENT__EXPLICIT,
+						true, false, false,
+						ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -106,7 +119,8 @@ public class PropertiesEditionComponentItemProvider extends EMFElementBindingIte
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PropertiesEditionComponent"));
+		return overlayImage(object, getResourceLocator().getImage(
+				"full/obj16/PropertiesEditionComponent"));
 	}
 
 	/**
@@ -117,9 +131,10 @@ public class PropertiesEditionComponentItemProvider extends EMFElementBindingIte
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((PropertiesEditionComponent)object).getName();
+		String label = ((PropertiesEditionComponent) object).getName();
 		return label == null || label.length() == 0 ? getString("_UI_PropertiesEditionComponent_type")
-				: getString("_UI_PropertiesEditionComponent_type") + " " + label;
+				: getString("_UI_PropertiesEditionComponent_type") + " "
+						+ label;
 	}
 
 	/**
@@ -134,11 +149,11 @@ public class PropertiesEditionComponentItemProvider extends EMFElementBindingIte
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(PropertiesEditionComponent.class)) {
-			case ComponentsPackage.PROPERTIES_EDITION_COMPONENT__HELP_ID:
-			case ComponentsPackage.PROPERTIES_EDITION_COMPONENT__EXPLICIT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
+		case ComponentsPackage.PROPERTIES_EDITION_COMPONENT__HELP_ID:
+		case ComponentsPackage.PROPERTIES_EDITION_COMPONENT__EXPLICIT:
+			fireNotifyChanged(new ViewerNotification(notification, notification
+					.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -151,15 +166,23 @@ public class PropertiesEditionComponentItemProvider extends EMFElementBindingIte
 	 * @generated NOT
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		//		super.collectNewChildDescriptors(newChildDescriptors, object);
+	protected void collectNewChildDescriptors(
+			Collection<Object> newChildDescriptors, Object object) {
+		//super.collectNewChildDescriptors(newChildDescriptors, object);
+		//
+		//newChildDescriptors
+		//		.add(createChildParameter(
+		//				MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__SUB_ELEMENTS,
+		//				ComponentsFactory.eINSTANCE
+		//						.createPropertiesEditionComponent()));
 
 		newChildDescriptors.add(createChildParameter(
-				MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES, ComponentsFactory.eINSTANCE
-						.createPropertiesEditionElement()));
+				MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES,
+				ComponentsFactory.eINSTANCE.createPropertiesEditionElement()));
 
 		newChildDescriptors.add(createChildParameter(
-				MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES, ComponentsFactory.eINSTANCE
+				MappingPackage.Literals.ABSTRACT_ELEMENT_BINDING__PROPERTIES,
+				ComponentsFactory.eINSTANCE
 						.createPropertiesMultiEditionElement()));
 
 		newChildDescriptors.add(createChildParameter(
diff --git a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionContextItemProvider.java b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionContextItemProvider.java
index b57594f0a..d12993e19 100644
--- a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionContextItemProvider.java
+++ b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionContextItemProvider.java
@@ -9,7 +9,7 @@
  *      Obeo - initial API and implementation
  * 
  *
- * $Id: PropertiesEditionContextItemProvider.java,v 1.1 2009/04/30 17:09:48 glefur Exp $
+ * $Id: PropertiesEditionContextItemProvider.java,v 1.2 2009/09/10 09:57:41 sbouchet Exp $
  */
 package org.eclipse.emf.eef.components.provider;
 
@@ -18,7 +18,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -26,11 +28,13 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
 import org.eclipse.emf.eef.components.ComponentsFactory;
 import org.eclipse.emf.eef.components.ComponentsPackage;
 import org.eclipse.emf.eef.components.PropertiesEditionContext;
 import org.eclipse.emf.eef.mapping.MappingFactory;
 import org.eclipse.emf.eef.mapping.MappingPackage;
+
 import org.eclipse.emf.eef.mapping.provider.DatabindingItemProvider;
 
 /**
@@ -39,7 +43,10 @@ import org.eclipse.emf.eef.mapping.provider.DatabindingItemProvider;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PropertiesEditionContextItemProvider extends DatabindingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PropertiesEditionContextItemProvider extends
+		DatabindingItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider,
+		IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -73,12 +80,15 @@ public class PropertiesEditionContextItemProvider extends DatabindingItemProvide
 	 * @generated
 	 */
 	protected void addModelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-				.getRootAdapterFactory(), getResourceLocator(),
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(
+				((ComposeableAdapterFactory) adapterFactory)
+						.getRootAdapterFactory(), getResourceLocator(),
 				getString("_UI_PropertiesEditionContext_model_feature"),
-				getString("_UI_PropertiesEditionContext_model_description"),
-				ComponentsPackage.Literals.PROPERTIES_EDITION_CONTEXT__MODEL, true, false, true, null, null,
-				null));
+				getString("_UI_PropertyDescriptor_description",
+						"_UI_PropertiesEditionContext_model_feature",
+						"_UI_PropertiesEditionContext_type"),
+				ComponentsPackage.Literals.PROPERTIES_EDITION_CONTEXT__MODEL,
+				true, false, true, null, null, null));
 	}
 
 	/**
@@ -89,7 +99,8 @@ public class PropertiesEditionContextItemProvider extends DatabindingItemProvide
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PropertiesEditionContext"));
+		return overlayImage(object, getResourceLocator().getImage(
+				"full/obj16/PropertiesEditionContext"));
 	}
 
 	/**
@@ -100,7 +111,7 @@ public class PropertiesEditionContextItemProvider extends DatabindingItemProvide
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((PropertiesEditionContext)object).getDocumentation();
+		String label = ((PropertiesEditionContext) object).getDocumentation();
 		return label == null || label.length() == 0 ? getString("_UI_PropertiesEditionContext_type")
 				: getString("_UI_PropertiesEditionContext_type") + " " + label;
 	}
@@ -126,14 +137,20 @@ public class PropertiesEditionContextItemProvider extends DatabindingItemProvide
 	 * @generated NOT
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		//		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(MappingPackage.Literals.DATABINDING__CATEGORIES,
-				MappingFactory.eINSTANCE.createCategory()));
+	protected void collectNewChildDescriptors(
+			Collection<Object> newChildDescriptors, Object object) {
+		//super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(MappingPackage.Literals.DATABINDING__BINDINGS,
-				ComponentsFactory.eINSTANCE.createPropertiesEditionComponent()));
+		newChildDescriptors
+				.add(createChildParameter(
+						MappingPackage.Literals.DATABINDING__CATEGORIES,
+						MappingFactory.eINSTANCE.createCategory()));
+		
+		newChildDescriptors
+				.add(createChildParameter(
+						MappingPackage.Literals.DATABINDING__BINDINGS,
+						ComponentsFactory.eINSTANCE
+								.createPropertiesEditionComponent()));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionElementItemProvider.java b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionElementItemProvider.java
index 26e47a022..769d1e7fd 100644
--- a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionElementItemProvider.java
+++ b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesEditionElementItemProvider.java
@@ -9,7 +9,7 @@
  *      Obeo - initial API and implementation
  * 
  *
- * $Id: PropertiesEditionElementItemProvider.java,v 1.2 2009/04/30 17:49:47 nlepine Exp $
+ * $Id: PropertiesEditionElementItemProvider.java,v 1.3 2009/09/10 09:57:41 sbouchet Exp $
  */
 package org.eclipse.emf.eef.components.provider;
 
@@ -18,7 +18,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,8 +30,10 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.emf.eef.components.ComponentsPackage;
 import org.eclipse.emf.eef.components.PropertiesEditionElement;
+
 import org.eclipse.emf.eef.mapping.provider.EMFPropertyBindingItemProvider;
 
 /**
@@ -38,7 +42,10 @@ import org.eclipse.emf.eef.mapping.provider.EMFPropertyBindingItemProvider;
  * <!-- end-user-doc -->
  * @generated
  */
-public class PropertiesEditionElementItemProvider extends EMFPropertyBindingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PropertiesEditionElementItemProvider extends
+		EMFPropertyBindingItemProvider implements IEditingDomainItemProvider,
+		IStructuredItemContentProvider, ITreeItemContentProvider,
+		IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -72,11 +79,13 @@ public class PropertiesEditionElementItemProvider extends EMFPropertyBindingItem
 	 * @generated
 	 */
 	protected void addHelpIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-				.getRootAdapterFactory(), getResourceLocator(), getString("_UI_EEFElement_helpID_feature"),
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(
+				((ComposeableAdapterFactory) adapterFactory)
+						.getRootAdapterFactory(), getResourceLocator(),
+				getString("_UI_EEFElement_helpID_feature"),
 				getString("_UI_EEFElement_helpID_description"),
-				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false,
+				false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -87,7 +96,8 @@ public class PropertiesEditionElementItemProvider extends EMFPropertyBindingItem
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PropertiesEditionElement"));
+		return overlayImage(object, getResourceLocator().getImage(
+				"full/obj16/PropertiesEditionElement"));
 	}
 
 	/**
@@ -98,7 +108,7 @@ public class PropertiesEditionElementItemProvider extends EMFPropertyBindingItem
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((PropertiesEditionElement)object).getName();
+		String label = ((PropertiesEditionElement) object).getName();
 		return label == null || label.length() == 0 ? getString("_UI_PropertiesEditionElement_type")
 				: getString("_UI_PropertiesEditionElement_type") + " " + label;
 	}
@@ -115,10 +125,10 @@ public class PropertiesEditionElementItemProvider extends EMFPropertyBindingItem
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(PropertiesEditionElement.class)) {
-			case ComponentsPackage.PROPERTIES_EDITION_ELEMENT__HELP_ID:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
+		case ComponentsPackage.PROPERTIES_EDITION_ELEMENT__HELP_ID:
+			fireNotifyChanged(new ViewerNotification(notification, notification
+					.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -131,7 +141,8 @@ public class PropertiesEditionElementItemProvider extends EMFPropertyBindingItem
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(
+			Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesMultiEditionElementItemProvider.java b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesMultiEditionElementItemProvider.java
index ff7b11087..ee286d968 100644
--- a/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesMultiEditionElementItemProvider.java
+++ b/plugins/org.eclipse.emf.eef.components.edit/src-gen/org/eclipse/emf/eef/components/provider/PropertiesMultiEditionElementItemProvider.java
@@ -9,7 +9,7 @@
  *      Obeo - initial API and implementation
  * 
  *
- * $Id: PropertiesMultiEditionElementItemProvider.java,v 1.2 2009/04/30 17:49:47 nlepine Exp $
+ * $Id: PropertiesMultiEditionElementItemProvider.java,v 1.3 2009/09/10 09:57:41 sbouchet Exp $
  */
 package org.eclipse.emf.eef.components.provider;
 
@@ -18,7 +18,9 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.common.util.ResourceLocator;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,8 +30,10 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
+
 import org.eclipse.emf.eef.components.ComponentsPackage;
 import org.eclipse.emf.eef.components.PropertiesMultiEditionElement;
+
 import org.eclipse.emf.eef.mapping.provider.EMFMultiPropertiesBindingItemProvider;
 
 /**
@@ -38,14 +42,18 @@ import org.eclipse.emf.eef.mapping.provider.EMFMultiPropertiesBindingItemProvide
  * <!-- end-user-doc -->
  * @generated
  */
-public class PropertiesMultiEditionElementItemProvider extends EMFMultiPropertiesBindingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PropertiesMultiEditionElementItemProvider extends
+		EMFMultiPropertiesBindingItemProvider implements
+		IEditingDomainItemProvider, IStructuredItemContentProvider,
+		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public PropertiesMultiEditionElementItemProvider(AdapterFactory adapterFactory) {
+	public PropertiesMultiEditionElementItemProvider(
+			AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -72,11 +80,13 @@ public class PropertiesMultiEditionElementItemProvider extends EMFMultiPropertie
 	 * @generated
 	 */
 	protected void addHelpIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory)
-				.getRootAdapterFactory(), getResourceLocator(), getString("_UI_EEFElement_helpID_feature"),
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(
+				((ComposeableAdapterFactory) adapterFactory)
+						.getRootAdapterFactory(), getResourceLocator(),
+				getString("_UI_EEFElement_helpID_feature"),
 				getString("_UI_EEFElement_helpID_description"),
-				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+				ComponentsPackage.Literals.EEF_ELEMENT__HELP_ID, true, false,
+				false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -87,7 +97,8 @@ public class PropertiesMultiEditionElementItemProvider extends EMFMultiPropertie
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PropertiesMultiEditionElement"));
+		return overlayImage(object, getResourceLocator().getImage(
+				"full/obj16/PropertiesMultiEditionElement"));
 	}
 
 	/**
@@ -98,9 +109,10 @@ public class PropertiesMultiEditionElementItemProvider extends EMFMultiPropertie
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((PropertiesMultiEditionElement)object).getName();
+		String label = ((PropertiesMultiEditionElement) object).getName();
 		return label == null || label.length() == 0 ? getString("_UI_PropertiesMultiEditionElement_type")
-				: getString("_UI_PropertiesMultiEditionElement_type") + " " + label;
+				: getString("_UI_PropertiesMultiEditionElement_type") + " "
+						+ label;
 	}
 
 	/**
@@ -115,10 +127,10 @@ public class PropertiesMultiEditionElementItemProvider extends EMFMultiPropertie
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(PropertiesMultiEditionElement.class)) {
-			case ComponentsPackage.PROPERTIES_MULTI_EDITION_ELEMENT__HELP_ID:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false,
-						true));
-				return;
+		case ComponentsPackage.PROPERTIES_MULTI_EDITION_ELEMENT__HELP_ID:
+			fireNotifyChanged(new ViewerNotification(notification, notification
+					.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -131,7 +143,8 @@ public class PropertiesMultiEditionElementItemProvider extends EMFMultiPropertie
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(
+			Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}