Attachment 82061 Details for Bug 144260 – ObservableValueEditingSupport implementation

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] ObservableValueEditingSupport implementation

editingsupport.patch (text/plain), 22.98 KB, created by Brad Reynolds

on 2007-11-04 15:38:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Reynolds

Created: 2007-11-04 15:38:08 EST

Size: 22.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface.databinding
>Index: src/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.java
>===================================================================
>RCS file: src/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.java
>diff -N src/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jface/databinding/viewers/ObservableValueEditingSupport.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,220 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.jface.databinding.viewers;
>+
>+import org.eclipse.core.databinding.Binding;
>+import org.eclipse.core.databinding.DataBindingContext;
>+import org.eclipse.core.databinding.UpdateValueStrategy;
>+import org.eclipse.core.databinding.observable.value.IObservableValue;
>+import org.eclipse.core.runtime.Assert;
>+import org.eclipse.jface.viewers.CellEditor;
>+import org.eclipse.jface.viewers.ColumnViewer;
>+import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
>+import org.eclipse.jface.viewers.ColumnViewerEditorActivationListener;
>+import org.eclipse.jface.viewers.ColumnViewerEditorDeactivationEvent;
>+import org.eclipse.jface.viewers.EditingSupport;
>+import org.eclipse.jface.viewers.ViewerCell;
>+
>+/**
>+ * {@link EditingSupport} using the JFace Data Binding concepts to handle the
>+ * updating of an element from a {@link CellEditor}.
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class ObservableValueEditingSupport extends EditingSupport {
>+	/**
>+	 * Maintains references to the instances currently imployed while editing.
>+	 * Will be <code>null</code> when not editing.
>+	 */
>+	private EditingState editingState;
>+
>+	private final ColumnViewerEditorActivationListenerHelper activationListener = new ColumnViewerEditorActivationListenerHelper();
>+
>+	private ColumnViewer viewer;
>+
>+	private DataBindingContext dbc;
>+
>+	/**
>+	 * Constructs a new instance with the provided <code>viewer</code> and
>+	 * <code>dbc</code>.
>+	 * 
>+	 * @param viewer
>+	 *            viewer to edit
>+	 * @param dbc
>+	 *            dbc to create <code>Bindings</code>
>+	 */
>+	public ObservableValueEditingSupport(ColumnViewer viewer,
>+			DataBindingContext dbc) {
>+		super(viewer);
>+
>+		if (dbc == null) {
>+			throw new IllegalArgumentException("Parameter dbc was null."); //$NON-NLS-1$
>+		}
>+
>+		this.viewer = viewer;
>+		this.dbc = dbc;
>+	}
>+
>+	/**
>+	 * Default implementation always returns <code>true</code>.
>+	 * 
>+	 * @see org.eclipse.jface.viewers.EditingSupport#canEdit(java.lang.Object)
>+	 */
>+	protected boolean canEdit(Object element) {
>+		return true;
>+	}
>+
>+	/**
>+	 * Default implementation always returns <code>null</code> as this will be
>+	 * handled by the Binding.
>+	 * 
>+	 * @see org.eclipse.jface.viewers.EditingSupport#getValue(java.lang.Object)
>+	 */
>+	protected Object getValue(Object element) {
>+		// no op
>+		return null;
>+	}
>+
>+	/**
>+	 * Default implementation does nothing as this will be handled by the
>+	 * Binding.
>+	 * 
>+	 * @see org.eclipse.jface.viewers.EditingSupport#setValue(java.lang.Object,
>+	 *      java.lang.Object)
>+	 */
>+	protected void setValue(Object element, Object value) {
>+		// no op
>+	}
>+
>+	/**
>+	 * Creates a {@link Binding} between the editor and the element to be
>+	 * edited. Invokes {@link #doCreateCellEditorObservable(CellEditor)},
>+	 * {@link #doCreateElementObservable(Object, ViewerCell)}, and then
>+	 * {@link #createBinding(IObservableValue, IObservableValue)}.
>+	 */
>+	final protected void initializeCellEditorValue(CellEditor cellEditor,
>+			ViewerCell cell) {
>+		IObservableValue target = doCreateCellEditorObservable(cellEditor);
>+		Assert
>+				.isNotNull(target,
>+						"doCreateCellEditorObservable(...) did not return an observable"); //$NON-NLS-1$
>+
>+		IObservableValue model = doCreateElementObservable(cell.getElement(),
>+				cell);
>+		Assert.isNotNull(model,
>+				"doCreateElementObservable(...) did not return an observable"); //$NON-NLS-1$
>+
>+		Binding binding = createBinding(target, model);
>+		Assert
>+				.isNotNull(binding,
>+						"createBinding(...) did not return a binding"); //$NON-NLS-1$
>+
>+		editingState = new EditingState(binding, target, model);
>+
>+		getViewer().getColumnViewerEditor().addEditorActivationListener(
>+				activationListener);
>+	}
>+
>+	/**
>+	 * Creates the observable value for the CellEditor.
>+	 * 
>+	 * @param cellEditor
>+	 * @return observable value
>+	 */
>+	protected abstract IObservableValue doCreateCellEditorObservable(
>+			CellEditor cellEditor);
>+
>+	/**
>+	 * Creates the observable value for the element.
>+	 * 
>+	 * @param element
>+	 * @param cell
>+	 * @return observable value
>+	 */
>+	protected abstract IObservableValue doCreateElementObservable(
>+			Object element, ViewerCell cell);
>+
>+	/**
>+	 * Creates a new binding for the provided <code>target</code> and
>+	 * <code>model</code>. Default
>+	 * {@link UpdateValueStrategy value update strategies} are used with the
>+	 * target to model updating on {@link UpdateValueStrategy#POLICY_CONVERT}.
>+	 * 
>+	 * @param target
>+	 * @param model
>+	 * @return binding
>+	 */
>+	protected Binding createBinding(IObservableValue target,
>+			IObservableValue model) {
>+		return dbc.bindValue(target, model, new UpdateValueStrategy(
>+				UpdateValueStrategy.POLICY_CONVERT), null);
>+	}
>+
>+	/**
>+	 * Updates the model from the target.
>+	 */
>+	final protected void saveCellEditorValue(CellEditor cellEditor,
>+			ViewerCell cell) {
>+		editingState.binding.updateTargetToModel();
>+	}
>+
>+	private class ColumnViewerEditorActivationListenerHelper extends
>+			ColumnViewerEditorActivationListener {
>+
>+		public void afterEditorActivated(ColumnViewerEditorActivationEvent event) {
>+			// do nothing
>+		}
>+
>+		public void afterEditorDeactivated(
>+				ColumnViewerEditorDeactivationEvent event) {
>+			editingState.dispose();
>+			editingState = null;
>+
>+			viewer.getColumnViewerEditor().removeEditorActivationListener(this);
>+		}
>+
>+		public void beforeEditorActivated(
>+				ColumnViewerEditorActivationEvent event) {
>+			// do nothing
>+		}
>+
>+		public void beforeEditorDeactivated(
>+				ColumnViewerEditorDeactivationEvent event) {
>+			// do nothing
>+		}
>+	}
>+
>+	/**
>+	 * Maintains references to objects that only live for the length of the edit
>+	 * cycle.
>+	 */
>+	private class EditingState {
>+		IObservableValue target;
>+
>+		IObservableValue model;
>+
>+		Binding binding;
>+
>+		EditingState(Binding binding, IObservableValue target,
>+				IObservableValue model) {
>+			this.binding = binding;
>+			this.target = target;
>+			this.model = model;
>+		}
>+
>+		void dispose() {
>+			target.dispose();
>+			model.dispose();
>+			binding.dispose();
>+		}
>+	}
>+}
>#P org.eclipse.jface.tests.databinding
>Index: src/org/eclipse/jface/tests/databinding/BindingTestSuite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java,v
>retrieving revision 1.61
>diff -u -r1.61 BindingTestSuite.java
>--- src/org/eclipse/jface/tests/databinding/BindingTestSuite.java	20 Oct 2007 20:44:42 -0000	1.61
>+++ src/org/eclipse/jface/tests/databinding/BindingTestSuite.java	4 Nov 2007 20:35:43 -0000
>@@ -109,6 +109,7 @@
> import org.eclipse.jface.tests.databinding.swt.SWTObservablesTest;
> import org.eclipse.jface.tests.databinding.viewers.ObservableMapLabelProviderTest;
> import org.eclipse.jface.tests.databinding.viewers.ObservableSetContentProviderTest;
>+import org.eclipse.jface.tests.databinding.viewers.ObservableValueEditingSupportTest;
> import org.eclipse.jface.tests.examples.databinding.mask.internal.EditMaskLexerAndTokenTest;
> import org.eclipse.jface.tests.examples.databinding.mask.internal.EditMaskParserTest;
> import org.eclipse.jface.tests.internal.databinding.internal.swt.ButtonObservableValueTest;
>@@ -277,6 +278,7 @@
> 		// org.eclipse.jface.tests.databinding.viewers
> 		addTestSuite(ObservableMapLabelProviderTest.class);
> 		addTestSuite(ObservableSetContentProviderTest.class);
>+		addTestSuite(ObservableValueEditingSupportTest.class);
> 		
> 		//org.eclipse.jface.tests.example.databinding.mask.internal
> 		addTestSuite(EditMaskLexerAndTokenTest.class);
>Index: src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java
>===================================================================
>RCS file: src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java
>diff -N src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jface/tests/databinding/viewers/ObservableValueEditingSupportTest.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,302 @@
>+/*******************************************************************************
>+ * Copyright (c) 2007 IBM Corporation 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:
>+ *     IBM Corporation - initial API and implementation
>+ ******************************************************************************/
>+
>+package org.eclipse.jface.tests.databinding.viewers;
>+
>+import org.eclipse.core.databinding.Binding;
>+import org.eclipse.core.databinding.DataBindingContext;
>+import org.eclipse.core.databinding.beans.BeansObservables;
>+import org.eclipse.core.databinding.observable.IChangeListener;
>+import org.eclipse.core.databinding.observable.IStaleListener;
>+import org.eclipse.core.databinding.observable.Realm;
>+import org.eclipse.core.databinding.observable.list.WritableList;
>+import org.eclipse.core.databinding.observable.map.IObservableMap;
>+import org.eclipse.core.databinding.observable.value.IObservableValue;
>+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
>+import org.eclipse.core.tests.internal.databinding.internal.beans.Bean;
>+import org.eclipse.jface.databinding.swt.SWTObservables;
>+import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
>+import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
>+import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
>+import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
>+import org.eclipse.jface.viewers.CellEditor;
>+import org.eclipse.jface.viewers.ColumnViewer;
>+import org.eclipse.jface.viewers.TableViewer;
>+import org.eclipse.jface.viewers.TableViewerColumn;
>+import org.eclipse.jface.viewers.TextCellEditor;
>+import org.eclipse.jface.viewers.ViewerCell;
>+import org.eclipse.swt.SWT;
>+import org.eclipse.swt.widgets.Composite;
>+import org.eclipse.swt.widgets.Shell;
>+import org.eclipse.swt.widgets.Text;
>+
>+public class ObservableValueEditingSupportTest extends AbstractSWTTestCase {
>+	private Shell shell;
>+
>+	private ObservableValueEditingSupportStub editingSupport;
>+
>+	private DataBindingContext dbc;
>+
>+	private TableViewer viewer;
>+
>+	private Bean bean;
>+
>+	/*
>+	 * (non-Javadoc)
>+	 * 
>+	 * @see org.eclipse.jface.tests.databinding.AbstractSWTTestCase#setUp()
>+	 */
>+	protected void setUp() throws Exception {
>+		super.setUp();
>+
>+		shell = getShell();
>+		dbc = new DataBindingContext();
>+
>+		viewer = new TableViewer(shell);
>+		TableViewerColumn column = new TableViewerColumn(viewer, SWT.NONE);
>+
>+		// Create a standard content provider
>+		ObservableListContentProvider peopleViewerContentProvider = new ObservableListContentProvider();
>+		viewer.setContentProvider(peopleViewerContentProvider);
>+
>+		// And a standard label provider that maps columns
>+		IObservableMap[] attributeMaps = BeansObservables.observeMaps(
>+				peopleViewerContentProvider.getKnownElements(), Bean.class,
>+				new String[] { "value" });
>+		viewer.setLabelProvider(new ObservableMapLabelProvider(attributeMaps));
>+
>+		editingSupport = new ObservableValueEditingSupportStub(viewer, dbc);
>+		column.setEditingSupport(editingSupport);
>+
>+		WritableList input = WritableList.withElementType(String.class);
>+		bean = new Bean();
>+		bean.setValue("value");
>+		input.add(bean);
>+		viewer.setInput(input);
>+	}
>+
>+	public void testInitializeCellEditorValue_OrderOfOperations()
>+			throws Exception {
>+		assertEquals("precondition", 0, editingSupport.events.length());
>+
>+		viewer.editElement(bean, 0);
>+		assertEquals(
>+				"createCellEditorObservable createElementObservable createBinding",
>+				editingSupport.events.toString());
>+	}
>+
>+	public void testSaveCellEditorValue_UpdatesModel() throws Exception {
>+		Text text = new Text(shell, SWT.NONE);
>+		shell.open();
>+
>+		String newValue = bean.getValue() + "a";
>+
>+		viewer.editElement(bean, 0);
>+		editingSupport.editor.setValue(newValue);
>+
>+		// force the focus to leave the editor updating the value
>+		text.setFocus();
>+
>+		assertEquals(newValue, bean.getValue());
>+	}
>+
>+	public void testDisposesBinding() throws Exception {
>+		Text text = new Text(shell, SWT.NONE);
>+		shell.open();
>+
>+		viewer.editElement(bean, 0);
>+		assertFalse("precondition", editingSupport.binding.isDisposed());
>+
>+		text.setFocus();
>+		assertTrue(editingSupport.binding.isDisposed());
>+	}
>+
>+	public void testDisposesTargetObservable() throws Exception {
>+		Text text = new Text(shell, SWT.NONE);
>+		shell.open();
>+
>+		viewer.editElement(bean, 0);
>+		assertEquals("precondition", 0, editingSupport.target.disposed);
>+
>+		text.setFocus();
>+		assertEquals(1, editingSupport.target.disposed);
>+	}
>+
>+	public void testDisposesModelObservable() throws Exception {
>+		Text text = new Text(shell, SWT.NONE);
>+		shell.open();
>+
>+		viewer.editElement(bean, 0);
>+		assertEquals("precondition", 0, editingSupport.model.disposed);
>+
>+		text.setFocus();
>+		assertEquals(1, editingSupport.model.disposed);
>+	}
>+
>+	public void testCanEdit_DefaultIsTrue() throws Exception {
>+		assertTrue(editingSupport.canEdit(bean));
>+	}
>+
>+	private static class ObservableValueEditingSupportStub extends
>+			ObservableValueEditingSupport {
>+		StringBuffer events = new StringBuffer();
>+
>+		TextCellEditor editor;
>+
>+		Binding binding;
>+
>+		ObservableValueDecorator target;
>+
>+		ObservableValueDecorator model;
>+
>+		/**
>+		 * @param viewer
>+		 * @param dbc
>+		 */
>+		public ObservableValueEditingSupportStub(ColumnViewer viewer,
>+				DataBindingContext dbc) {
>+			super(viewer, dbc);
>+			editor = new TextCellEditor((Composite) viewer.getControl());
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport#canEdit(java.lang.Object)
>+		 */
>+		protected boolean canEdit(Object element) {
>+			return super.canEdit(element);
>+		}
>+
>+		public CellEditor getCellEditor() {
>+			return editor;
>+		}
>+
>+		private void event(String event) {
>+			if (events.length() > 0) {
>+				events.append(" ");
>+			}
>+
>+			events.append(event);
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport#createCellEditorObservable(org.eclipse.jface.viewers.CellEditor)
>+		 */
>+		protected IObservableValue doCreateCellEditorObservable(
>+				CellEditor cellEditor) {
>+			event("createCellEditorObservable");
>+
>+			return target = new ObservableValueDecorator(SWTObservables
>+					.observeText(cellEditor.getControl(), SWT.NONE));
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport#createElementObservable(java.lang.Object,
>+		 *      org.eclipse.jface.viewers.ViewerCell)
>+		 */
>+		protected IObservableValue doCreateElementObservable(Object element,
>+				ViewerCell cell) {
>+			event("createElementObservable");
>+			return model = new ObservableValueDecorator(BeansObservables
>+					.observeValue(element, "value"));
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport#createBinding(org.eclipse.core.databinding.observable.value.IObservableValue,
>+		 *      org.eclipse.core.databinding.observable.value.IObservableValue)
>+		 */
>+		protected Binding createBinding(IObservableValue target,
>+				IObservableValue model) {
>+			event("createBinding");
>+
>+			return binding = super.createBinding(target, model);
>+		}
>+
>+		/*
>+		 * (non-Javadoc)
>+		 * 
>+		 * @see org.eclipse.jface.viewers.EditingSupport#getCellEditor(java.lang.Object)
>+		 */
>+		protected CellEditor getCellEditor(Object element) {
>+			return editor;
>+		}
>+	}
>+
>+	/**
>+	 * Decorator that will allow for tracking calls to dispose(). We really need
>+	 * an isDisposed() method on IObservable...
>+	 */
>+	private static class ObservableValueDecorator implements IObservableValue {
>+		int disposed;
>+
>+		IObservableValue delegate;
>+
>+		ObservableValueDecorator(IObservableValue delegate) {
>+			this.delegate = delegate;
>+		}
>+
>+		public synchronized void dispose() {
>+			disposed++;
>+			delegate.dispose();
>+		}
>+
>+		public void addChangeListener(IChangeListener listener) {
>+			delegate.addChangeListener(listener);
>+		}
>+
>+		public void addStaleListener(IStaleListener listener) {
>+			delegate.addStaleListener(listener);
>+		}
>+
>+		public void addValueChangeListener(IValueChangeListener listener) {
>+			delegate.addValueChangeListener(listener);
>+		}
>+
>+		public Realm getRealm() {
>+			return delegate.getRealm();
>+		}
>+
>+		public Object getValue() {
>+			return delegate.getValue();
>+		}
>+
>+		public Object getValueType() {
>+			return delegate.getValueType();
>+		}
>+
>+		public boolean isStale() {
>+			return delegate.isStale();
>+		}
>+
>+		public void removeChangeListener(IChangeListener listener) {
>+			delegate.removeChangeListener(listener);
>+		}
>+
>+		public void removeStaleListener(IStaleListener listener) {
>+			delegate.removeStaleListener(listener);
>+		}
>+
>+		public void removeValueChangeListener(IValueChangeListener listener) {
>+			delegate.removeValueChangeListener(listener);
>+		}
>+
>+		public void setValue(Object value) {
>+			delegate.setValue(value);
>+		}
>+	}
>+}
>#P org.eclipse.jface.examples.databinding
>Index: src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java,v
>retrieving revision 1.1
>diff -u -r1.1 Snippet013TableViewerEditing.java
>--- src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java	11 Apr 2007 01:21:31 -0000	1.1
>+++ src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java	4 Nov 2007 20:35:43 -0000
>@@ -17,9 +17,7 @@
> import java.util.LinkedList;
> import java.util.List;
> 
>-import org.eclipse.core.databinding.Binding;
> import org.eclipse.core.databinding.DataBindingContext;
>-import org.eclipse.core.databinding.UpdateValueStrategy;
> import org.eclipse.core.databinding.beans.BeansObservables;
> import org.eclipse.core.databinding.observable.Realm;
> import org.eclipse.core.databinding.observable.list.WritableList;
>@@ -28,13 +26,10 @@
> import org.eclipse.jface.databinding.swt.SWTObservables;
> import org.eclipse.jface.databinding.viewers.ObservableListContentProvider;
> import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
>+import org.eclipse.jface.databinding.viewers.ObservableValueEditingSupport;
> import org.eclipse.jface.databinding.viewers.ViewersObservables;
> import org.eclipse.jface.viewers.CellEditor;
> import org.eclipse.jface.viewers.ColumnViewer;
>-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
>-import org.eclipse.jface.viewers.ColumnViewerEditorActivationListener;
>-import org.eclipse.jface.viewers.ColumnViewerEditorDeactivationEvent;
>-import org.eclipse.jface.viewers.EditingSupport;
> import org.eclipse.jface.viewers.TableViewer;
> import org.eclipse.jface.viewers.TableViewerColumn;
> import org.eclipse.jface.viewers.TextCellEditor;
>@@ -151,93 +146,35 @@
> 	 * 
> 	 * @since 3.3
> 	 */
>-	static class InlineEditingSupport extends EditingSupport {
>-		private TextCellEditor editor;
>-
>-		private DataBindingContext bindingContext;
>-		/**
>-		 * The current binding.
>-		 */
>-		private Binding binding;
>-
>-		private final ColumnViewerEditorActivationListenerHelper activationListener = new ColumnViewerEditorActivationListenerHelper();
>-
>+	private static class InlineEditingSupport extends ObservableValueEditingSupport {
>+		private CellEditor cellEditor;
>+		
> 		/**
> 		 * @param viewer
>+		 * @param dbc
> 		 */
> 		public InlineEditingSupport(ColumnViewer viewer,
>-				DataBindingContext bindingContext) {
>-			super(viewer);
>-			this.editor = new TextCellEditor((Composite) viewer.getControl());
>-			this.bindingContext = bindingContext;
>-		}
>-
>-		protected boolean canEdit(Object element) {
>-			return true;
>+				DataBindingContext dbc) {
>+			
>+			super(viewer, dbc);
>+			cellEditor = new TextCellEditor((Composite) viewer.getControl());
> 		}
>-
>+		
> 		protected CellEditor getCellEditor(Object element) {
>-			return editor;
>-		}
>-
>-		protected Object getValue(Object element) {
>-			// Not needed
>-			return null;
>+			return cellEditor;
> 		}
> 
>-		protected void setValue(Object element, Object value) {
>-			// Not Needed
>+		protected IObservableValue doCreateCellEditorObservable(
>+				CellEditor cellEditor) {
>+			
>+			return SWTObservables.observeText(cellEditor
>+					.getControl(), SWT.Modify);
> 		}
> 
>-		protected void initializeCellEditorValue(CellEditor cellEditor,
>+		protected IObservableValue doCreateElementObservable(Object element,
> 				ViewerCell cell) {
>-			Object modelElement = cell.getElement();
>-			IObservableValue observableValue = BeansObservables.observeValue(
>-					modelElement, "name");
>-
>-			/*
>-			 * Creates a binding between the cell editor and the model that only
>-			 * updates the model when the current edit is saved.
>-			 */
>-			binding = bindingContext
>-					.bindValue(SWTObservables.observeText(cellEditor
>-							.getControl(), SWT.Modify), observableValue,
>-							new UpdateValueStrategy(
>-									UpdateValueStrategy.POLICY_CONVERT), null);
>-
>-			getViewer().getColumnViewerEditor().addEditorActivationListener(
>-					activationListener);
>-		}
>-
>-		protected void saveCellEditorValue(CellEditor cellEditor,
>-				ViewerCell cell) {
>-			binding.updateTargetToModel();
>-		}
>-
>-		private class ColumnViewerEditorActivationListenerHelper extends
>-				ColumnViewerEditorActivationListener {
>-
>-			public void afterEditorActivated(
>-					ColumnViewerEditorActivationEvent event) {
>-				// do nothing
>-			}
>-
>-			public void afterEditorDeactivated(
>-					ColumnViewerEditorDeactivationEvent event) {
>-				binding.dispose();
>-				binding = null;
>-			}
>-
>-			public void beforeEditorActivated(
>-					ColumnViewerEditorActivationEvent event) {
>-				// do nothing
>-			}
>-
>-			public void beforeEditorDeactivated(
>-					ColumnViewerEditorDeactivationEvent event) {
>-				// do nothing
>-			}
>-		}
>+			return BeansObservables.observeValue(element, "name");
>+		}		
> 	}
> 
> 	// The GUI view

Actions: View | Diff

Attachments on bug 144260: 42873 | 43411 | 45272 | 45438 | 82061 | 82072