update eef editor/view synchro

20 files changed, 421 insertions, 64 deletions

diff --git a/plugins/org.eclipse.emf.eef.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.editor/META-INF/MANIFEST.MF
index 93e06c9f5..0e70b25c8 100644
--- a/plugins/org.eclipse.emf.eef.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.eef.editor/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.eef.runtime.ui,
  com.google.guava;bundle-version="10.0.1",
  org.eclipse.emf.eef.runtime.ui.swt;bundle-version="2.0.0",
- org.eclipse.emf.eef.runtime.ui.swt.e3;bundle-version="2.0.0"
+ org.eclipse.emf.eef.runtime.ui.swt.e3;bundle-version="2.0.0",
+ org.eclipse.osgi.services;bundle-version="3.2.100"
 Bundle-ActivationPolicy: lazy
 Import-Package: org.eclipse.ui.forms,
  org.eclipse.ui.forms.editor,
diff --git a/plugins/org.eclipse.emf.eef.editor/icons/overview_obj.gif b/plugins/org.eclipse.emf.eef.editor/icons/overview_obj.gif
new file mode 100644
index 000000000..0624021bc
--- /dev/null
+++ b/plugins/org.eclipse.emf.eef.editor/icons/overview_obj.gif
diff --git a/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/EEFReflectiveEditor.java b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/EEFReflectiveEditor.java
index 385df4674..4c19727dd 100644
--- a/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/EEFReflectiveEditor.java
+++ b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/EEFReflectiveEditor.java
@@ -78,6 +78,7 @@ import org.eclipse.emf.eef.runtime.editingModel.PropertiesEditingModel;
 import org.eclipse.emf.eef.runtime.editingModel.presentation.util.EditingModelEditorResourceSet;
 import org.eclipse.emf.eef.runtime.editingModel.provider.EditingModelItemProviderAdapterFactory;
 import org.eclipse.emf.eef.runtime.ui.swt.e3.E3EEFRuntimeUIPlatformPlugin;
+import org.eclipse.emf.eef.view.EEFReflectiveView;
 import org.eclipse.emf.eef.view.listener.EEFViewPartListener;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
@@ -104,6 +105,7 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.dialogs.SaveAsDialog;
 import org.eclipse.ui.forms.editor.FormEditor;
@@ -338,6 +340,8 @@ public class EEFReflectiveEditor extends FormEditor implements IEditingDomainPro
 
 	private EEFViewPartListener viewListener;
 
+	private PropertiesEditingModel editingModel;
+
 	public void addNotifiable(Notifiable notifiable) {
 		notifiables.add(notifiable);
 	}
@@ -598,6 +602,10 @@ public class EEFReflectiveEditor extends FormEditor implements IEditingDomainPro
 				// Load the resource through the editing domain.
 				//
 				resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+				if (!resource.getContents().isEmpty() && resource.getContents().get(0) instanceof PropertiesEditingModel) {
+					editingModel = (PropertiesEditingModel) resource.getContents().get(0);
+				}
+
 			} else {
 				// if does not exist : find it from Generic Binding Settings or
 				// EEFBindingsSettings
@@ -626,7 +634,9 @@ public class EEFReflectiveEditor extends FormEditor implements IEditingDomainPro
 			public void notifyChanged(Notification notification) {
 				super.notifyChanged(notification);
 				for (Notifiable notifiable : notifiables) {
-					if (getCurrentPage() == notifiable.getIndex() && isPageNotification(notification)) {
+					if ((getCurrentPage() == notifiable.getIndex() && isPageNotification(notification))) {
+						notifiable.notifyChanged(notification);
+					} else if (notifiable.getIndex() < -1 && isPageNotification(notification) && !(notification.getNotifier() instanceof ResourceSet)) {
 						notifiable.notifyChanged(notification);
 					}
 				}
@@ -762,12 +772,44 @@ public class EEFReflectiveEditor extends FormEditor implements IEditingDomainPro
 				viewsEditingPage.setViewerService(viewerService);
 				addPage(viewsEditingPage);
 
+				if (!containsNotifiableView()) {
+					addNotifiable(new Notifiable() {
+
+						public void notifyChanged(final Notification notification) {
+							getContainer().getDisplay().asyncExec(new Runnable() {
+
+								public void run() {
+									if (PlatformUI.getWorkbench().getActiveWorkbenchWindow() != null && PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != null) {
+										final EEFReflectiveView eefView = (EEFReflectiveView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(EEFReflectiveView.ID);
+										if (eefView != null) {
+											eefView.refresh();
+										}
+									}
+								}
+							});
+						}
+
+						public int getIndex() {
+							return -2;
+						}
+					});
+				}
+
 			}
 		} catch (PartInitException e) {
 			e.printStackTrace();
 		}
 	}
 
+	public boolean containsNotifiableView() {
+		for (Notifiable notifiable : notifiables) {
+			if (notifiable.getIndex() < 0) {
+				return true;
+			}
+		}
+		return false;
+	}
+
 	/**
 	 * @return the editingDomainForOtherModel
 	 */
@@ -1117,4 +1159,8 @@ public class EEFReflectiveEditor extends FormEditor implements IEditingDomainPro
 	protected boolean showOutlineView() {
 		return true;
 	}
+
+	public PropertiesEditingModel getEditingModel() {
+		return editingModel;
+	}
 }
diff --git a/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/internal/binding/settings/EditorBindingSettings.java b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/internal/binding/settings/EditorBindingSettings.java
new file mode 100644
index 000000000..0cf2c7f59
--- /dev/null
+++ b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/internal/binding/settings/EditorBindingSettings.java
@@ -0,0 +1,149 @@
+/**

+ * 

+ */

+package org.eclipse.emf.eef.editor.internal.binding.settings;

+

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

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

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

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.eef.editor.EEFReflectiveEditor;

+import org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings;

+import org.eclipse.emf.eef.runtime.editingModel.EditingModelEnvironment;

+import org.eclipse.emf.eef.runtime.editingModel.PropertiesEditingModel;

+import org.eclipse.emf.eef.runtime.editingModel.View;

+import org.eclipse.emf.eef.runtime.internal.editingModel.EditingModelEnvironmentImpl;

+import org.eclipse.emf.eef.runtime.services.DefaultService;

+import org.eclipse.emf.eef.runtime.ui.view.propertyeditors.EEFToolkitProvider;

+import org.eclipse.emf.eef.runtime.util.EMFServiceProvider;

+import org.eclipse.emf.eef.runtime.view.handle.ViewHandler;

+import org.eclipse.emf.eef.runtime.view.handle.ViewHandlerProvider;

+import org.eclipse.emf.eef.runtime.view.lock.policies.EEFLockPolicy;

+import org.eclipse.ui.IEditorPart;

+import org.eclipse.ui.PlatformUI;

+

+/**

+ * Generic binding settings for EObject.

+ * 

+ * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a>

+ * 

+ */

+public class EditorBindingSettings implements EEFBindingSettings<PropertiesEditingModel>, DefaultService {

+

+	/**

+	 * Providers

+	 */

+	private EMFServiceProvider emfServiceProvider;

+	private EditingModelEnvironment editingModelEnvironment;

+	private ViewHandlerProvider viewHandlerProvider;

+	private EEFToolkitProvider toolkitProvider;

+

+	/**

+	 * Properties editing model.

+	 */

+	private ResourceSet resourceSet;

+

+	/**

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.eef.runtime.services.EEFService#serviceFor(java.lang.Object)

+	 */

+	public boolean serviceFor(EPackage element) {

+		return true;

+	}

+

+	/**

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings#getEMFServiceProvider()

+	 */

+	public EMFServiceProvider getEMFServiceProvider() {

+		return emfServiceProvider;

+	}

+

+	/**

+	 * @param emfServiceProvider

+	 *            EMFServiceProvider

+	 */

+	public void setEMFServiceProvider(EMFServiceProvider emfServiceProvider) {

+		this.emfServiceProvider = emfServiceProvider;

+	}

+

+	/**

+	 * @param eefToolkitProvider

+	 *            EEFToolkitProvider

+	 */

+	public void setEEFToolkitProvider(EEFToolkitProvider eefToolkitProvider) {

+		this.toolkitProvider = eefToolkitProvider;

+	}

+

+	/**

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings#getEEFDescription(org.eclipse.emf.ecore.EObject)

+	 */

+	public PropertiesEditingModel getEEFDescription(EObject eObject) {

+		return getEEFDescription(eObject.eClass());

+	}

+

+	/**

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings#getEEFDescription(org.eclipse.emf.ecore.EClass)

+	 */

+	public PropertiesEditingModel getEEFDescription(EClass eClass) {

+		PropertiesEditingModel propertiesEditingModel = null;

+		if (PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != null) {

+			IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();

+			if (activeEditor instanceof EEFReflectiveEditor) {

+				PropertiesEditingModel editingModel = ((EEFReflectiveEditor) activeEditor).getEditingModel();

+				if (editingModel != null) {

+					editingModel.setEMFServiceProvider(emfServiceProvider);

+					return editingModel;

+				}

+

+			}

+		}

+

+		return propertiesEditingModel;

+	}

+

+	/**

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings#getViewHandler(org.eclipse.emf.eef.runtime.editingModel.View)

+	 */

+	public ViewHandler<?> getViewHandler(View view) {

+		return viewHandlerProvider.getViewHandler(view);

+	}

+

+	/**

+	 * @param viewHandlerProvider

+	 *            ViewHandlerProvider

+	 */

+	public void setViewHandlerProvider(ViewHandlerProvider viewHandlerProvider) {

+		this.viewHandlerProvider = viewHandlerProvider;

+	}

+

+	/**

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings#enableLockPolicy(org.eclipse.emf.eef.runtime.view.lock.policies.EEFLockPolicy)

+	 */

+	public boolean enableLockPolicy(EEFLockPolicy lockPolicy) {

+		return false;

+	}

+

+	/**

+	 * (non-Javadoc)

+	 * 

+	 * @see org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings#getEditingModelEnvironment()

+	 */

+	public EditingModelEnvironment getEditingModelEnvironment() {

+		if (editingModelEnvironment == null) {

+			editingModelEnvironment = new EditingModelEnvironmentImpl(null);

+		}

+		return editingModelEnvironment;

+	}

+

+}

diff --git a/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/internal/pages/ViewsEditingPage.java b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/internal/pages/ViewsEditingPage.java
index d2908cf91..cbd1d59a3 100644
--- a/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/internal/pages/ViewsEditingPage.java
+++ b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/editor/internal/pages/ViewsEditingPage.java
@@ -35,6 +35,8 @@ import org.eclipse.emf.eef.editor.internal.services.SelectionService;
 import org.eclipse.emf.eef.editor.internal.services.ViewerService;
 import org.eclipse.emf.eef.runtime.context.EditingContextFactoryProvider;
 import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;
+import org.eclipse.emf.eef.runtime.internal.context.EObjectPropertiesEditingContext;
+import org.eclipse.emf.eef.runtime.internal.context.ReflectivePropertiesEditingContext;
 import org.eclipse.emf.eef.runtime.ui.swt.EEFRuntimeUISWT;
 import org.eclipse.emf.eef.runtime.ui.swt.EEFSWTConstants;
 import org.eclipse.emf.eef.runtime.ui.swt.resources.ImageManager;
@@ -174,7 +176,6 @@ public class ViewsEditingPage extends FormPage {
 		((EEFReflectiveEditor) getEditor()).addNotifiable(new Notifiable() {
 
 			public void notifyChanged(final Notification notification) {
-				notification.getNotifier();
 				pageContainer.getDisplay().asyncExec(new Runnable() {
 
 					public void run() {
@@ -182,6 +183,10 @@ public class ViewsEditingPage extends FormPage {
 							refreshPageTitle();
 						} else {
 							viewPreviewViewer.refresh();
+							Object input = viewPreviewViewer.getInput();
+							if (input instanceof ReflectivePropertiesEditingContext) {
+								views.getViewer().setSelection(new StructuredSelection(((ReflectivePropertiesEditingContext) input).getEObject()));
+							}
 						}
 					}
 				});
@@ -270,15 +275,19 @@ public class ViewsEditingPage extends FormPage {
 
 			public void selectionChanged(SelectionChangedEvent event) {
 				if (event.getSelection() != null && !event.getSelection().isEmpty()) {
-					delete.setEnabled(true);
 					EObject view = selectionService.unwrapSelection(event.getSelection());
-					EditingDomain domain = ((IEditingDomainProvider) getEditor()).getEditingDomain();
-					PropertiesEditingContext editingContext = contextFactoryProvider.getEditingContextFactory(view).createPropertiesEditingContext(domain, adapterFactory, view);
-					editingContext.getOptions().setOption(EEFSWTConstants.FORM_TOOLKIT, ViewsEditingPage.this.toolkit);
-					viewSettingsViewer.setInput(editingContext);
+					PropertiesEditingContext currentSelection = (PropertiesEditingContext) viewSettingsViewer.getInput();
+					if (currentSelection == null || (currentSelection instanceof EObjectPropertiesEditingContext && !view.equals(((EObjectPropertiesEditingContext) currentSelection).getEObject()))) {
+						delete.setEnabled(true);
+						EditingDomain domain = ((IEditingDomainProvider) getEditor()).getEditingDomain();
+						PropertiesEditingContext editingContext = contextFactoryProvider.getEditingContextFactory(view).createPropertiesEditingContext(domain, adapterFactory, view);
+						editingContext.getOptions().setOption(EEFSWTConstants.FORM_TOOLKIT, ViewsEditingPage.this.toolkit);
+						viewSettingsViewer.setInput(editingContext);
+					}
 					PropertiesEditingContext reflectEditingContext = contextFactoryProvider.getEditingContextFactory(view).createReflectivePropertiesEditingContext(adapterFactory, view);
 					reflectEditingContext.getOptions().setOption(EEFSWTConstants.FORM_TOOLKIT, ViewsEditingPage.this.toolkit);
 					viewPreviewViewer.setInput(reflectEditingContext);
+
 				} else {
 					delete.setEnabled(false);
 				}
@@ -302,7 +311,7 @@ public class ViewsEditingPage extends FormPage {
 	}
 
 	private Composite createPreviewSection(FormToolkit toolkit, Composite container) {
-		Section previewSection = toolkit.createSection(container, Section.TITLE_BAR);
+		Section previewSection = toolkit.createSection(container, Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED);
 		previewSection.setText("Preview");
 		Composite previewContainer = toolkit.createComposite(previewSection);
 		previewContainer.setLayout(new GridLayout(1, false));
diff --git a/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/view/EEFReflectiveView.java b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/view/EEFReflectiveView.java
index b8e4e27b8..8836374d7 100644
--- a/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/view/EEFReflectiveView.java
+++ b/plugins/org.eclipse.emf.eef.editor/src/org/eclipse/emf/eef/view/EEFReflectiveView.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.eef.view;
 
 import java.util.List;
-import java.util.Map;
 
 import org.eclipse.emf.common.command.BasicCommandStack;
 import org.eclipse.emf.common.notify.Notification;
@@ -27,31 +26,37 @@ import org.eclipse.emf.ecore.util.EContentAdapter;
 import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.domain.EditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
 import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
 import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider.FontAndColorProvider;
+import org.eclipse.emf.eef.editor.EEFReflectiveEditor;
 import org.eclipse.emf.eef.editor.EditingModelEditPlugin;
 import org.eclipse.emf.eef.editor.internal.actions.ExtendedLoadResourceAction;
-import org.eclipse.emf.eef.editor.internal.services.EMFService;
+import org.eclipse.emf.eef.editor.internal.binding.settings.EditorBindingSettings;
+import org.eclipse.emf.eef.editor.internal.notify.Notifiable;
 import org.eclipse.emf.eef.editor.internal.services.SelectionService;
 import org.eclipse.emf.eef.editor.internal.services.ViewerService;
+import org.eclipse.emf.eef.runtime.binding.BindingHandlerProvider;
+import org.eclipse.emf.eef.runtime.binding.PropertiesBindingHandler;
+import org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettings;
+import org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettingsProvider;
 import org.eclipse.emf.eef.runtime.context.EditingContextFactoryProvider;
-import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;
-import org.eclipse.emf.eef.runtime.editingModel.EClassBinding;
-import org.eclipse.emf.eef.runtime.editingModel.PropertiesEditingModel;
 import org.eclipse.emf.eef.runtime.editingModel.presentation.util.EditingModelEditorResourceSet;
 import org.eclipse.emf.eef.runtime.editingModel.provider.EditingModelItemProviderAdapterFactory;
+import org.eclipse.emf.eef.runtime.internal.binding.PropertiesBindingHandlerImpl;
+import org.eclipse.emf.eef.runtime.internal.context.EObjectPropertiesEditingContext;
 import org.eclipse.emf.eef.runtime.ui.swt.EEFRuntimeUISWT;
 import org.eclipse.emf.eef.runtime.ui.swt.EEFSWTConstants;
 import org.eclipse.emf.eef.runtime.ui.swt.e3.E3EEFRuntimeUIPlatformPlugin;
+import org.eclipse.emf.eef.runtime.ui.swt.internal.binding.PropertiesBindingHandlerUIImpl;
 import org.eclipse.emf.eef.runtime.ui.swt.resources.ImageManager;
 import org.eclipse.emf.eef.runtime.ui.swt.viewer.EEFContentProvider;
 import org.eclipse.emf.eef.runtime.ui.swt.viewer.EEFViewer;
 import org.eclipse.emf.eef.runtime.util.EEFEditingService;
+import org.eclipse.emf.eef.runtime.util.EMFServiceProvider;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -63,7 +68,6 @@ import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.FormAttachment;
 import org.eclipse.swt.layout.FormData;
@@ -71,6 +75,8 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.FilteredTree;
 import org.eclipse.ui.dialogs.PatternFilter;
 import org.eclipse.ui.forms.widgets.Form;
@@ -79,7 +85,6 @@ import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.part.ViewPart;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 /**
  * @author <a href="mailto:nathalie.lepine@obeo.fr">Nathalie Lepine</a>
@@ -92,7 +97,6 @@ public class EEFReflectiveView extends ViewPart {
 	 */
 	public static final String ID = "org.eclipse.emf.eef.view.EEFReflexiveView";
 
-	private EMFService emfService;
 	private EEFEditingService eefEditingService;
 	private SelectionService selectionService;
 	private ViewerService viewerService;
@@ -119,7 +123,6 @@ public class EEFReflectiveView extends ViewPart {
 	 * Constructor.
 	 */
 	public EEFReflectiveView() {
-		emfService = new EMFService();
 		selectionService = new SelectionService();
 		viewerService = new ViewerService(EditingModelEditPlugin.getPlugin().getLockManagerProvider());
 		contextFactoryProvider = E3EEFRuntimeUIPlatformPlugin.getPlugin().getContextFactoryProvider();
@@ -155,7 +158,7 @@ public class EEFReflectiveView extends ViewPart {
 		toolkit = new FormToolkit(composite.getDisplay());
 		innerForm = toolkit.createForm(composite);
 		toolkit.decorateFormHeading(innerForm);
-		refreshPageTitle();
+		// innerForm.setText("Bindings");
 
 		Composite parent = innerForm.getBody();
 		parent.setLayout(new FillLayout());
@@ -189,16 +192,42 @@ public class EEFReflectiveView extends ViewPart {
 					super.notifyChanged(notification);
 					modelViewer.getViewer().refresh();
 					bindingPreviewViewer.refresh();
-					refreshPageTitle();
 				}
 			}
 
 		});
+
+		if (PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != null) {
+			IEditorPart activeEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
+			if (activeEditor instanceof EEFReflectiveEditor) {
+				if (!((EEFReflectiveEditor) activeEditor).containsNotifiableView()) {
+					((EEFReflectiveEditor) activeEditor).addNotifiable(new Notifiable() {
+
+						public void notifyChanged(final Notification notification) {
+
+							final EEFReflectiveView eefView = (EEFReflectiveView) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().findView(EEFReflectiveView.ID);
+							if (eefView != null) {
+								bindingPreviewViewer.getControl().getDisplay().asyncExec(new Runnable() {
+
+									public void run() {
+										eefView.refresh();
+									}
+								});
+							}
+						}
+
+						public int getIndex() {
+							return -1;
+						}
+					});
+				}
+			}
+		}
+
 	}
 
 	@Override
 	public void setFocus() {
-		
 
 	}
 
@@ -328,24 +357,6 @@ public class EEFReflectiveView extends ViewPart {
 		viewerService.updateViewerBackground(toolkit, bindingPreviewViewer);
 	}
 
-	private void refreshPageTitle() {
-		if (innerForm != null && getEditingDomain() != null) {
-			PropertiesEditingModel editedEditingModel = emfService.findEditedEditingModel(getEditingDomain().getResourceSet());
-			String formLabel = "Bindings";
-			if (editedEditingModel != null) {
-				IItemLabelProvider labelProvider = (IItemLabelProvider) adapterFactory.adapt(editedEditingModel, IItemLabelProvider.class);
-				if (labelProvider != null) {
-					formLabel = labelProvider.getText(editedEditingModel);
-					Image image = imageManager.getImageFromObject(labelProvider.getImage(editedEditingModel));
-					if (image != null) {
-						innerForm.setImage(image);
-					}
-				}
-			}
-			innerForm.setText(formLabel);
-		}
-	}
-
 	private void refreshPageLayout() {
 		pageContainer.layout(true);
 		pageContainer.getParent().layout(true);
@@ -416,6 +427,8 @@ public class EEFReflectiveView extends ViewPart {
 
 		private TreeViewer viewer;
 
+		private DelegatingBindingHandlerProvider bindingHandlerProvider;
+
 		public SelectionBroker(SelectionService selectionService, ViewerService viewerService, TreeViewer metamodelViewer) {
 			this.selectionService = selectionService;
 			this.viewer = metamodelViewer;
@@ -430,17 +443,29 @@ public class EEFReflectiveView extends ViewPart {
 			if (event.getSource() == viewer) {
 				EObject selection = selectionService.unwrapSelection(event.getSelection());
 				if (selection != null) {
-					PropertiesEditingContext propertiesEditingContext = contextFactoryProvider.getEditingContextFactory(selection).createPropertiesEditingContext(adapterFactory, selection);
+					final EObjectPropertiesEditingContext propertiesEditingContext = (EObjectPropertiesEditingContext) contextFactoryProvider.getEditingContextFactory(selection).createPropertiesEditingContext(adapterFactory, selection);
+
+					propertiesEditingContext.setBindingManagerProvider(getBindingHandlerProvider(propertiesEditingContext));
+
+					// propertiesEditingContext.getEditingComponent();
 					propertiesEditingContext.getOptions().setOption(EEFSWTConstants.FORM_TOOLKIT, toolkit);
-					EClassBinding binding = propertiesEditingContext.getEditingComponent().getBinding();
-					PropertiesEditingContext reflectEditingContext = contextFactoryProvider.getEditingContextFactory(binding).createReflectivePropertiesEditingContext(adapterFactory, binding);
-					reflectEditingContext.getOptions().setOption(EEFSWTConstants.FORM_TOOLKIT, toolkit);
 					bindingPreviewViewer.setInput(propertiesEditingContext);
 				}
 			}
 
 		}
 
+		/**
+		 * @param propertiesEditingContext
+		 * @return the bindingHandlerProvider
+		 */
+		public DelegatingBindingHandlerProvider getBindingHandlerProvider(EObjectPropertiesEditingContext propertiesEditingContext) {
+			if (bindingHandlerProvider == null) {
+				bindingHandlerProvider = new DelegatingBindingHandlerProvider(propertiesEditingContext.getEMFServiceProvider(), propertiesEditingContext.getBindingManagerProvider());
+			}
+			return bindingHandlerProvider;
+		}
+
 	}
 
 	public void setInput(EditingDomain editingDomain) {
@@ -452,4 +477,93 @@ public class EEFReflectiveView extends ViewPart {
 			modelViewer.getViewer().setInput(editingDomain.getResourceSet());
 		}
 	}
+
+	public void refresh() {
+		bindingPreviewViewer.refresh();
+	}
+
+	private class DelegatingBindingHandlerProvider implements BindingHandlerProvider {
+
+		private EMFServiceProvider emfServiceProvider;
+		private DelegatingBindingHandler bindingHandler;
+		private BindingHandlerProvider delegatedBindingHandlerProvider;
+
+		/**
+		 * @param emfServiceProvider
+		 *            EMFServiceProvider
+		 * @param bindingHandlerProvider
+		 */
+		public DelegatingBindingHandlerProvider(EMFServiceProvider emfServiceProvider, BindingHandlerProvider bindingHandlerProvider) {
+			this.emfServiceProvider = emfServiceProvider;
+			this.delegatedBindingHandlerProvider = bindingHandlerProvider;
+		}
+
+		/**
+		 * (non-Javadoc)
+		 * 
+		 * @see org.eclipse.emf.eef.runtime.binding.BindingHandlerProvider#getBindingHandler(org.eclipse.emf.ecore.EObject)
+		 */
+		public PropertiesBindingHandler getBindingHandler(EObject target) {
+			if (bindingHandler == null) {
+				bindingHandler = new DelegatingBindingHandler(emfServiceProvider, (PropertiesBindingHandlerImpl) delegatedBindingHandlerProvider.getBindingHandler(target));
+			}
+			return bindingHandler;
+		}
+
+	}
+
+	private class DelegatingBindingHandler extends PropertiesBindingHandlerUIImpl {
+
+		private EEFBindingSettingsProvider bindingSettingsProvider;
+
+		/**
+		 * @param emfServiceProvider
+		 *            EMFServiceProvider
+		 * @param propertiesBindingHandler
+		 * @param delegatedBindingHandlerProvider
+		 */
+		public DelegatingBindingHandler(EMFServiceProvider emfServiceProvider, PropertiesBindingHandlerImpl propertiesBindingHandler) {
+			setEMFServiceProvider(emfServiceProvider);
+			setLockPolicyFactoryProvider(propertiesBindingHandler.getLockPolicyFactoryProvider());
+		}
+
+		/**
+		 * (non-Javadoc)
+		 * 
+		 * @see org.eclipse.emf.eef.runtime.internal.binding.PropertiesBindingHandlerImpl#getBindingSettingsProvider()
+		 */
+		public EEFBindingSettingsProvider getBindingSettingsProvider() {
+			if (bindingSettingsProvider == null) {
+				bindingSettingsProvider = new DelegatingBindingSettingsProvider(getEMFServiceProvider());
+			}
+			return bindingSettingsProvider;
+		}
+
+	}
+
+	private class DelegatingBindingSettingsProvider implements EEFBindingSettingsProvider {
+
+		private EMFServiceProvider emfServiceProvider;
+
+		/**
+		 * @param emfServiceProvider
+		 *            EMFServiceProvider
+		 */
+		public DelegatingBindingSettingsProvider(EMFServiceProvider emfServiceProvider) {
+			this.emfServiceProvider = emfServiceProvider;
+		}
+
+		/**
+		 * (non-Javadoc)
+		 * 
+		 * @see org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettingsProvider#getBindingSettings(org.eclipse.emf.ecore.EPackage)
+		 */
+		public <T extends EObject> EEFBindingSettings<T> getBindingSettings(EPackage ePackage) {
+			EditorBindingSettings editorBindingSettings = new EditorBindingSettings();
+			editorBindingSettings.setEMFServiceProvider(emfServiceProvider);
+			return (EEFBindingSettings<T>) editorBindingSettings;
+		}
+
+	}
+
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.eef.runtime.ui.swt/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.runtime.ui.swt/META-INF/MANIFEST.MF
index 4c7aa6fbd..b2578a6e4 100644
--- a/plugins/org.eclipse.emf.eef.runtime.ui.swt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.eef.runtime.ui.swt/META-INF/MANIFEST.MF
@@ -92,6 +92,7 @@ Import-Package: com.google.common.base;version="10.0.1",
  org.osgi.service.event;version="1.2.0"
 Bundle-Activator: org.eclipse.emf.eef.runtime.ui.swt.EEFRuntimeUISWT$Plugin
 Export-Package: org.eclipse.emf.eef.runtime.ui.swt,
+ org.eclipse.emf.eef.runtime.ui.swt.internal.binding;x-friends:="org.eclipse.emf.eef.editor",
  org.eclipse.emf.eef.runtime.ui.swt.internal.binding.settings;x-friends:="org.eclipse.emf.eef.runtime.tests,org.eclipse.emf.eef.editor",
  org.eclipse.emf.eef.runtime.ui.swt.internal.policies.processors;x-friends:="org.eclipse.emf.eef.runtime.tests",
  org.eclipse.emf.eef.runtime.ui.swt.internal.policies.request;x-friends:="org.eclipse.emf.eef.runtime.tests",
diff --git a/plugins/org.eclipse.emf.eef.runtime.ui/src/org/eclipse/emf/eef/runtime/ui/view/propertyeditors/impl/EEFToolkitImpl.java b/plugins/org.eclipse.emf.eef.runtime.ui/src/org/eclipse/emf/eef/runtime/ui/view/propertyeditors/impl/EEFToolkitImpl.java
index 8a7e7ab78..d87643382 100644
--- a/plugins/org.eclipse.emf.eef.runtime.ui/src/org/eclipse/emf/eef/runtime/ui/view/propertyeditors/impl/EEFToolkitImpl.java
+++ b/plugins/org.eclipse.emf.eef.runtime.ui/src/org/eclipse/emf/eef/runtime/ui/view/propertyeditors/impl/EEFToolkitImpl.java
@@ -90,7 +90,7 @@ public abstract class EEFToolkitImpl<T> implements EEFToolkit<T> {
 	 * @param editingEvent
 	 */
 	public final void firePropertiesChanged(PropertiesEditingComponent editingComponent, PropertiesEditingEvent editingEvent) {
-		editingComponent.getEditingContext().getBindingManagerProvider().getBindingManager(editingComponent.getEObject()).firePropertiesChanged(editingComponent, editingEvent);
+		editingComponent.getEditingContext().getBindingManagerProvider().getBindingHandler(editingComponent.getEObject()).firePropertiesChanged(editingComponent, editingEvent);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.emf.eef.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.eef.runtime/META-INF/MANIFEST.MF
index a89694c4b..e743d433f 100644
--- a/plugins/org.eclipse.emf.eef.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.eef.runtime/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Export-Package: org.eclipse.emf.eef.runtime.binding,
  org.eclipse.emf.eef.runtime.context.impl,
  org.eclipse.emf.eef.runtime.editingModel,
  org.eclipse.emf.eef.runtime.editingModel.util,
- org.eclipse.emf.eef.runtime.internal.binding;x-friends:="org.eclipse.emf.eef.runtime.tests,org.eclipse.emf.eef.runtime.ui.swt",
+ org.eclipse.emf.eef.runtime.internal.binding;x-friends:="org.eclipse.emf.eef.runtime.tests,org.eclipse.emf.eef.runtime.ui.swt,org.eclipse.emf.eef.editor",
  org.eclipse.emf.eef.runtime.internal.binding.settings;x-friends:="org.eclipse.emf.eef.runtime.tests",
  org.eclipse.emf.eef.runtime.internal.context;x-friends:="org.eclipse.emf.eef.runtime.tests",
  org.eclipse.emf.eef.runtime.internal.editingModel;x-friends:="org.eclipse.emf.eef.runtime.ui.swt",
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/BindingHandlerProvider.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/BindingHandlerProvider.java
index 78aef5516..6c5ab643e 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/BindingHandlerProvider.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/BindingHandlerProvider.java
@@ -14,15 +14,18 @@ import org.eclipse.emf.ecore.EObject;
 
 /**
  * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
- *
+ * 
  */
 public interface BindingHandlerProvider {
 
 	/**
-	 * Returns a {@link PropertiesBindingHandler} able to handle the given type of EObject.
-	 * @param target the {@link EObject} to manage.
+	 * Returns a {@link PropertiesBindingHandler} able to handle the given type
+	 * of EObject.
+	 * 
+	 * @param target
+	 *            the {@link EObject} to manage.
 	 * @return the most appropriate {@link PropertiesBindingHandler}.
 	 */
-	PropertiesBindingHandler getBindingManager(EObject target);
-	
+	PropertiesBindingHandler getBindingHandler(EObject target);
+
 }
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/PropertiesBindingHandler.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/PropertiesBindingHandler.java
index 6c27692cd..e59e82ef8 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/PropertiesBindingHandler.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/binding/PropertiesBindingHandler.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.eef.runtime.binding;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.eef.runtime.binding.settings.EEFBindingSettingsProvider;
 import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;
 import org.eclipse.emf.eef.runtime.notify.PropertiesEditingEvent;
 import org.eclipse.emf.eef.runtime.policies.PropertiesEditingPolicy;
@@ -31,6 +32,11 @@ public interface PropertiesBindingHandler extends EEFService<EObject> {
 	PropertiesEditingPolicyProvider getPolicyProvider();
 
 	/**
+	 * @return the current {@link EEFBindingSettingsProvider}
+	 */
+	EEFBindingSettingsProvider getBindingSettingsProvider();
+
+	/**
 	 * Creates a new {@link PropertiesEditingComponent}.
 	 * 
 	 * @param editingContext
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/BindingHandlerProviderImpl.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/BindingHandlerProviderImpl.java
index d93fc7a24..9f16e9584 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/BindingHandlerProviderImpl.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/BindingHandlerProviderImpl.java
@@ -23,9 +23,9 @@ public class BindingHandlerProviderImpl extends EEFServiceProviderImpl<EObject,
 
 	/**
 	 * {@inheritDoc}
-	 * @see org.eclipse.emf.eef.runtime.binding.BindingHandlerProvider#getBindingManager(org.eclipse.emf.ecore.EObject)
+	 * @see org.eclipse.emf.eef.runtime.binding.BindingHandlerProvider#getBindingHandler(org.eclipse.emf.ecore.EObject)
 	 */
-	public PropertiesBindingHandler getBindingManager(EObject target) {
+	public PropertiesBindingHandler getBindingHandler(EObject target) {
 		return getService(target);
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/PropertiesBindingHandlerImpl.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/PropertiesBindingHandlerImpl.java
index c408d4a02..28150afcf 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/PropertiesBindingHandlerImpl.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/binding/PropertiesBindingHandlerImpl.java
@@ -120,6 +120,13 @@ public class PropertiesBindingHandlerImpl implements PropertiesBindingHandler, E
 	}
 
 	/**
+	 * @return the bindingSettingsProvider
+	 */
+	public EEFBindingSettingsProvider getBindingSettingsProvider() {
+		return bindingSettingsProvider;
+	}
+
+	/**
 	 * @param viewHandlerProvider
 	 */
 	public final void setViewHandlerProvider(ViewHandlerProvider viewHandlerProvider) {
@@ -143,6 +150,13 @@ public class PropertiesBindingHandlerImpl implements PropertiesBindingHandler, E
 	}
 
 	/**
+	 * @return the emfServiceProvider
+	 */
+	public EMFServiceProvider getEMFServiceProvider() {
+		return emfServiceProvider;
+	}
+
+	/**
 	 * @return the eefEditingServiceProvider
 	 */
 	public EEFEditingServiceProvider getEEFEditingServiceProvider() {
@@ -174,6 +188,20 @@ public class PropertiesBindingHandlerImpl implements PropertiesBindingHandler, E
 	}
 
 	/**
+	 * @return the lockPolicyFactoryProvider
+	 */
+	public EEFLockPolicyFactoryProvider getLockPolicyFactoryProvider() {
+		return lockPolicyFactoryProvider;
+	}
+
+	/**
+	 * @return the lockManagerProvider
+	 */
+	public EEFLockManagerProvider getLockManagerProvider() {
+		return lockManagerProvider;
+	}
+
+	/**
 	 * @param lockManager
 	 *            the lockManager to set
 	 */
@@ -217,7 +245,7 @@ public class PropertiesBindingHandlerImpl implements PropertiesBindingHandler, E
 			Notifier highestNotifier = emfService.highestNotifier(eObject);
 			initModelChangesNotifierIfNeeded(highestNotifier);
 			if (editingContext instanceof EObjectPropertiesEditingContext) {
-				EEFBindingSettings<PropertiesEditingModel> bindingSettings = bindingSettingsProvider.getBindingSettings(eObject.eClass().getEPackage());
+				EEFBindingSettings<PropertiesEditingModel> bindingSettings = getBindingSettingsProvider().getBindingSettings(eObject.eClass().getEPackage());
 				component = new PropertiesEditingComponentImpl(bindingSettings, eObject);
 			} else if (editingContext instanceof ReflectivePropertiesEditingContext) {
 				EObject eefDescription = ((ReflectivePropertiesEditingContext) editingContext).getEObject();
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/EObjectPropertiesEditingContext.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/EObjectPropertiesEditingContext.java
index 48af537a9..6f94ea4cd 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/EObjectPropertiesEditingContext.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/EObjectPropertiesEditingContext.java
@@ -185,7 +185,7 @@ public class EObjectPropertiesEditingContext implements PropertiesEditingContext
 	 */
 	public PropertiesEditingComponent getEditingComponent() {
 		if (component == null) {
-			component = bindingHandlerProvider.getBindingManager(eObject).createComponent(this);
+			component = bindingHandlerProvider.getBindingHandler(eObject).createComponent(this);
 		}
 		return component;
 	}
@@ -210,7 +210,7 @@ public class EObjectPropertiesEditingContext implements PropertiesEditingContext
 	 * @see org.eclipse.emf.eef.runtime.context.PropertiesEditingContext#disposeComponent(org.eclipse.emf.eef.runtime.binding.PropertiesEditingComponent)
 	 */
 	public void disposeComponent(PropertiesEditingComponent editingComponent) {
-		bindingHandlerProvider.getBindingManager(editingComponent.getEObject()).disposeComponent(editingComponent);
+		bindingHandlerProvider.getBindingHandler(editingComponent.getEObject()).disposeComponent(editingComponent);
 	}
 
 	/**
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/ReflectivePropertiesEditingContext.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/ReflectivePropertiesEditingContext.java
index 919524a50..741903590 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/ReflectivePropertiesEditingContext.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/context/ReflectivePropertiesEditingContext.java
@@ -160,7 +160,7 @@ public class ReflectivePropertiesEditingContext implements PropertiesEditingCont
 	 */
 	public PropertiesEditingComponent getEditingComponent() {
 		if (component == null) {
-			component = bindingHandlerProvider.getBindingManager(eObject).createComponent(this);
+			component = bindingHandlerProvider.getBindingHandler(eObject).createComponent(this);
 		}
 		return component;
 	}
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/policies/processors/DirectEditingPolicyProcessor.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/policies/processors/DirectEditingPolicyProcessor.java
index c728295af..af9b2f241 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/policies/processors/DirectEditingPolicyProcessor.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/internal/policies/processors/DirectEditingPolicyProcessor.java
@@ -173,11 +173,11 @@ public class DirectEditingPolicyProcessor implements EditingPolicyProcessor {
 			EObject editedElement = (EObject)value;
 			PropertiesEditingContextFactory factory = editingContext.getContextFactoryProvider().getEditingContextFactory(editedElement);
 			PropertiesEditingContext subPropertiesEditingContext = factory.createPropertiesEditingContext(editingContext, editedElement);
-			PropertiesEditingPolicyProvider editingPolicyProvider = editingContext.getBindingManagerProvider().getBindingManager(editedElement).getPolicyProvider();
+			PropertiesEditingPolicyProvider editingPolicyProvider = editingContext.getBindingManagerProvider().getBindingHandler(editedElement).getPolicyProvider();
 			//I'm quite confident in this cast 
 			PropertiesEditingPolicy subElementEditingPolicy = editingPolicyProvider.getEditingPolicy((SemanticPropertiesEditingContext) subPropertiesEditingContext);
 			PropertiesEditingComponent editingComponent = editingContext.getEditingComponent();
-			editingContext.getBindingManagerProvider().getBindingManager(editingComponent.getEObject()).execute(editingComponent, subElementEditingPolicy, subPropertiesEditingContext);
+			editingContext.getBindingManagerProvider().getBindingHandler(editingComponent.getEObject()).execute(editingComponent, subElementEditingPolicy, subPropertiesEditingContext);
 		}
 	}
 
diff --git a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/notify/ViewChangeNotifier.java b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/notify/ViewChangeNotifier.java
index 9684b3e1a..d9c673513 100644
--- a/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/notify/ViewChangeNotifier.java
+++ b/plugins/org.eclipse.emf.eef.runtime/src/org/eclipse/emf/eef/runtime/notify/ViewChangeNotifier.java
@@ -39,7 +39,7 @@ public class ViewChangeNotifier implements PropertyChangeListener {
 	 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
 	 */
 	public void propertyChange(PropertyChangeEvent evt) {
-		bindingHandlerProvider.getBindingManager(component.getEObject()).firePropertiesChanged(component, new PropertiesEditingEventImpl(
+		bindingHandlerProvider.getBindingHandler(component.getEObject()).firePropertiesChanged(component, new PropertiesEditingEventImpl(
 				evt.getSource(), evt.getPropertyName(), 
 				((evt instanceof TypedPropertyChangedEvent)?((TypedPropertyChangedEvent)evt).getEventType():PropertiesEditingEvent.SET), 
 				evt.getOldValue(), evt.getNewValue()));
diff --git a/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/EventsProcessingTests.java b/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/EventsProcessingTests.java
index 6e1b46597..febbde33e 100644
--- a/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/EventsProcessingTests.java
+++ b/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/EventsProcessingTests.java
@@ -89,7 +89,7 @@ public class EventsProcessingTests extends NonUIEditingTestCase {
 	public void testUIEventsNonProcessing() {
 		commandStack.saveIsDone();
 		PropertiesEditingComponent editingComponent = editingContext.getEditingComponent();
-		environmentBuilder.getBindingHandlerProvider().getBindingManager(editingComponent.getEObject()).firePropertiesChanged(editingComponent, new MyEvent());
+		environmentBuilder.getBindingHandlerProvider().getBindingHandler(editingComponent.getEObject()).firePropertiesChanged(editingComponent, new MyEvent());
 		assertFalse("Command not performed but needed!", commandStack.isSaveNeeded());
 	}
 
diff --git a/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/PropertiesChangeDelayingTests.java b/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/PropertiesChangeDelayingTests.java
index f050c5a5d..bf1d42717 100644
--- a/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/PropertiesChangeDelayingTests.java
+++ b/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/core/notify/PropertiesChangeDelayingTests.java
@@ -74,7 +74,7 @@ public class PropertiesChangeDelayingTests extends NonUIEditingTestCase {
 		
 		// T0: We send an editingEvent
 		long timing = 0;
-		environmentBuilder.getBindingHandlerProvider().getBindingManager(editingComponent.getEObject()).firePropertiesChanged(editingComponent, new PropertiesEditingEventImpl(view1, "name", PropertiesEditingEvent.SET, null, NEW_CLASS_NAME, true));
+		environmentBuilder.getBindingHandlerProvider().getBindingHandler(editingComponent.getEObject()).firePropertiesChanged(editingComponent, new PropertiesEditingEventImpl(view1, "name", PropertiesEditingEvent.SET, null, NEW_CLASS_NAME, true));
 		assertFalse("Command performed too soon in the preliminary check.", commandStack.isSaveNeeded());
 		final long delay = 30;
 		editingContext.getOptions().setDelayedFirePropertiesChangedDelay(delay);
@@ -160,7 +160,7 @@ public class PropertiesChangeDelayingTests extends NonUIEditingTestCase {
 		 * @see java.lang.Runnable#run()
 		 */
 		public void run() {
-			environmentBuilder.getBindingHandlerProvider().getBindingManager(editingComponent.getEObject()).firePropertiesChanged(editingComponent, new PropertiesEditingEventImpl(view, "name", PropertiesEditingEvent.SET, null, newValue, true));			
+			environmentBuilder.getBindingHandlerProvider().getBindingHandler(editingComponent.getEObject()).firePropertiesChanged(editingComponent, new PropertiesEditingEventImpl(view, "name", PropertiesEditingEvent.SET, null, newValue, true));			
 		}
 		
 	}
diff --git a/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/ui/lock/EEFLockTests.java b/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/ui/lock/EEFLockTests.java
index 533aebeaf..e504dc129 100644
--- a/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/ui/lock/EEFLockTests.java
+++ b/tests/org.eclipse.emf.eef.runtime.tests/src-tests/org/eclipse/emf/eef/runtime/tests/ui/lock/EEFLockTests.java
@@ -283,7 +283,7 @@ public class EEFLockTests extends UIEditingTestCase {
 			
 			public void fireFeatureLock(EStructuralFeature feature, LockState state ) {
 				PropertiesEditingComponent editingComponent = EEFLockTests.this.editingContext.getEditingComponent();
-				myBuilder.getBindingHandlerProvider().getBindingManager(editingComponent.getEObject()).fireLockChanged(editingComponent, new EEFPropertyLockEventImpl(EEFLockTests.this.editedObject, feature, state));
+				myBuilder.getBindingHandlerProvider().getBindingHandler(editingComponent.getEObject()).fireLockChanged(editingComponent, new EEFPropertyLockEventImpl(EEFLockTests.this.editedObject, feature, state));
 			}
 			
 		}