Attachment #111993 for bug #194734

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

View | Details | Raw Unified | Return to bug 194734 | Differences between

and this patch

Collapse All | Expand All





package org.eclipse.jface.tests.databinding.swt;

import org.eclipse.core.databinding.observable.IDecoratingObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.jface.databinding.conformance.util.RealmTester;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;
import org.eclipse.jface.internal.databinding.swt.CComboObservableValue;
import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;
import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;
import org.eclipse.jface.internal.databinding.swt.ListObservableList;
import org.eclipse.jface.internal.databinding.swt.ListObservableValue;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;


	protected void setUp() throws Exception {
		super.setUp();

		shell = getShell();
		RealmTester.setDefault(SWTObservables.getRealm(shell.getDisplay()));
	}

	protected void tearDown() throws Exception {
		super.tearDown();

		RealmTester.setDefault(null);
	}


		Button button = new Button(shell, SWT.PUSH);
		ISWTObservableValue value = SWTObservables.observeSelection(button);
		assertNotNull(value);
		assertTrue(value.getWidget() == button);
	}

	public void testObserveSelectionOfCombo() throws Exception {
		Combo combo = new Combo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof ComboSelectionProperty);
	}

	public void testObserveSelectionOfCCombo() throws Exception {
		CCombo combo = new CCombo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		IDecoratingObservable decorating = (IDecoratingObservable) value;
		IPropertyObservable property = (IPropertyObservable) decorating
				.getDecorated();
		assertTrue(property.getProperty() instanceof CComboSelectionProperty);
	}

	public void testObserveSelectionOfList() throws Exception {
		List list = new List(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(list);
		assertNotNull(value);
		assertTrue(value.getWidget() == list);
	}

	public void testObserveSelectionOfScale() throws Exception {
		Scale scale = new Scale(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(scale);
		assertNotNull(value);
		assertTrue(value instanceof ScaleObservableValue);

		ScaleObservableValue scaleObservable = (ScaleObservableValue) value;
		assertEquals(SWTProperties.SELECTION, scaleObservable.getAttribute());
	}

		Combo combo = new Combo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeText(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		assertTrue(getPropertyObservable(value).getProperty() instanceof ComboTextProperty);
	}

	/**
	 * @param observable
	 * @return
	 */
	private IPropertyObservable getPropertyObservable(
			ISWTObservableValue observable) {
		IDecoratingObservable decoratingObservable = (IDecoratingObservable) observable;
		IPropertyObservable propertyObservable = (IPropertyObservable) decoratingObservable
				.getDecorated();
		return propertyObservable;
	}

	public void testObserveTextOfCCombo() throws Exception {
		CCombo combo = new CCombo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeText(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		IDecoratingObservable decorating = (IDecoratingObservable) value;
		IPropertyObservable property = (IPropertyObservable) decorating
				.getDecorated();
		assertTrue(property.getProperty() instanceof CComboTextProperty);
	}

	public void testObserveTextOfUnsupportedControl() throws Exception {

		Combo combo = new Combo(shell, SWT.NONE);
		IObservableList list = SWTObservables.observeItems(combo);
		assertNotNull(list);
		assertTrue(list instanceof ISWTObservable);
		assertTrue(((ISWTObservable) list).getWidget() == combo);
	}

	public void testObserveItemsOfCCombo() throws Exception {
		CCombo ccombo = new CCombo(shell, SWT.NONE);
		IObservableList list = SWTObservables.observeItems(ccombo);
		assertNotNull(list);
		ISWTObservable swtObservable = (ISWTObservable) list;
		assertTrue(swtObservable.getWidget() == ccombo);
	}

	public void testObserveItemsOfList() throws Exception {
		List list = new List(shell, SWT.NONE);
		IObservableList observableList = SWTObservables.observeItems(list);
		assertNotNull(observableList);
		ISWTObservable swtObservable = (ISWTObservable) observableList;
		assertTrue(swtObservable.getWidget() == list);
	}

	public void testObserveItemsOfUnsupportedControl() throws Exception {


		}
	}

	public void testObserveMinOfSpinner() throws Exception {
		Spinner spinner = new Spinner(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMin(spinner);
		assertNotNull(value);
		assertTrue(value instanceof SpinnerObservableValue);

		SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;
		assertEquals(SWTProperties.MIN, spinnerObservable.getAttribute());
	}

	public void testObserveMinOfScale() throws Exception {
		Scale scale = new Scale(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMin(scale);
		assertNotNull(value);
		assertTrue(value instanceof ScaleObservableValue);

		ScaleObservableValue scaleObservable = (ScaleObservableValue) value;
		assertEquals(SWTProperties.MIN, scaleObservable.getAttribute());
	}

		try {
			SWTObservables.observeMin(text);
			fail("Exception should have been thrown");
		} catch (IllegalArgumentException e) {
		}
	}

	public void testObserveMaxOfSpinner() throws Exception {
		Spinner spinner = new Spinner(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMax(spinner);
		assertNotNull(value);
		assertTrue(value instanceof SpinnerObservableValue);

		SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;
		assertEquals(SWTProperties.MAX, spinnerObservable.getAttribute());
	}

	public void testObserveMaxOfScale() throws Exception {
		Scale scale = new Scale(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMax(scale);
		assertNotNull(value);
		assertTrue(value instanceof ScaleObservableValue);

		ScaleObservableValue scaleObservable = (ScaleObservableValue) value;
		assertEquals(SWTProperties.MAX, scaleObservable.getAttribute());
	}

	public void testObserveMaxOfUnsupportedControl() throws Exception {
		Text text = new Text(shell, SWT.NONE);
		try {

		} catch (IllegalArgumentException e) {
		}
	}

	public void testObserveEditableOfText() throws Exception {
		Text text = new Text(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeEditable(text);
		assertNotNull(value);
		assertTrue(value instanceof TextEditableObservableValue);
	}

	public void testObserveEditableOfUnsupportedControl() throws Exception {
		Label label = new Label(shell, SWT.NONE);
		try {




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Matthew Hall - bugs 213145, 241585, 194734
 *******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.IMapChangeListener;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.map.MapChangeEvent;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.observable.set.WritableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.tests.databinding.observable.ThreadRealm;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
import org.eclipse.jface.databinding.conformance.util.CurrentRealm;


	private PropertyDescriptor propertyDescriptor;

	private IObservableMap map;
	private IBeanObservable beanObservable;

	protected void setUp() throws Exception {
		ThreadRealm realm = new ThreadRealm();

		set.add(model1);
		set.add(model2);

		String propertyName = "value";
		propertyDescriptor = ((IBeanProperty) BeanProperties.valueProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		map = BeansObservables.observeMap(set, Bean.class, propertyName);
		beanObservable = (IBeanObservable) map;
	}

	public void testGetValue() throws Exception {

	}
	
	public void testGetObserved() throws Exception {
		assertEquals(set, beanObservable.getObserved());
	}
	
	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}
	
	public void testConstructor_SkipRegisterListeners() throws Exception {

		Bean bean = new Bean();
		set.add(bean);
		
		IObservableMap observable = PojoObservables.observeMap(set, Bean.class,
				"value");
		assertFalse(bean.hasListeners("value"));
		ChangeEventTracker.observe(observable);

		assertFalse(bean.hasListeners("value"));

		Bean bean = new Bean();
		set.add(bean);
		
		IObservableMap observable = BeansObservables.observeMap(set,
				Bean.class, "value");
		assertFalse(bean.hasListeners("value"));
		ChangeEventTracker.observe(observable);

		assertTrue(bean.hasListeners("value"));




 *     Brad Reynolds - initial API and implementation
 *     Brad Reynolds - bug 171616
 *     Katarzyna Marszalek - test case for bug 198519
 *     Matthew Hall - bugs 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.ChangeEvent;
import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.ComputedValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.jface.databinding.conformance.MutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;

 */
public class JavaBeanObservableValueTest extends AbstractDefaultRealmTestCase {
	private Bean bean;
	private IObservableValue observableValue;
	private IBeanObservable beanObservable;
	private PropertyDescriptor propertyDescriptor;
	private String propertyName;

	/* (non-Javadoc)
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();
		
		bean = new Bean();
		propertyName = "value";
		propertyDescriptor = ((IBeanProperty) BeanProperties.valueProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		observableValue = BeansObservables.observeValue(bean, propertyName);
		beanObservable = (IBeanObservable) observableValue;
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
    	assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testSetValueThrowsExceptionThrownByBean() throws Exception {
		ThrowsSetException temp = new ThrowsSetException();
		IObservableValue observable = BeansObservables.observeValue(temp,
				"value");
				new PropertyDescriptor("value", ThrowsSetException.class));

		try {
			observable.setValue("");

	
	public void testGetValueThrowsExceptionThrownByBean() throws Exception {
		ThrowsGetException temp = new ThrowsGetException();
		IObservableValue observable = BeansObservables.observeValue(temp,
				"value");
				new PropertyDescriptor("value", ThrowsGetException.class));

		try {
			observable.getValue();

	}

	public void testConstructor_RegistersListeners() throws Exception {
		IObservableValue observable = BeansObservables.observeValue(bean,
				propertyName);
		ChangeEventTracker.observe(observable);
		
		assertTrue(bean.hasListeners(propertyName));
	}
	
	public void testConstructor_SkipRegisterListeners() throws Exception {
		IObservableValue observable = PojoObservables.observeValue(bean,
				propertyName);
		ChangeEventTracker.observe(observable);
		
		assertFalse(bean.hasListeners(propertyName));

		}
		
		public IObservableValue createObservableValue(Realm realm) {
			return BeansObservables.observeValue(realm, bean, "value");
				PropertyDescriptor propertyDescriptor = new PropertyDescriptor("value", Bean.class);
				return new JavaBeanObservableValue(realm, bean,
						propertyDescriptor);					
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
		}
		
		public void change(IObservable observable) {




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 221351, 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListChangeEvent;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker;

 */
public class JavaBeanObservableArrayBasedListTest extends
		AbstractDefaultRealmTestCase {
	private IObservableList list;
	private IBeanObservable beanObservable;

	private PropertyDescriptor propertyDescriptor;


		super.setUp();

		propertyName = "array";
		propertyDescriptor = ((IBeanProperty) BeanProperties.listProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		bean = new Bean(new Object[0]);

		list = BeansObservables.observeList(SWTObservables.getRealm(Display
				.getDefault()), bean, propertyName);
		beanObservable = (IBeanObservable) list;
	}

	public void testGetObserved() throws Exception {
		assertSame(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testRegistersListenerAfterFirstListenerIsAdded()

	}

	public void testRemoveAll() throws Exception {
		list.addAll(Arrays.asList(new String[] { "1", "2", "3", "4" }));
		list.addAll(elements);
		list.addAll(elements);

		assertEquals(4, bean.getArray().length);

		list.removeAll(Arrays.asList(new String[] { "2", "4" }));

		assertEquals(2, bean.getArray().length);
		assertEquals("1", bean.getArray()[0]);
		assertEquals("3", bean.getArray()[1]);
	}

	public void testRemoveAllListChangeEvent() throws Exception {

		PropertyChangeEvent event = listener.evt;
		assertEquals("event did not fire", 1, listener.count);
		assertEquals("array", event.getPropertyName());
		assertTrue("old value", Arrays.equals(old, (Object[]) event
				.getOldValue()));
		assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event
				.getNewValue()));
		assertFalse("lists are equal", Arrays.equals(bean.getArray(), old));
	}



		PropertyChangeEvent evt;

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
		 */
		public void propertyChange(PropertyChangeEvent evt) {
			count++;
			this.evt = evt;

		public IObservableCollection createObservableCollection(Realm realm,
				int elementCount) {
			String propertyName = "array";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
			Object bean = new Bean(new Object[0]);

			IObservableList list = BeansObservables.observeList(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				list.add(createElement(list));
			return list;




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 221351, 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.util.Arrays;
import java.util.HashSet;

import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.ISetChangeListener;
import org.eclipse.core.databinding.observable.set.SetChangeEvent;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.jface.databinding.conformance.MutableObservableSetContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;

 * @since 3.3
 */
public class JavaBeanObservableSetTest extends TestCase {
	private IObservableSet observableSet;
	private IBeanObservable beanObservable;
	private Bean bean;
	private PropertyDescriptor propertyDescriptor;
	private String propertyName;
	private SetChangeListener listener;

	/*
	 * (non-Javadoc)
	 * 
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		bean = new Bean();
		propertyName = "set";
		propertyDescriptor = ((IBeanProperty) BeanProperties.setProperty(
				Bean.class, propertyName)).getPropertyDescriptor();

		observableSet = BeansObservables
				.observeSet(SWTObservables.getRealm(Display.getDefault()),
						bean, propertyName, Bean.class);
		beanObservable = (IBeanObservable) observableSet;
		listener = new SetChangeListener();
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}
	
	public void testGetElementType() throws Exception {

	public void testConstructor_RegisterListeners() throws Exception {
		bean = new Bean();

		observableSet = BeansObservables.observeSet(new CurrentRealm(true),
				bean, propertyName);
		assertFalse(bean.hasListeners(propertyName));
		ChangeEventTracker.observe(observableSet);
		assertTrue(bean.hasListeners(propertyName));

	public void testConstructor_SkipsRegisterListeners() throws Exception {
		bean = new Bean();

		observableSet = PojoObservables.observeSet(new CurrentRealm(true),
				bean, propertyName);
		assertFalse(bean.hasListeners(propertyName));
		ChangeEventTracker.observe(observableSet);
		assertFalse(bean.hasListeners(propertyName));

				int elementCount) {
			Bean bean = new Bean();
			String propertyName = "set";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}

			IObservableSet set = BeansObservables.observeSet(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				set.add(createElement(set));
			return set;

Lines 7-12 Link Here

(-)src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableSetDecoratorTest.java (-11 / +18 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Brad Reynolds - initial API and implementation	9	* Brad Reynolds - initial API and implementation
		10	* Matthew Hall - bug 194734
10	******************************************************************************/	11	******************************************************************************/
11		12
12	package org.eclipse.core.tests.internal.databinding.beans;	13	package org.eclipse.core.tests.internal.databinding.beans;
Lines 15-22 Link Here
15		16
16	import junit.framework.TestCase;	17	import junit.framework.TestCase;
17		18
		19	import org.eclipse.core.databinding.beans.BeanProperties;
		20	import org.eclipse.core.databinding.beans.BeansObservables;
		21	import org.eclipse.core.databinding.beans.IBeanObservable;
		22	import org.eclipse.core.databinding.beans.IBeanProperty;
		23	import org.eclipse.core.databinding.observable.set.IObservableSet;
18	import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;	24	import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
19	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
20	import org.eclipse.jface.databinding.swt.SWTObservables;	25	import org.eclipse.jface.databinding.swt.SWTObservables;
21	import org.eclipse.swt.widgets.Display;	26	import org.eclipse.swt.widgets.Display;
22		27
Lines 25-31 Link Here
25	*/	30	*/
26	public class BeanObservableSetDecoratorTest extends TestCase {	31	public class BeanObservableSetDecoratorTest extends TestCase {
27	private PropertyDescriptor propertyDescriptor;	32	private PropertyDescriptor propertyDescriptor;
28	private JavaBeanObservableSet observableSet;	33	private IObservableSet observableSet;
		34	private IBeanObservable beanObservable;
29	private BeanObservableSetDecorator decorator;	35	private BeanObservableSetDecorator decorator;
30		36
31	/*	37	/*
Lines 37-57 Link Here
37	super.setUp();	43	super.setUp();
38		44
39	Bean bean = new Bean();	45	Bean bean = new Bean();
40	propertyDescriptor = new PropertyDescriptor("set",	46	String propertyName = "set";
41	Bean.class);	47	propertyDescriptor = ((IBeanProperty) BeanProperties.setProperty(
42	observableSet = new JavaBeanObservableSet(	48	Bean.class, propertyName)).getPropertyDescriptor();
43	SWTObservables.getRealm(Display.getDefault()), bean,	49	observableSet = BeansObservables.observeSet(SWTObservables
44	propertyDescriptor, String.class);	50	.getRealm(Display.getDefault()), bean, propertyName);
45	decorator = new BeanObservableSetDecorator(	51	beanObservable = (IBeanObservable) observableSet;
46	observableSet, observableSet, propertyDescriptor);	52	decorator = new BeanObservableSetDecorator(observableSet,
		53	propertyDescriptor);
47	}	54	}
48		55
49	public void testGetDelegate() throws Exception {	56	public void testGetDelegate() throws Exception {
50	assertEquals(observableSet, decorator.getDelegate());	57	assertEquals(observableSet, decorator.getDecorated());
51	}	58	}
52		59
53	public void testGetObserved() throws Exception {	60	public void testGetObserved() throws Exception {
54	assertEquals(observableSet, decorator.getObserved());	61	assertEquals(beanObservable.getObserved(), decorator.getObserved());
55	}	62	}
56		63
57	public void testGetPropertyDescriptor() throws Exception {	64	public void testGetPropertyDescriptor() throws Exception {




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 221351, 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListChangeEvent;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;

 * @since 1.1
 */
public class JavaBeanObservableListTest extends AbstractDefaultRealmTestCase {
	private IObservableList list;
	private IBeanObservable beanObservable;

	private PropertyDescriptor propertyDescriptor;


		super.setUp();

		propertyName = "list";
		propertyDescriptor = ((IBeanProperty) BeanProperties.listProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		bean = new Bean(new ArrayList());

		list = BeansObservables.observeList(SWTObservables.getRealm(Display
				.getDefault()), bean, propertyName);
		beanObservable = (IBeanObservable) list;
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testRegistersListenerAfterFirstListenerIsAdded()

	}

	public void testRemoveAll() throws Exception {
		list.addAll(Arrays.asList(new String[] { "1", "2", "3", "4" }));
		list.addAll(elements);
		list.addAll(elements);

		assertEquals(4, bean.getList().size());

		list.removeAll(Arrays.asList(new String[] { "2", "4" }));

		assertEquals(2, bean.getList().size());
		assertEquals("1", bean.getList().get(0));
		assertEquals("3", bean.getList().get(1));
	}

	public void testRemoveAllListChangeEvent() throws Exception {


	public void testConstructor_RegistersListener() throws Exception {
		Bean bean = new Bean();
		IObservableList observable = BeansObservables.observeList(Realm
				.getDefault(), bean, "list");
				new PropertyDescriptor("list", Bean.class), Bean.class);

		assertFalse(bean.hasListeners("list"));
		ChangeEventTracker.observe(observable);


	public void testConstructor_SkipsRegisterListener() throws Exception {
		Bean bean = new Bean();
		IObservableList observable = PojoObservables.observeList(Realm
				.getDefault(), bean, "list");
				new PropertyDescriptor("list", Bean.class), Bean.class, false);

		assertFalse(bean.hasListeners("list"));
		ChangeEventTracker.observe(observable);


		PropertyChangeEvent evt;

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
		 */
		public void propertyChange(PropertyChangeEvent evt) {
			count++;
			this.evt = evt;

		public IObservableCollection createObservableCollection(Realm realm,
				int elementCount) {
			String propertyName = "list";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
			Object bean = new Bean(new ArrayList());

			IObservableList list = BeansObservables.observeList(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				list.add(createElement(list));
			return list;




 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 221351)
 *     Brad Reynolds - through JavaBeanObservableArrayBasedListTest.java
 *     Matthew Hall - bugs 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.SetChangeEvent;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.jface.databinding.conformance.MutableObservableSetContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.SetChangeEventTracker;

 */
public class JavaBeanObservableArrayBasedSetTest extends
		AbstractDefaultRealmTestCase {
	private IObservableSet set;
	private IBeanObservable beanObservable;

	private PropertyDescriptor propertyDescriptor;


		super.setUp();

		propertyName = "array";
		propertyDescriptor = ((IBeanProperty) BeanProperties.setProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		bean = new Bean(new HashSet());

		set = BeansObservables.observeSet(SWTObservables.getRealm(Display
				.getDefault()), bean, propertyName);
		beanObservable = (IBeanObservable) set;
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testRegistersListenerAfterFirstListenerIsAdded()

		assertEquals("array", event.getPropertyName());
		assertTrue("old value", Arrays.equals(old, (Object[]) event
				.getOldValue()));
		assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event
				.getNewValue()));
		assertFalse("lists are equal", Arrays.equals(bean.getArray(), old));
	}



		PropertyChangeEvent evt;

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
		 */
		public void propertyChange(PropertyChangeEvent evt) {
			count++;
			this.evt = evt;

		public IObservableCollection createObservableCollection(Realm realm,
				int elementCount) {
			String propertyName = "array";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
			Object bean = new Bean(new Object[0]);

			IObservableSet list = BeansObservables.observeSet(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				list.add(createElement(list));
			return list;




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.PropertyDescriptor;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
import org.eclipse.swt.widgets.Display;

 */
public class BeanObservableValueDecoratorTest extends AbstractDefaultRealmTestCase {
	private Bean bean;
	private IObservableValue observableValue;
	private BeanObservableValueDecorator decorator;
	private PropertyDescriptor propertyDescriptor;
	
	/*
	 * (non-Javadoc)
	 * 
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();
		
		bean = new Bean();
		String propertyName = "value";
		propertyDescriptor = ((IBeanProperty) BeanProperties.valueProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		observableValue = BeansObservables.observeValue(SWTObservables
				.getRealm(Display.getDefault()), bean, propertyName);
		decorator = new BeanObservableValueDecorator(observableValue,
				propertyDescriptor);
		decorator = new BeanObservableValueDecorator(
				observableValue, new WritableValue(bean, Object.class), observableValue
						.getPropertyDescriptor());
	}

	public void testGetDelegate() throws Exception {
		assertEquals(observableValue, decorator.getDecorated());
	}
	
	public void testGetObserved() throws Exception {

Lines 21-26 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/DelayedObservableValueTest.java (-2 / +8 lines)
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	21	import org.eclipse.core.databinding.observable.value.IObservableValue;
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
		24	import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
24	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	25	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
25	import org.eclipse.jface.databinding.swt.SWTObservables;	26	import org.eclipse.jface.databinding.swt.SWTObservables;
26	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;	27	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
Lines 55-60 Link Here
55	newValue = new Object();	56	newValue = new Object();
56	target.setValue(oldValue);	57	target.setValue(oldValue);
57	delayed = new DelayedObservableValue(1, target);	58	delayed = new DelayedObservableValue(1, target);
		59	// force listeners to be added to target
		60
		61	ChangeEventTracker.observe(delayed);
58	}	62	}
59		63
60	protected void tearDown() throws Exception {	64	protected void tearDown() throws Exception {
Lines 231-239 Link Here
231	}	235	}
232		236
233	public static Test suite() {	237	public static Test suite() {
234	TestSuite suite = new TestSuite(DelayedObservableValueTest.class.getName());	238	TestSuite suite = new TestSuite(DelayedObservableValueTest.class
		239	.getName());
235	suite.addTestSuite(DelayedObservableValueTest.class);	240	suite.addTestSuite(DelayedObservableValueTest.class);
236	suite.addTest(SWTMutableObservableValueContractTest.suite(new Delegate()));	241	suite.addTest(SWTMutableObservableValueContractTest
		242	.suite(new Delegate()));
237	return suite;	243	return suite;
238	}	244	}
239		245




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Display;

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(CComboObservableValueTextTest.class
				.getName());
		suite.addTestSuite(CComboObservableValueTextTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(
					PropertyObservables.observeValue(realm, combo,
							CComboProperties.textProperty()), combo);
		}

		public void change(IObservable observable) {
			IObservableValue ov = (IObservableValue) observable;
			ov.setValue(createValue(ov));
		}

		public Object getValueType(IObservableValue observable) {




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Display;

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ComboObservableValueTextTest.class
				.toString());
		suite.addTestSuite(ComboObservableValueTextTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(
					PropertyObservables.observeValue(realm, combo,
							ComboProperties.textProperty()), combo);
		}

		public void change(IObservable observable) {
			((IObservableValue) observable)
					.setValue(createValue((IObservableValue) observable));
		}

		public Object getValueType(IObservableValue observable) {





package org.eclipse.jface.tests.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
import org.eclipse.swt.SWT;


	protected void setUp() throws Exception {
		super.setUp();

		shell = new Shell();
	}


	}

	public void testSetValueEnabled() throws Exception {
		ISWTObservableValue observableValue = SWTObservables
				.observeEnabled(shell);
		Boolean value = Boolean.FALSE;
		observableValue.setValue(value);
		assertFalse(shell.isEnabled());
	}

	public void testGetValueEnabled() throws Exception {
		ISWTObservableValue value = SWTObservables.observeEnabled(shell);
				SWTProperties.ENABLED);
		shell.setEnabled(false);
		assertEquals(Boolean.FALSE, value.getValue());
	}

	public void testGetValueTypeEnabled() throws Exception {
		ISWTObservableValue value = SWTObservables.observeEnabled(shell);
				SWTProperties.ENABLED);
		assertEquals(boolean.class, value.getValueType());
	}

	public void testSetValueVisible() throws Exception {
		ISWTObservableValue value = SWTObservables.observeVisible(shell);
				SWTProperties.VISIBLE);
		value.setValue(Boolean.FALSE);
		assertFalse(shell.isVisible());
	}

	public void testGetValueVisible() throws Exception {
		ISWTObservableValue value = SWTObservables.observeVisible(shell);
				SWTProperties.VISIBLE);
		shell.setVisible(false);
		assertEquals(Boolean.FALSE, value.getValue());
	}

	public void testGetValueTypeVisible() throws Exception {
		ISWTObservableValue value = SWTObservables.observeVisible(shell);
				SWTProperties.VISIBLE);
		assertEquals(Boolean.TYPE, value.getValueType());
	}

	public void testSetValueForeground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeForeground(shell);
				SWTProperties.FOREGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);


	}

	public void testGetValueForeground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeForeground(shell);
				SWTProperties.FOREGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);
		shell.setForeground(color);

	}

	public void testGetValueTypeForgroundColor() throws Exception {
		ISWTObservableValue value = SWTObservables.observeForeground(shell);
				SWTProperties.FOREGROUND);
		assertEquals(Color.class, value.getValueType());
	}

	public void testGetValueBackground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeBackground(shell);
				SWTProperties.BACKGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);
		shell.setBackground(color);

	}

	public void testSetValueBackground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeBackground(shell);
				SWTProperties.BACKGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);


	}

	public void testGetValueTypeBackgroundColor() throws Exception {
		ISWTObservableValue value = SWTObservables.observeBackground(shell);
				SWTProperties.BACKGROUND);
		assertEquals(Color.class, value.getValueType());
	}

	public void testGetValueTypeTooltip() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		assertEquals(String.class, value.getValueType());
	}

	public void testSetValueFont() throws Exception {
		ISWTObservableValue value = SWTObservables.observeFont(shell);
				SWTProperties.FONT);

		Font font = JFaceResources.getDialogFont();


	}

	public void testGetValueFont() throws Exception {
		ISWTObservableValue value = SWTObservables.observeFont(shell);
				SWTProperties.FONT);

		Font font = JFaceResources.getDialogFont();
		shell.setFont(font);

	}

	public void testGetValueTypeFont() throws Exception {
		ISWTObservableValue value = SWTObservables.observeFont(shell);
				SWTProperties.FONT);
		assertEquals(Font.class, value.getValueType());
	}

	public void testSetValueTooltipText() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		String text = "text";
		value.setValue(text);
		assertEquals(text, shell.getToolTipText());
	}

	public void testGetValueTooltipText() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		String text = "text";
		shell.setToolTipText(text);
		assertEquals(text, value.getValue());
	}

	public void testGetValueTypeTooltipText() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		assertEquals(String.class, value.getValueType());
	}
}

Lines 12-20 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueTest.java (-16 / +21 lines)
12		12
13	package org.eclipse.jface.tests.internal.databinding.swt;	13	package org.eclipse.jface.tests.internal.databinding.swt;
14		14
		15	import org.eclipse.core.databinding.observable.value.IObservableValue;
		16	import org.eclipse.core.databinding.property.IValueProperty;
		17	import org.eclipse.core.databinding.property.PropertyObservables;
15	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	18	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
16	import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;	19	import org.eclipse.jface.databinding.swt.ComboProperties;
17	import org.eclipse.jface.internal.databinding.swt.SWTProperties;	20	import org.eclipse.jface.databinding.swt.SWTObservables;
		21	import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
		22	import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
18	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;	23	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
19	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.widgets.Combo;	25	import org.eclipse.swt.widgets.Combo;
Lines 26-33 Link Here
26	public class ComboObservableValueTest extends AbstractSWTTestCase {	31	public class ComboObservableValueTest extends AbstractSWTTestCase {
27	public void testDispose() throws Exception {	32	public void testDispose() throws Exception {
28	Combo combo = new Combo(getShell(), SWT.NONE);	33	Combo combo = new Combo(getShell(), SWT.NONE);
29	ComboObservableValue observableValue = new ComboObservableValue(combo,	34	IObservableValue observableValue = SWTObservables.observeText(combo);
30	SWTProperties.TEXT);
31	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();	35	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();
32	observableValue.addValueChangeListener(testCounterValueChangeListener);	36	observableValue.addValueChangeListener(testCounterValueChangeListener);
33		37
Lines 51-75 Link Here
51	}	55	}
52		56
53	public void testSetValueWithNull() {	57	public void testSetValueWithNull() {
54	testSetValueWithNull(SWTProperties.TEXT);	58	testSetValueWithNull(ComboProperties.textProperty());
55	testSetValueWithNull(SWTProperties.SELECTION);	59	testSetValueWithNull(ComboProperties.selectionProperty());
56	}	60	}
57		61
58	protected void testSetValueWithNull(String observableMode) {	62	protected void testSetValueWithNull(IValueProperty property) {
59	Combo combo = new Combo(getShell(), SWT.NONE);	63	Combo combo = new Combo(getShell(), SWT.NONE);
60	combo.setItems(new String[] {"one", "two", "three"});	64	combo.setItems(new String[] { "one", "two", "three" });
61	ComboObservableValue observable = new ComboObservableValue(	65	IObservableValue observable = PropertyObservables.observeValue(combo,
62	combo, observableMode);	66	property);
63		67
64	observable.doSetValue("two");	68	observable.setValue("two");
65	assertEquals("two", combo.getText());	69	assertEquals("two", combo.getText());
66	if (observableMode.equals(SWTProperties.SELECTION)) {	70	if (property instanceof ComboSelectionProperty) {
67	assertEquals("expect selection at index 1 in mode " + observableMode, 1, combo.getSelectionIndex());	71	assertEquals("expect selection at index 1 in selection mode", 1,
		72	combo.getSelectionIndex());
68	}	73	}
69		74
70	if (observableMode.equals(SWTProperties.TEXT)) {	75	if (property instanceof ComboTextProperty) {
71	observable.doSetValue(null);	76	observable.setValue(null);
72	assertEquals("expect empty text in mode " + observableMode, "", combo.getText());	77	assertEquals("expect empty text in text mode", "", combo.getText());
73	}	78	}
74	}	79	}
75	}	80	}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Display;

		IObservableValue observable = (IObservableValue) delegate
				.createObservable(SWTObservables.getRealm(Display.getDefault()));

		ValueChangeEventTracker listener = ValueChangeEventTracker
				.observe(observable);
		combo.select(0);

		assertEquals("Observable was not notified.", 1, listener.count);
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(
				CComboObservableValueSelectionTest.class.getName());
		suite.addTestSuite(CComboObservableValueSelectionTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(PropertyObservables
					.observeValue(realm, combo, CComboProperties
							.selectionProperty()), combo);
		}

		public void change(IObservable observable) {
			IObservableValue ov = (IObservableValue) observable;
			ov.setValue(createValue(ov));

			combo.select(index);
		}

		public Object getValueType(IObservableValue observable) {

Lines 13-21 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueTest.java (-12 / +15 lines)
13		13
14	package org.eclipse.jface.tests.internal.databinding.swt;	14	package org.eclipse.jface.tests.internal.databinding.swt;
15		15
		16	import org.eclipse.core.databinding.observable.value.IObservableValue;
		17	import org.eclipse.core.databinding.property.IValueProperty;
		18	import org.eclipse.core.databinding.property.PropertyObservables;
16	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	19	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
17	import org.eclipse.jface.internal.databinding.swt.CComboObservableValue;	20	import org.eclipse.jface.databinding.swt.CComboProperties;
18	import org.eclipse.jface.internal.databinding.swt.SWTProperties;	21	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
		22	import org.eclipse.jface.databinding.swt.SWTObservables;
19	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;	23	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
20	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
21	import org.eclipse.swt.custom.CCombo;	25	import org.eclipse.swt.custom.CCombo;
Lines 26-33 Link Here
26	public class CComboObservableValueTest extends AbstractSWTTestCase {	30	public class CComboObservableValueTest extends AbstractSWTTestCase {
27	public void testDispose() throws Exception {	31	public void testDispose() throws Exception {
28	CCombo combo = new CCombo(getShell(), SWT.NONE);	32	CCombo combo = new CCombo(getShell(), SWT.NONE);
29	CComboObservableValue observableValue = new CComboObservableValue(	33	ISWTObservableValue observableValue = SWTObservables.observeText(combo);
30	combo, SWTProperties.TEXT);
31		34
32	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();	35	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();
33	observableValue.addValueChangeListener(testCounterValueChangeListener);	36	observableValue.addValueChangeListener(testCounterValueChangeListener);
Lines 52-72 Link Here
52	}	55	}
53		56
54	public void testSetValueWithNull() {	57	public void testSetValueWithNull() {
55	testSetValueWithNull(SWTProperties.TEXT);	58	testSetValueWithNull(CComboProperties.textProperty());
56	testSetValueWithNull(SWTProperties.SELECTION);	59	testSetValueWithNull(CComboProperties.selectionProperty());
57	}	60	}
58		61
59	protected void testSetValueWithNull(String observableMode) {	62	protected void testSetValueWithNull(IValueProperty property) {
60	CCombo combo = new CCombo(getShell(), SWT.NONE);	63	CCombo combo = new CCombo(getShell(), SWT.NONE);
61	combo.setItems(new String[] {"one", "two", "three"});	64	combo.setItems(new String[] { "one", "two", "three" });
62	CComboObservableValue observable = new CComboObservableValue(	65	IObservableValue observable = PropertyObservables.observeValue(
63	combo, observableMode);	66	combo, property);
64		67
65	observable.doSetValue("two");	68	observable.setValue("two");
66	assertEquals("two", combo.getText());	69	assertEquals("two", combo.getText());
67	assertEquals(1, combo.getSelectionIndex());	70	assertEquals(1, combo.getSelectionIndex());
68		71
69	observable.doSetValue(null);	72	observable.setValue(null);
70	assertEquals("", combo.getText());	73	assertEquals("", combo.getText());
71	assertEquals(-1, combo.getSelectionIndex());	74	assertEquals(-1, combo.getSelectionIndex());
72	}	75	}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ComboProperties;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Display;


/**
 * @since 3.2
 * 
 */
public class ComboObservableValueSelectionTest extends TestCase {
	private Delegate delegate;

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ComboObservableValueSelectionTest.class
				.toString());
		suite.addTestSuite(ComboObservableValueSelectionTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(PropertyObservables
					.observeValue(realm, combo, ComboProperties
							.selectionProperty()), combo);
		}

		public void change(IObservable observable) {
			int index = combo
					.indexOf((String) createValue((IObservableValue) observable));

			((IObservableValue) observable).setValue(combo.getItem(index));
			combo.notifyListeners(SWT.Selection, null);
		}

		public Object getValueType(IObservableValue observable) {




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ButtonProperties;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;

 */
public class ButtonObservableValueTest extends AbstractSWTTestCase {
	private Button button;
	private ISWTObservableValue observableValue;
	private ValueChangeEventTracker listener;

	/* (non-Javadoc)
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();

		Shell shell = getShell();
		button = new Button(shell, SWT.CHECK);
		observableValue = SWTObservables.observeSelection(button);
				button);
		listener = new ValueChangeEventTracker();
	}

	public void testSelection_ChangeNotifiesObservable() throws Exception {
		observableValue.addValueChangeListener(listener);
		button.setSelection(true);

		assertEquals("Selection event should notify observable.", 1,
				listener.count);
	}

	public void testSelection_NoChange() throws Exception {
		button.setSelection(true);
		button.notifyListeners(SWT.Selection, null);
		observableValue.addValueChangeListener(listener);

		// precondition
		assertEquals(0, listener.count);

		button.notifyListeners(SWT.Selection, null);
		assertEquals(
				"Value did not change.  Listeners should not have been notified.",
				0, listener.count);
	}

	public void testSetValue_NullConvertedToFalse() {
		button.setSelection(true);
		assertEquals(Boolean.TRUE, observableValue.getValue());

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ButtonObservableValueTest.class
				.getName());
		suite.addTestSuite(ButtonObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, button,
					ButtonProperties.selectionProperty());
		}

		public Object getValueType(IObservableValue observable) {

		}

		public void change(IObservable observable) {
			((IObservableValue) observable).setValue(Boolean
					.valueOf(changeValue(button)));
		}

		public Object createValue(IObservableValue observable) {
			return Boolean.valueOf(changeValue(button));
		}

		private boolean changeValue(Button button) {
			return !button.getSelection();
		}




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Matthew Hall - bug 194734
 *******************************************************************************/

package org.eclipse.core.tests.databinding.beans;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;

import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.WritableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.core.tests.internal.databinding.beans.Bean;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
import org.eclipse.jface.databinding.conformance.util.CurrentRealm;

		propertyName = "value";
	}

	public void testObserveValue_ReturnsIBeanObservable()
			throws Exception {
		IObservableValue value = PojoObservables.observeValue(pojo, propertyName);

		assertNotNull(value);
		assertTrue(value instanceof IBeanObservable);
	}

	public void testObserveValue_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners(propertyName));
	}

	public void testObservableValueWithRealm_ReturnsIBeanObservable()
			throws Exception {
		CurrentRealm realm = new CurrentRealm(true);
		IObservableValue value = PojoObservables.observeValue(realm, pojo,
				propertyName);

		assertNotNull(value);
		assertTrue(value instanceof IBeanObservable);
	}

	public void testObservableMap_ReturnsIBeanObservable()
			throws Exception {
		IObservableSet set = new WritableSet();
		set.add(new Bean());

		IObservableMap map = PojoObservables.observeMap(set, Bean.class,
				propertyName);
		assertNotNull(map);
		assertTrue(map instanceof IBeanObservable);
	}
	
	public void testObservableMap_DoesNotAttachListeners() throws Exception {

		assertEquals(2, maps.length);
	}
	
	public void testObserveListWithElementType_ReturnsIBeanObservable() throws Exception {
		IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);
		assertTrue(list instanceof IBeanObservable);
	}
	
	public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners("list"));
	}
	
	public void testObserveList_ReturnsIBeanObservable() throws Exception {
		IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");
		assertTrue(observable instanceof IBeanObservable);
	}
	
	public void testObserveList_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners("list"));
	}
	
	public void testObserveSetWithElementType_ReturnsIBeanObservable() throws Exception {
		IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);
		assertTrue(list instanceof IBeanObservable);
	}
	
	public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners("set"));
	}
	
	public void testObserveSet_ReturnsIBeanObservable() throws Exception {
		IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");
		assertTrue(list instanceof IBeanObservable);
	}
	
	public void testObserveSet_DoesNotAttachListeners() throws Exception {




 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164268, 171616
 *     Mike Evans - bug 217558
 *     Matthew Hall - bugs 221351, 194734
 *******************************************************************************/

package org.eclipse.core.tests.databinding.beans;

		assertEquals("property descriptor", Bean.class.getMethod("getValue",
				null), beanObservable.getPropertyDescriptor().getReadMethod());
		assertEquals("observed", parent.getValue(), beanObservable.getObserved());
		assertTrue("delegate", beanObservable.getDecorated().getClass()
				.getName().endsWith("DetailObservableValue"));
	}


		BeanObservableListDecorator beanObservable = (BeanObservableListDecorator) detailList;
		assertEquals("property descriptor", Bean.class.getMethod("getList",
				null), beanObservable.getPropertyDescriptor().getReadMethod());
		assertEquals("observed", parent.getValue(), beanObservable.getObserved());

		// DetailObservableList is package level we can do a straight instanceof
		// check
		assertTrue("delegate is the observed", beanObservable.getDecorated()
				.equals(detailList));
	}


		assertEquals("property descriptor", Bean.class
				.getMethod("getSet", null), beanObservable
				.getPropertyDescriptor().getReadMethod());
		assertEquals("observed", parent.getValue(), beanObservable.getObserved());

		// DetailObservableSet is package level we can't do a straight
		// instanceof check
		assertTrue("delegate is the observed", beanObservable.getDecorated()
				.equals(detailSet));
	}


Lines 66-72 Link Here

(-)src/org/eclipse/jface/tests/databinding/scenarios/ButtonControlScenario.java (-1 lines)
66	adventure.setPetsAllowed(finalNewBoolean);	66	adventure.setPetsAllowed(finalNewBoolean);
67	spinEventLoop(0);	67	spinEventLoop(0);
68	assertEquals(newBoolean, button.getSelection());	68	assertEquals(newBoolean, button.getSelection());
69
70	}	69	}
71		70
72	public void testScenario02() {	71	public void testScenario02() {




/*******************************************************************************
 * Copyright (c) 2005, 2008 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
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Listener;

/**
 * @since 3.2
 * 
 */
public class ListObservableValue extends AbstractSWTObservableValue {

	private final List list;

	private boolean updating = false;

	private String currentValue;

	private Listener listener;

	/**
	 * @param list
	 */
	public ListObservableValue(List list) {
		super(list);
		this.list = list;
		this.currentValue = (String) doGetValue();

		if ((list.getStyle() & SWT.MULTI) > 0)
			throw new IllegalArgumentException(
					"SWT.SINGLE support only for a List selection"); //$NON-NLS-1$

		listener = new Listener() {

			public void handleEvent(Event event) {
				if (!updating) {
					Object oldValue = currentValue;
					currentValue = (String) doGetValue();
					fireValueChange(Diffs.createValueDiff(oldValue,
							currentValue));
				}
			}

		};
		list.addListener(SWT.Selection, listener);
	}

	public void doSetValue(Object value) {
		String oldValue = null;
		if (list.getSelection() != null && list.getSelection().length > 0)
			oldValue = list.getSelection()[0];
		try {
			updating = true;
			String items[] = list.getItems();
			int index = -1;
			if (items != null && value != null) {
				for (int i = 0; i < items.length; i++) {
					if (value.equals(items[i])) {
						index = i;
						break;
					}
				}
				list.select(index); // -1 will not "unselect"
			}
			currentValue = (String) value;
		} finally {
			updating = false;
		}
		fireValueChange(Diffs.createValueDiff(oldValue, value));
	}

	public Object doGetValue() {
		int index = list.getSelectionIndex();
		if (index >= 0)
			return list.getItem(index);
		return null;
	}

	public Object getValueType() {
		return String.class;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		if (listener != null && !list.isDisposed()) {
			list.removeListener(SWT.Selection, listener);
		}
	}
}




public interface SWTProperties {

	/**
	 * Applies to Control
	 */
	public static final String ENABLED = "enabled"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String VISIBLE = "visible"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String TOOLTIP_TEXT = "tooltip"; //$NON-NLS-1$	
	/**
	 * Applies to
	 */
	public static final String ITEMS = "items"; //$NON-NLS-1$

	 * Applies to Text, Label, Combo
	 */
	public static final String TEXT = "text"; //$NON-NLS-1$

	/**
	 * Applies to Label, CLabel.
	 */
	public static final String IMAGE = "image"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String FOREGROUND = "foreground"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String BACKGROUND = "background"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String FONT = "font"; //$NON-NLS-1$

}




/*******************************************************************************
 * Copyright (c) 2005, 2008 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
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;

/**
 * @since 1.0
 * 
 */
public class ButtonObservableValue extends AbstractSWTObservableValue {

	private final Button button;

	private boolean selectionValue;

	private Listener updateListener = new Listener() {
		public void handleEvent(Event event) {
			boolean oldSelectionValue = selectionValue;
			selectionValue = button.getSelection();
						
			notifyIfChanged(oldSelectionValue, selectionValue);
		}
	};

	/**
	 * @param button
	 */
	public ButtonObservableValue(Button button) {
		super(button);
		this.button = button;
		init();
	}
	
	/**
	 * @param realm
	 * @param button
	 */
	public ButtonObservableValue(Realm realm, Button button) {
		super(realm, button);
		this.button = button;
		init();
	}
	
	private void init() {
		button.addListener(SWT.Selection, updateListener);
		button.addListener(SWT.DefaultSelection, updateListener);
		this.selectionValue = button.getSelection();
	}

	public void doSetValue(final Object value) {
		boolean oldSelectionValue = selectionValue;
		selectionValue = value == null ? false : ((Boolean) value)
				.booleanValue();
		
		button.setSelection(selectionValue);
		notifyIfChanged(oldSelectionValue, selectionValue);
	}

	public Object doGetValue() {
		return button.getSelection() ? Boolean.TRUE : Boolean.FALSE;
	}

	public Object getValueType() {
		return Boolean.TYPE;
	}
	
	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (!button.isDisposed()) {
			button.removeListener(SWT.Selection, updateListener);
			button.removeListener(SWT.DefaultSelection, updateListener);
		}
	}

	/**
	 * Notifies consumers with a value change event only if a change occurred.
	 * 
	 * @param oldValue
	 * @param newValue
	 */
	private void notifyIfChanged(boolean oldValue, boolean newValue) {
		if (oldValue != newValue) {
			fireValueChange(Diffs.createValueDiff(oldValue ? Boolean.TRUE : Boolean.FALSE,
					newValue ? Boolean.TRUE : Boolean.FALSE));
		}		
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 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
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *     Matthew Hall - bug 118516
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.2
 * 
 */
public class ComboObservableValue extends AbstractSWTObservableValue {

	private final Combo combo;
	private final String attribute;
	private boolean updating = false;
	private String currentValue;
	private ModifyListener modifyListener;

	/**
	 * @param combo
	 * @param attribute
	 */
	public ComboObservableValue(Combo combo, String attribute) {
		super(combo);
		this.combo = combo;
		this.attribute = attribute;
		init();
	}
		
	/**
	 * @param realm
	 * @param combo
	 * @param attribute
	 */
	public ComboObservableValue(Realm realm, Combo combo, String attribute) {
		super(realm, combo);
		this.combo = combo;
		this.attribute = attribute;
		init();
	}
	
	private void init() {		
		if (attribute.equals(SWTProperties.SELECTION)
				|| attribute.equals(SWTProperties.TEXT)) {
			this.currentValue = combo.getText();
			modifyListener = new ModifyListener() {

				public void modifyText(ModifyEvent e) {
					if (!updating) {
						String oldValue = currentValue;
						currentValue = ComboObservableValue.this.combo
								.getText();
						
						notifyIfChanged(oldValue, currentValue);
					}
				}
			};
			combo.addModifyListener(modifyListener);
		} else
			throw new IllegalArgumentException();
	}

	public void doSetValue(final Object value) {
		String oldValue = combo.getText();
		try {
			updating = true;
			if (attribute.equals(SWTProperties.TEXT)) {
				String stringValue = value != null ? value.toString() : ""; //$NON-NLS-1$
				combo.setText(stringValue);
			} else if (attribute.equals(SWTProperties.SELECTION)) {
				String items[] = combo.getItems();
				int index = -1;
				if (items != null && value != null) {
					for (int i = 0; i < items.length; i++) {
						if (value.equals(items[i])) {
							index = i;
							break;
						}
					}
					if (index == -1) {
						combo.setText((String) value);
					} else {
						combo.select(index); // -1 will not "unselect"
					}
				}
			}
		} finally {
			updating = false;
			currentValue = combo.getText();
		}
		
		notifyIfChanged(oldValue, currentValue);
	}

	public Object doGetValue() {
		if (attribute.equals(SWTProperties.TEXT))
			return combo.getText();

		Assert.isTrue(attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		// The problem with a ccombo, is that it changes the text and
		// fires before it update its selection index
		return combo.getText();
	}

	public Object getValueType() {
		Assert.isTrue(attribute.equals(SWTProperties.TEXT)
				|| attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		return String.class;
	}

	/**
	 * @return attribute being observed
	 */
	public String getAttribute() {
		return attribute;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (modifyListener != null && !combo.isDisposed()) {
			combo.removeModifyListener(modifyListener);
		}
	}
	
	private void notifyIfChanged(String oldValue, String newValue) {
		if (!oldValue.equals(newValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 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.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.custom.CCombo;

/**
 * @since 3.2
 * 
 */
public class CComboObservableList extends SWTObservableList {

	private final CCombo ccombo;

	/**
	 * @param ccombo
	 */
	public CComboObservableList(CCombo ccombo) {
		super(SWTObservables.getRealm(ccombo.getDisplay()));
		this.ccombo = ccombo;
	}

	protected int getItemCount() {
		return ccombo.getItemCount();
	}

	protected void setItems(String[] newItems) {
		ccombo.setItems(newItems);
	}

	protected String[] getItems() {
		return ccombo.getItems();
	}

	protected String getItem(int index) {
		return ccombo.getItem(index);
	}

	protected void setItem(int index, String string) {
		ccombo.setItem(index, string);
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 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.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.2
 * 
 */
public class ComboObservableList extends SWTObservableList {

	private final Combo combo;

	/**
	 * @param combo
	 */
	public ComboObservableList(Combo combo) {
		super(SWTObservables.getRealm(combo.getDisplay()));
		this.combo = combo;
	}

	protected int getItemCount() {
		return combo.getItemCount();
	}

	protected void setItems(String[] newItems) {
		combo.setItems(newItems);
	}

	protected String[] getItems() {
		return combo.getItems();
	}

	protected String getItem(int index) {
		return combo.getItem(index);
	}

	protected void setItem(int index, String string) {
		combo.setItem(index, string);
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 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
 *     Brad Reynolds - bug 164653
 *     Matt Carter - bug 170668
 *     Brad Reynolds - bug 170848
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;

/**
 * @since 1.0
 * 
 */
public class ControlObservableValue extends AbstractSWTObservableValue {

	private final Control control;

	private final String attribute;

	private Object valueType;
	
	private static final Map SUPPORTED_ATTRIBUTES = new HashMap();
	static {
		SUPPORTED_ATTRIBUTES.put(SWTProperties.ENABLED, Boolean.TYPE);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.VISIBLE, Boolean.TYPE);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.TOOLTIP_TEXT, String.class);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.FOREGROUND, Color.class);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.BACKGROUND, Color.class);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.FONT, Font.class);
	}
	
	/**
	 * @param control
	 * @param attribute
	 */
	public ControlObservableValue(Control control, String attribute) {
		super(control);
		this.control = control;
		this.attribute = attribute;
		if (SUPPORTED_ATTRIBUTES.keySet().contains(attribute)) {
			this.valueType = SUPPORTED_ATTRIBUTES.get(attribute); 
		} else {
			throw new IllegalArgumentException();
		}
	}

	public void doSetValue(Object value) {
		Object oldValue = doGetValue();
		if (attribute.equals(SWTProperties.ENABLED)) {
			control.setEnabled(((Boolean) value).booleanValue());
		} else if (attribute.equals(SWTProperties.VISIBLE)) {
			control.setVisible(((Boolean) value).booleanValue());
		} else if (attribute.equals(SWTProperties.TOOLTIP_TEXT)) {
			control.setToolTipText((String) value);
		} else if (attribute.equals(SWTProperties.FOREGROUND)) {
			control.setForeground((Color) value);
		} else if (attribute.equals(SWTProperties.BACKGROUND)) {
			control.setBackground((Color) value);
		} else if (attribute.equals(SWTProperties.FONT)) {
			control.setFont((Font) value);
		}
		fireValueChange(Diffs.createValueDiff(oldValue, value));
	}

	public Object doGetValue() {
		if (attribute.equals(SWTProperties.ENABLED)) {
			return control.getEnabled() ? Boolean.TRUE : Boolean.FALSE;
		}
		if (attribute.equals(SWTProperties.VISIBLE)) {
			return control.getVisible() ? Boolean.TRUE : Boolean.FALSE;
		}
		if (attribute.equals(SWTProperties.TOOLTIP_TEXT)) {
			return control.getToolTipText();			
		}
		if (attribute.equals(SWTProperties.FOREGROUND))	 {
			return control.getForeground();
		}
		if (attribute.equals(SWTProperties.BACKGROUND)) {
			return control.getBackground();
		}
		if (attribute.equals(SWTProperties.FONT)) {
			return control.getFont();
		}
		
		return null;
	}

	public Object getValueType() {
		return valueType;
	}
}




package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IStaleListener;
import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.StaleEvent;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.IVetoableValue;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
import org.eclipse.core.databinding.observable.value.ValueChangingEvent;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.jface.util.Util;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;

 * 
 * @since 1.2
 */
public class DelayedObservableValue extends SWTObservableValueDecorator {
	class ValueUpdater implements Runnable {
		private final Object oldValue;


		}
	}

	private IStaleListener staleListener = new IStaleListener() {
		public void handleStale(StaleEvent staleEvent) {
			if (!updating)
				fireStale();
		}
	};

	private IValueChangeListener valueChangeListener = new IValueChangeListener() {
		public void handleValueChange(ValueChangeEvent event) {
			if (!updating)
				makeDirty();
		}
	};

	private Listener focusOutListener = new Listener() {
		public void handleEvent(Event event) {
			// Force update on focus out

	};

	private final int delay;
	private Widget widget;
	private Control control;

	private boolean dirty = true;
	private Object cachedValue = null;

	 */
	public DelayedObservableValue(int delayMillis,
			ISWTObservableValue observable) {
		super(observable, observable.getWidget());
		this.delay = delayMillis;
		this.observable = observable;

		widget = observable.getWidget();
		observable.addStaleListener(staleListener);
		Widget widget = observable.getWidget();
		if (widget instanceof Control) {
			widget.addListener(SWT.FocusOut, focusOutListener);
			control.addListener(SWT.FocusOut, focusOutListener);
		}

		cachedValue = observable.getValue();
	}

	protected void handleValueChange(ValueChangeEvent event) {
		if (!updating)
			makeDirty();
	}

	protected void handleStaleEvent(StaleEvent event) {
		if (!updating)
			super.handleStaleEvent(event);
	}

	public Object getValue() {
		getterCalled();

		if (!hasListeners())
			return super.getValue();

		if (dirty) {
			cachedValue = super.getValue();
			dirty = false;

			if (updater != null && !updater.running) {

				cancelScheduledUpdate();
			}
		}

		return cachedValue;
	}

	public void setValue(Object value) {
		checkRealm();

		updating = true;
		try {
			// Principle of least surprise: setValue overrides any pending

			cancelScheduledUpdate();

			Object oldValue = cachedValue;
			super.setValue(value);
			// Bug 215297 - target observable could veto or override value
			// passed to setValue(). Make sure we cache whatever is set.
			Object newValue = cachedValue = super.getValue();

			if (hasListeners() && !Util.equals(oldValue, newValue))
				fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		} finally {
			updating = false;
		}
	}

	protected boolean hasListeners() {
		return super.hasListeners();
		return (dirty && updater != null) || observable.isStale();
	}

	public boolean isStale() {
		getterCalled();
		return (dirty && updater != null) || super.isStale();
	 * 
	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
	 */
	public Object getValueType() {
		return observable.getValueType();
	}

	public void dispose() {
		cancelScheduledUpdate();
		if (widget instanceof Control) {
			widget.removeListener(SWT.FocusOut, focusOutListener);
			widget = null;
			observable.removeStaleListener(staleListener);
			observable = null;
		}
		if (control != null) {
			control.removeListener(SWT.FocusOut, focusOutListener);
			control = null;
		}
		super.dispose();
	}


	private void scheduleUpdate() {
		updater = new ValueUpdater(cachedValue);
		widget.getDisplay().timerExec(delay, updater);
	}

	private void internalFireValueChange(final Object oldValue) {




/*******************************************************************************
 * Copyright (c) 2005, 2008 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
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *     Matthew Hall - bug 118516
 *     Eric Rizzo - bug 134884
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;

/**
 * @since 3.2
 * 
 */
public class CComboObservableValue extends AbstractSWTObservableValue {

	/**
	 * 
	 */

	private final CCombo ccombo;

	private final String attribute;

	private boolean updating = false;

	private String currentValue;

	private ModifyListener modifyListener;

	/**
	 * @param ccombo
	 * @param attribute
	 */
	public CComboObservableValue(CCombo ccombo, String attribute) {
		super(ccombo);
		this.ccombo = ccombo;
		this.attribute = attribute;
		init();
	}

	/**
	 * @param realm
	 * @param ccombo
	 * @param attribute
	 */
	public CComboObservableValue(Realm realm, CCombo ccombo, String attribute) {
		super(realm, ccombo);
		this.ccombo = ccombo;
		this.attribute = attribute;
		init();
	}
	
	private void init() {		
		if (attribute.equals(SWTProperties.SELECTION)
				|| attribute.equals(SWTProperties.TEXT)) {
			this.currentValue = ccombo.getText();
			modifyListener = new ModifyListener() {

				public void modifyText(ModifyEvent e) {
					if (!updating) {
						String oldValue = currentValue;
						currentValue = CComboObservableValue.this.ccombo
								.getText();
						
						notifyIfChanged(oldValue, currentValue);
					}
				}
			};
			ccombo.addModifyListener(modifyListener);
		} else
			throw new IllegalArgumentException();
	}

	public void doSetValue(final Object value) {
		String oldValue = ccombo.getText();
		try {
			updating = true;
			if (attribute.equals(SWTProperties.TEXT)) {
				String stringValue = value != null ? value.toString() : ""; //$NON-NLS-1$
				ccombo.setText(stringValue);
			} else if (attribute.equals(SWTProperties.SELECTION)) {
				String items[] = ccombo.getItems();
				int index = -1;
				if (value == null) {
					ccombo.select(-1);
				} else if (items != null) {
					for (int i = 0; i < items.length; i++) {
						if (value.equals(items[i])) {
							index = i;
							break;
						}
					}
					if (index == -1) {
						ccombo.setText((String) value);
					} else {
						ccombo.select(index); // -1 will not "unselect"
					}
				}
			}
		} finally {
			updating = false;
			currentValue = ccombo.getText();
		}
		
		notifyIfChanged(oldValue, currentValue);
	}

	public Object doGetValue() {
		if (attribute.equals(SWTProperties.TEXT))
			return ccombo.getText();

		Assert.isTrue(attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		// The problem with a ccombo, is that it changes the text and
		// fires before it update its selection index
		return ccombo.getText();
	}

	public Object getValueType() {
		Assert.isTrue(attribute.equals(SWTProperties.TEXT)
				|| attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		return String.class;
	}

	/**
	 * @return attribute being observed
	 */
	public String getAttribute() {
		return attribute;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (modifyListener != null && !ccombo.isDisposed()) {
			ccombo.removeModifyListener(modifyListener);
		}
	}
	
	private void notifyIfChanged(String oldValue, String newValue) {
		if (!oldValue.equals(newValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, ccombo.getText()));			
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 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.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.List;

/**
 * @since 3.2
 * 
 */
public class ListObservableList extends SWTObservableList {

	private final List list;

	/**
	 * @param list
	 */
	public ListObservableList(List list) {
		super(SWTObservables.getRealm(list.getDisplay()));
		this.list = list;
	}

	protected int getItemCount() {
		return list.getItemCount();
	}

	protected void setItems(String[] newItems) {
		list.setItems(newItems);
	}

	protected String[] getItems() {
		return list.getItems();
	}

	protected String getItem(int index) {
		return list.getItem(index);
	}

	protected void setItem(int index, String string) {
		list.setItem(index, string);
	}
}





import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.internal.databinding.internal.swt.LinkObservableValue;
import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionObservableValue;
import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;
import org.eclipse.jface.internal.databinding.swt.ComboObservableList;
import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;
import org.eclipse.jface.internal.databinding.internal.swt.LinkObservableValue;
import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionObservableValue;
import org.eclipse.jface.internal.databinding.swt.ControlObservableValue;
import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;
import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;
import org.eclipse.jface.internal.databinding.swt.ListObservableList;
import org.eclipse.jface.internal.databinding.swt.ListObservableValue;
import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionObservableValue;
import org.eclipse.jface.internal.databinding.swt.SWTObservableListDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
import org.eclipse.jface.internal.databinding.swt.ShellObservableValue;


	/**
	 * Returns an observable which delays notification of value change events
	 * from <code>observable</code> until <code>delay</code> milliseconds have
	 * passed since the last change event, or until a FocusOut event is received
	 * from the underlying widget (whichever happens earlier). This class helps
	 * to delay validation until the user stops typing. To notify about pending
	 * changes, the returned observable value will fire a stale event when the
	 * wrapped observable value fires a change event, but this change is being
	 * delayed.
	 * 
	 * @param delay
	 * @param observable

	 * 
	 * @since 1.2
	 */
	public static ISWTObservableValue observeDelayedValue(int delay,
			ISWTObservableValue observable) {
		return new DelayedObservableValue(delay, observable);
	}

	private static ISWTObservableValue observeControlValueProperty(
			Control control, IValueProperty property) {
		return new SWTObservableValueDecorator(
				PropertyObservables.observeValue(
						getRealm(control.getDisplay()), control, property),
				control);
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeEnabled(Control control) {
		return observeControlValueProperty(control, ControlProperties
				.enabledProperty());
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeVisible(Control control) {
		return observeControlValueProperty(control, ControlProperties
				.visibleProperty());
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeTooltipText(Control control) {
		return observeControlValueProperty(control, ControlProperties
				.toolTipTextProperty());
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeSelection(Control control) {
		IValueProperty property;
		if (control instanceof Spinner) {
			return new SpinnerObservableValue((Spinner) control,
					SWTProperties.SELECTION);
		} else if (control instanceof Button) {
			property = ButtonProperties.selectionProperty();
		} else if (control instanceof Combo) {
			property = ComboProperties.selectionProperty();
					SWTProperties.SELECTION);
		} else if (control instanceof CCombo) {
			property = CComboProperties.selectionProperty();
					SWTProperties.SELECTION);
		} else if (control instanceof List) {
			property = ListProperties.selectionProperty();
		} else if (control instanceof Scale) {
			return new ScaleObservableValue((Scale) control,
					SWTProperties.SELECTION);
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControlValueProperty(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 * </ul>
	 * 
	 * <li>org.eclipse.swt.widgets.Label</li>
	 * 
	 * @param control
	 * @param event
	 *            event type to register for change events
	 * @return observable value
	 * @throws IllegalArgumentException
	 *             if <code>control</code> type is unsupported

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeText(Control control) {
		IValueProperty property;
		if (control instanceof Label) {
			return new LabelObservableValue((Label) control);
		} else if (control instanceof Link) {

		} else if (control instanceof CLabel) {
			return new CLabelObservableValue((CLabel) control);
		} else if (control instanceof Combo) {
			property = ComboProperties.textProperty();
		} else if (control instanceof CCombo) {
			property = CComboProperties.textProperty();
					SWTProperties.TEXT);
		} else if (control instanceof Shell) {
			return new ShellObservableValue((Shell) control);
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControlValueProperty(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static IObservableList observeItems(Control control) {
		IListProperty property;
		if (control instanceof Combo) {
			property = ComboProperties.itemsProperty();
		} else if (control instanceof CCombo) {
			property = CComboProperties.itemsProperty();
		} else if (control instanceof List) {
			property = ListProperties.itemsProperty();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return new SWTObservableListDecorator(PropertyObservables.observeList(
				control, property), control);
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeForeground(Control control) {
		return observeControlValueProperty(control, ControlProperties
				.foregroundProperty());
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeBackground(Control control) {
		return observeControlValueProperty(control, ControlProperties
				.backgroundProperty());
	}

	/**

	 * @return an observable value tracking the font of the given control
	 */
	public static ISWTObservableValue observeFont(Control control) {
		return observeControlValueProperty(control, ControlProperties
				.fontProperty());
	}

	/**
	 * Returns an observable observing the editable attribute of the provided
	 * <code>control</code>. The supported types are:
	 * <ul>
	 * <li>org.eclipse.swt.widgets.Text</li>
	 * </ul>

		if (control instanceof Text) {
			return new TextEditableObservableValue((Text) control);
		}

		throw new IllegalArgumentException(
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}




/*******************************************************************************
 * Copyright (c) 2006 The Pampered Chef, Inc. 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:
 *     The Pampered Chef, Inc. - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.list.DecoratingObservableList;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;

/**
 * @since 3.3
 * 
 */
public class SWTObservableListDecorator extends DecoratingObservableList
		implements ISWTObservable {
	private Widget widget;

	/**
	 * @param decorated
	 * @param widget
	 */
	public SWTObservableListDecorator(IObservableList decorated, Widget widget) {
		super(decorated, true);
		this.widget = widget;
		widget.addListener(SWT.Dispose, disposeListener);
	}

	private Listener disposeListener = new Listener() {
		public void handleEvent(Event event) {
			SWTObservableListDecorator.this.dispose();
		}
	};

	public void dispose() {
		this.widget = null;
		super.dispose();
	}

	/**
	 * @return Returns the widget.
	 */
	public Widget getWidget() {
		return widget;
	}
}




/*******************************************************************************
 * Copyright (c) 2006 The Pampered Chef, Inc. 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:
 *     The Pampered Chef, Inc. - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.value.DecoratingObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;

/**
 * @since 3.3
 * 
 */
public class SWTObservableValueDecorator extends DecoratingObservableValue
		implements ISWTObservableValue {
	private Widget widget;

	/**
	 * @param decorated
	 * @param widget
	 */
	public SWTObservableValueDecorator(IObservableValue decorated, Widget widget) {
		super(decorated, true);
		this.widget = widget;
		widget.addListener(SWT.Dispose, disposeListener);
	}

	private Listener disposeListener = new Listener() {
		public void handleEvent(Event event) {
			SWTObservableValueDecorator.this.dispose();
		}
	};

	public void dispose() {
		this.widget = null;
		super.dispose();
	}

	/**
	 * @return Returns the widget.
	 */
	public Widget getWidget() {
		return widget;
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ButtonSelectionProperty;

/**
 * @since 1.3
 *
 */
public class ButtonProperties {
	/**
	 * @return blah
	 */
	public static IValueProperty selectionProperty() {
		return new ButtonSelectionProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import java.util.Arrays;

import org.eclipse.swt.widgets.List;

/**
 * @since 3.3
 * 
 */
public class ListItemsProperty extends ControlListProperty {
	public Object getElementType() {
		return String.class;
	}

	protected void doSetList(Object source, java.util.List list) {
		String[] items = (String[]) list.toArray(new String[list.size()]);
		((List) source).setItems(items);
	}

	public java.util.List getList(Object source) {
		return Arrays.asList(((List) source).getItems());
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.property.ValueProperty;
import org.eclipse.jface.util.Util;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;

abstract class ControlValueProperty extends ValueProperty implements Listener {
	protected Map controlToValue = new HashMap();

	protected void addListenerTo(Object source) {
		controlToValue.put(source, getValue(source));
	}

	protected void removeListenerFrom(Object source) {
		controlToValue.remove(source);
	}

	public void handleEvent(Event event) {
		Object source = event.widget;
		Object oldValue = controlToValue.get(source);
		Object newValue = getValue(source);
		controlToValue.put(source, newValue);
		if (!Util.equals(oldValue, newValue))
			fireValueChange(source, Diffs.createValueDiff(oldValue, newValue));
	}

	public Object getValue(Object source) {
		return doGetValue((Control) source);
	}

	public void setValue(Object source, Object value) {
		Object oldValue = getValue(source);

		doSetValue((Control) source, value);

		if (hasListeners(source)) {
			Object newValue = getValue(source);
			if (!Util.equals(oldValue, newValue)) {
				controlToValue.put(source, newValue);
				fireValueChange(source, Diffs.createValueDiff(oldValue,
						newValue));
			}
		}
	}

	abstract Object doGetValue(Control control);

	abstract void doSetValue(Control control, Object value);
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlForegroundProperty extends ControlValueProperty {
	public Object getValueType() {
		return Color.class;
	}

	public Object doGetValue(Control control) {
		return control.getForeground();
	}

	public void doSetValue(Control control, Object value) {
		control.setForeground((Color) value);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import java.util.Arrays;
import java.util.List;

import org.eclipse.swt.custom.CCombo;

/**
 * @since 3.3
 * 
 */
public class CComboItemsProperty extends ControlListProperty {
	public Object getElementType() {
		return String.class;
	}

	protected void doSetList(Object source, List list) {
		String[] items = (String[]) list.toArray(new String[list.size()]);
		((CCombo) source).setItems(items);
	}

	public List getList(Object source) {
		return Arrays.asList(((CCombo) source).getItems());
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.swt;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;

/**
 * @since 1.3
 * 
 */
public class ComboProperties {
	/**
	 * @return blah
	 */
	public static IValueProperty selectionProperty() {
		return new ComboSelectionProperty();
	}

	/**
	 * @return blah
	 */
	public static IValueProperty textProperty() {
		return new ComboTextProperty();
	}

	/**
	 * @return blah
	 */
	public static IListProperty itemsProperty() {
		return new ComboItemsProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlEnabledProperty extends ControlValueProperty {
	public Object getValueType() {
		return Boolean.TYPE;
	}

	public Object doGetValue(Control control) {
		return Boolean.valueOf(control.getEnabled());
	}

	public void doSetValue(Control control, Object value) {
		control.setEnabled(((Boolean) value).booleanValue());
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class ComboTextProperty extends ControlValueProperty {
	public Object getValueType() {
		return String.class;
	}

	Object doGetValue(Control control) {
		return ((Combo) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((Combo) control).setText(value != null ? (String) value : ""); //$NON-NLS-1$
	}

	protected void addListenerTo(Object source) {
		Combo combo = (Combo) source;
		combo.addListener(SWT.Modify, this);
		super.addListenerTo(source);
	}

	protected void removeListenerFrom(Object source) {
		Combo combo = (Combo) source;
		if (!combo.isDisposed())
			combo.removeListener(SWT.Modify, this);
		super.removeListenerFrom(combo);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlToolTipTextProperty extends ControlValueProperty {
	public Object getValueType() {
		return String.class;
	}

	public Object doGetValue(Control control) {
		return control.getToolTipText();
	}

	public void doSetValue(Control control, Object value) {
		control.setToolTipText((String) value);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.core.databinding.property.BasicListProperty;

abstract class ControlListProperty extends BasicListProperty {
	protected void addListenerTo(Object source) {
		// no-op
	}

	protected void removeListenerFrom(Object source) {
		// no-op
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class ButtonSelectionProperty extends ControlValueProperty {
	public Object getValueType() {
		return Boolean.TYPE;
	}

	Object doGetValue(Control control) {
		return Boolean.valueOf(((Button) control).getSelection());
	}

	void doSetValue(Control control, Object value) {
		if (value == null)
			value = Boolean.FALSE;
		((Button) control).setSelection(((Boolean) value).booleanValue());
	}

	protected void addListenerTo(Object source) {
		Button button = (Button) source;
		button.addListener(SWT.Selection, this);
		super.addListenerTo(source);
	}

	protected void removeListenerFrom(Object source) {
		Button button = (Button) source;
		if (!button.isDisposed())
			button.removeListener(SWT.Selection, this);
		super.removeListenerFrom(button);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlFontProperty extends ControlValueProperty {
	public Object getValueType() {
		return Font.class;
	}

	public Object doGetValue(Control control) {
		return control.getFont();
	}

	public void doSetValue(Control control, Object value) {
		control.setFont((Font) value);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.swt;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.CComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;

/**
 * @since 1.3
 * 
 */
public class CComboProperties {
	/**
	 * @return blah
	 */
	public static IValueProperty selectionProperty() {
		return new CComboSelectionProperty();
	}

	/**
	 * @return blah
	 */
	public static IValueProperty textProperty() {
		return new CComboTextProperty();
	}

	/**
	 * @return blah
	 */
	public static IListProperty itemsProperty() {
		return new CComboItemsProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlVisibleProperty extends ControlValueProperty {
	public Object getValueType() {
		return Boolean.TYPE;
	}

	public Object doGetValue(Control control) {
		return Boolean.valueOf(control.getVisible());
	}

	public void doSetValue(Control control, Object value) {
		control.setVisible(((Boolean) value).booleanValue());
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.List;

/**
 * @since 3.3
 * 
 */
public class ListSelectionProperty extends ControlValueProperty {
	public Object getValueType() {
		return String.class;
	}

	Object doGetValue(Control control) {
		List list = (List) control;
		int index = list.getSelectionIndex();
		if (index >= 0)
			return list.getItem(index);
		return null;
	}

	void doSetValue(Control control, Object value) {
		List list = (List) control;
		String items[] = list.getItems();
		int index = -1;
		if (items != null && value != null) {
			for (int i = 0; i < items.length; i++) {
				if (value.equals(items[i])) {
					index = i;
					break;
				}
			}
			list.select(index);
		}
	}

	protected void addListenerTo(Object source) {
		List list = (List) source;
		list.addListener(SWT.Selection, this);
		super.addListenerTo(source);
	}

	protected void removeListenerFrom(Object source) {
		List list = (List) source;
		if (!list.isDisposed())
			list.removeListener(SWT.Selection, this);
		super.removeListenerFrom(list);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.swt;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ListItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ListSelectionProperty;

/**
 * @since 1.3
 * 
 */
public class ListProperties {
	/**
	 * @return blah
	 */
	public static IValueProperty selectionProperty() {
		return new ListSelectionProperty();
	}
	
	/**
	 * @return blah
	 */
	public static IListProperty itemsProperty() {
		return new ListItemsProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ControlBackgroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlEnabledProperty;
import org.eclipse.jface.internal.databinding.swt.ControlFontProperty;
import org.eclipse.jface.internal.databinding.swt.ControlForegroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlVisibleProperty;
import org.eclipse.jface.internal.databinding.swt.ControlToolTipTextProperty;
 
/**
 * @since 1.3
 * 
 */
public class ControlProperties {
	/**
	 * @return blah
	 */
	public static IValueProperty enabledProperty() {
		return new ControlEnabledProperty();
	}

	/**
	 * @return blah
	 */
	public static IValueProperty visibleProperty() {
		return new ControlVisibleProperty();
	}

	/**
	 * @return blah
	 */
	public static IValueProperty toolTipTextProperty() {
		return new ControlToolTipTextProperty();
	}

	/**
	 * @return blah
	 */
	public static IValueProperty foregroundProperty() {
		return new ControlForegroundProperty();
	}

	/**
	 * @return blah
	 */
	public static IValueProperty backgroundProperty() {
		return new ControlBackgroundProperty();
	}

	/**
	 * @return blah
	 */
	public static IValueProperty fontProperty() {
		return new ControlFontProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ComboSelectionProperty extends ControlValueProperty {
	public Object getValueType() {
		return String.class;
	}

	Object doGetValue(Control control) {
		return ((Combo)control).getText();
	}

	void doSetValue(Control control, Object value) {
		Combo combo = (Combo) control;
		String items[] = combo.getItems();
		int index = -1;
		if (items != null && value != null) {
			for (int i = 0; i < items.length; i++) {
				if (value.equals(items[i])) {
					index = i;
					break;
				}
			}
			if (index == -1) {
				combo.setText((String) value);
			} else {
				combo.select(index); // -1 will not "unselect"
			}
		}
	}

	protected void addListenerTo(Object source) {
		Combo combo = (Combo) source;
		combo.addListener(SWT.Modify, this);
		super.addListenerTo(source);
	}

	protected void removeListenerFrom(Object source) {
		Combo combo = (Combo) source;
		if (!combo.isDisposed())
			combo.removeListener(SWT.Modify, this);
		super.removeListenerFrom(combo);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlBackgroundProperty extends ControlValueProperty {
	public Object getValueType() {
		return Color.class;
	}

	public Object doGetValue(Control control) {
		return control.getBackground();
	}

	public void doSetValue(Control control, Object value) {
		control.setBackground((Color) value);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import java.util.Arrays;
import java.util.List;

import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.3
 * 
 */
public class ComboItemsProperty extends ControlListProperty {
	public Object getElementType() {
		return String.class;
	}

	protected void doSetList(Object source, List list) {
		String[] items = (String[]) list.toArray(new String[list.size()]);
		((Combo) source).setItems(items);
	}

	public List getList(Object source) {
		return Arrays.asList(((Combo) source).getItems());
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class CComboTextProperty extends ControlValueProperty {
	public Object getValueType() {
		return String.class;
	}

	Object doGetValue(Control control) {
		return ((CCombo) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((CCombo) control).setText(value != null ? (String) value : ""); //$NON-NLS-1$
	}

	protected void addListenerTo(Object source) {
		CCombo combo = (CCombo) source;
		combo.addListener(SWT.Modify, this);
		super.addListenerTo(source);
	}

	protected void removeListenerFrom(Object source) {
		CCombo combo = (CCombo) source;
		if (!combo.isDisposed())
			combo.removeListener(SWT.Modify, this);
		super.removeListenerFrom(combo);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class CComboSelectionProperty extends ControlValueProperty {
	public Object getValueType() {
		return String.class;
	}

	Object doGetValue(Control control) {
		return ((CCombo) control).getText();
	}

	void doSetValue(Control control, Object value) {
		CCombo ccombo = (CCombo) control;
		String items[] = ccombo.getItems();
		int index = -1;
		if (value == null) {
			ccombo.select(-1);
		} else if (items != null) {
			for (int i = 0; i < items.length; i++) {
				if (value.equals(items[i])) {
					index = i;
					break;
				}
			}
			if (index == -1) {
				ccombo.setText((String) value);
			} else {
				ccombo.select(index); // -1 will not "unselect"
			}
		}
	}

	protected void addListenerTo(Object source) {
		CCombo ccombo = (CCombo) source;
		ccombo.addListener(SWT.Modify, this);
		super.addListenerTo(source);
	}

	protected void removeListenerFrom(Object source) {
		CCombo ccombo = (CCombo) source;
		if (!ccombo.isDisposed())
			ccombo.removeListener(SWT.Modify, this);
		super.removeListenerFrom(ccombo);
	}
}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 194734
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyDescriptor;
import java.util.Collection;
import java.util.Iterator;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.set.DecoratingObservableSet;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.ISetChangeListener;
import org.eclipse.core.internal.databinding.Util;

/**
 * {@link IBeanObservable} decorator for an {@link IObservableSet}.
 * 
 * @since 3.3
 */
public class BeanObservableSetDecorator extends DecoratingObservableSet
		implements IBeanObservable {
	private Object observed;
	private PropertyDescriptor propertyDescriptor;

	/**
	 * @param decorated
	 * @param observed 
	 * @param propertyDescriptor
	 */
	public BeanObservableSetDecorator(IObservableSet decorated,
			Object observed,
			PropertyDescriptor propertyDescriptor) {
		super(decorated, true);
		this.delegate = delegate;
		this.observed = observed;
		this.propertyDescriptor = propertyDescriptor;
	}

	public boolean add(Object o) {
		return delegate.add(o);
	}

	public boolean addAll(Collection c) {
		return delegate.addAll(c);
	}

	public void addChangeListener(IChangeListener listener) {
		delegate.addChangeListener(listener);
	}

	public void addSetChangeListener(ISetChangeListener listener) {
		delegate.addSetChangeListener(listener);
	}

	public void addStaleListener(IStaleListener listener) {
		delegate.addStaleListener(listener);
	}

	public void clear() {
		delegate.clear();
	}

	public boolean contains(Object o) {
		return delegate.contains(o);
	}

	public boolean containsAll(Collection c) {
		return delegate.containsAll(c);
	}

	public void dispose() {
		this.propertyDescriptor = null;
		super.dispose();

	public boolean equals(Object obj) {
		if (obj instanceof BeanObservableSetDecorator) {
			BeanObservableSetDecorator other = (BeanObservableSetDecorator) obj;
			return Util.equals(other.delegate, delegate);
		}
		return Util.equals(delegate, obj);
	}

	public Object getElementType() {
		return delegate.getElementType();
	}

	public Realm getRealm() {
		return delegate.getRealm();
	}

	public int hashCode() {
		return delegate.hashCode();
	}

	public boolean isEmpty() {
		return delegate.isEmpty();
	}

	public boolean isStale() {
		return delegate.isStale();
	}

	public Iterator iterator() {
		return delegate.iterator();
	}

	public boolean remove(Object o) {
		return delegate.remove(o);
	}

	public boolean removeAll(Collection c) {
		return delegate.removeAll(c);
	}

	public void removeChangeListener(IChangeListener listener) {
		delegate.removeChangeListener(listener);
	}

	public void removeSetChangeListener(ISetChangeListener listener) {
		delegate.removeSetChangeListener(listener);
	}

	public void removeStaleListener(IStaleListener listener) {
		delegate.removeStaleListener(listener);
	}

	public boolean retainAll(Collection c) {
		return delegate.retainAll(c);
	}

	public int size() {
		return delegate.size();
	}

	public Object[] toArray() {
		return delegate.toArray();
	}

	public Object[] toArray(Object[] a) {
		return delegate.toArray(a);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
	 */
	public Object getObserved() {
		IObservable decorated = getDecorated();
		if (decorated instanceof IObserving)
			return ((IObserving) decorated).getObserved();
		return null;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
	 */
	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	/**
	 * @return the wrapped set
	 */
	public IObservableSet getDelegate() {
		return delegate;
	}	
}




/*******************************************************************************
 * Copyright (c) 2006, 2008 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
 *     Brad Reynolds - bug 171616
 *     Matthew hall - bugs 223164, 241585
 *******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.ComputedObservableMap;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.util.Policy;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableMap extends ComputedObservableMap implements
		IBeanObservable {

	private PropertyDescriptor propertyDescriptor;
	
	private PropertyChangeListener elementListener = new PropertyChangeListener() {
		public void propertyChange(final java.beans.PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						fireMapChange(Diffs.createMapDiffSingleChange(
								event.getSource(), event.getOldValue(), event
								.getNewValue()));
					}
				});
			}
		}
	};

	private ListenerSupport listenerSupport;

	private boolean updating = false;

	private boolean attachListeners;

	/**
	 * @param domain
	 * @param propertyDescriptor
	 */
	public JavaBeanObservableMap(IObservableSet domain,
			PropertyDescriptor propertyDescriptor) {
		this(domain, propertyDescriptor, true);
	}

	/**
	 * @param domain
	 * @param propertyDescriptor
	 * @param attachListeners
	 */
	public JavaBeanObservableMap(IObservableSet domain,
			PropertyDescriptor propertyDescriptor, boolean attachListeners) {
		super(domain);

		this.propertyDescriptor = propertyDescriptor;
		this.attachListeners = attachListeners;
		if (attachListeners) {
			this.listenerSupport = new ListenerSupport(elementListener,
					propertyDescriptor.getName());
		}
		init();
	}

	protected void hookListener(Object domainElement) {
		if (attachListeners && domainElement != null) {
			listenerSupport.hookListener(domainElement);
		}
	}

	protected void unhookListener(Object domainElement) {
		if (attachListeners && domainElement != null) {
			listenerSupport.unhookListener(domainElement);
		}
	}

	protected Object doGet(Object key) {
		if (key == null) {
			return null;
		}
		try {
			Method readMethod = propertyDescriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(key, new Object[0]);
		} catch (Exception e) {
			Policy.getLog().log(
					new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
							IStatus.ERROR, "cannot get value", e)); //$NON-NLS-1$
			throw new RuntimeException(e);
		}
	}

	protected Object doPut(Object key, Object value) {
		try {
			Object oldValue = get(key);
			propertyDescriptor.getWriteMethod().invoke(key,
					new Object[] { value });
			keySet().add(key);
			return oldValue;
		} catch (Exception e) {
			Policy.getLog().log(
					new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
							IStatus.ERROR, "cannot set value", e)); //$NON-NLS-1$
			throw new RuntimeException(e);
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
	 */
	public Object getObserved() {
		return keySet();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
	 */
	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}
}




/*******************************************************************************
 * Copyright (c) 2006-2008 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
 *     Brad Reynolds - bug 171616
 *     Matthew Hall - bugs 208858, 221351, 213145, 223164
 *     Mike Evans - bug 217558
 *******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.databinding.observable.list.ObservableList;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableList extends ObservableList implements
		IBeanObservable {

	private final Object object;

	private PropertyChangeListener collectionListener = new PropertyChangeListener() {
		public void propertyChange(java.beans.PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						updateWrappedList( new ArrayList( Arrays.asList(getValues() ) ) );
					}
				});
			}
		}
	};

	private boolean updating = false;

	private PropertyDescriptor descriptor;

	private ListenerSupport collectionListenSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 */
	public JavaBeanObservableList(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType) {
		this(realm, object, descriptor, elementType, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 * @param attachListeners
	 */
	public JavaBeanObservableList(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType,
			boolean attachListeners) {

		super(realm, new ArrayList(), elementType);
		this.object = object;
		this.descriptor = descriptor;
		this.attachListeners = attachListeners;

		if (attachListeners) {
			this.collectionListenSupport = new ListenerSupport(
					collectionListener, descriptor.getName());
		}

		// initialize list without firing events
		wrappedList.addAll(Arrays.asList(getValues()));
	}

	protected void firstListenerAdded() {
		if (attachListeners) {
			collectionListenSupport.hookListener(this.object);
		}
	}

	protected void lastListenerRemoved() {
		if (collectionListenSupport != null) {
			collectionListenSupport.dispose();
		}
	}

	public void dispose() {
		super.dispose();
		lastListenerRemoved();
	}

	private Object primGetValues() {
		Exception ex = null;
		try {
			Method readMethod = descriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, new Object[0]);
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not read collection values", ex); //$NON-NLS-1$
	}

	private Object[] getValues() {
		Object[] values = null;

		Object result = primGetValues();
		if (descriptor.getPropertyType().isArray())
			values = (Object[]) result;
		else {
			// TODO add jUnit for POJO (var. SettableValue) collections
			Collection list = (Collection) result;
			if (list != null) {
				values = list.toArray();
			}
		}
		if (values == null)
			values = new Object[0];
		return values;
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return descriptor;
	}

	private void setValues() {
		if (descriptor.getPropertyType().isArray()) {
			Class componentType = descriptor.getPropertyType()
					.getComponentType();
			Object[] newArray = (Object[]) Array.newInstance(componentType,
					wrappedList.size());
			wrappedList.toArray(newArray);
			primSetValues(newArray);
		} else {
			// assume that it is a java.util.List
			primSetValues(new ArrayList(wrappedList));
		}
	}

	private void primSetValues(Object newValue) {
		Exception ex = null;
		try {
			Method writeMethod = descriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { newValue });
			return;
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
	}

	public Object set(int index, Object element) {
		getterCalled();
		updating = true;
		try {
			Object oldElement = wrappedList.set(index, element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, false, oldElement), Diffs.createListDiffEntry(index,
					true, element)));
			return oldElement;
		} finally {
			updating = false;
		}
	}

	public Object move(int oldIndex, int newIndex) {
		getterCalled();
		updating = true;
		try {
			int size = wrappedList.size();
			if (oldIndex < 0 || oldIndex >= size)
				throw new IndexOutOfBoundsException(
						"oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
			if (newIndex < 0 || newIndex >= size)
				throw new IndexOutOfBoundsException(
						"newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
			if (oldIndex == newIndex)
				return wrappedList.get(oldIndex);
			Object element = wrappedList.remove(oldIndex);
			wrappedList.add(newIndex, element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					oldIndex, false, element), Diffs.createListDiffEntry(
					newIndex, true, element)));
			return element;
		} finally {
			updating = false;
		}
	}

	public Object remove(int index) {
		getterCalled();
		updating = true;
		try {
			Object oldElement = wrappedList.remove(index);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, false, oldElement)));
			return oldElement;
		} finally {
			updating = false;
		}
	}

	public boolean add(Object element) {
		updating = true;
		try {
			int index = wrappedList.size();
			boolean result = wrappedList.add(element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, true, element)));
			return result;
		} finally {
			updating = false;
		}
	}

	public void add(int index, Object element) {
		updating = true;
		try {
			wrappedList.add(index, element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, true, element)));
		} finally {
			updating = false;
		}
	}

	public boolean addAll(Collection c) {
		if (c.isEmpty()) {
			return false;
		}
		updating = true;
		try {
			int index = wrappedList.size();
			boolean result = wrappedList.addAll(c);
			setValues();
			ListDiffEntry[] entries = new ListDiffEntry[c.size()];
			int i = 0;
			for (Iterator it = c.iterator(); it.hasNext();) {
				Object o = it.next();
				entries[i++] = Diffs.createListDiffEntry(index++, true, o);
			}
			fireListChange(Diffs.createListDiff(entries));
			return result;
		} finally {
			updating = false;
		}
	}

	public boolean addAll(int index, Collection c) {
		if (c.isEmpty()) {
			return false;
		}
		updating = true;
		try {
			boolean result = wrappedList.addAll(index, c);
			setValues();
			ListDiffEntry[] entries = new ListDiffEntry[c.size()];
			int i = 0;
			for (Iterator it = c.iterator(); it.hasNext();) {
				Object o = it.next();
				entries[i++] = Diffs.createListDiffEntry(index++, true, o);
			}
			fireListChange(Diffs.createListDiff(entries));
			return result;
		} finally {
			updating = false;
		}
	}

	public boolean remove(Object o) {
		getterCalled();
		int index = wrappedList.indexOf(o);
		if (index == -1) {
			return false;
		}
		updating = true;
		try {
			Object oldElement = wrappedList.remove(index);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, false, oldElement)));
			return true;
		} finally {
			updating = false;
		}
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		boolean changed = false;
		updating = true;
		try {
			List diffEntries = new ArrayList();
			for (Iterator it = c.iterator(); it.hasNext();) {
				Object o = it.next();
				int index = wrappedList.indexOf(o);
				if (index != -1) {
					changed = true;
					Object oldElement = wrappedList.remove(index);
					diffEntries.add(Diffs.createListDiffEntry(index, false,
							oldElement));
				}
			}
			if (changed) {
				setValues();
				fireListChange(Diffs
						.createListDiff((ListDiffEntry[]) diffEntries
								.toArray(new ListDiffEntry[diffEntries.size()])));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		boolean changed = false;
		updating = true;
		try {
			List diffEntries = new ArrayList();
			int index = 0;
			for (Iterator it = wrappedList.iterator(); it.hasNext();) {
				Object o = it.next();
				boolean retain = c.contains(o);
				if (retain) {
					index++;
				} else {
					changed = true;
					it.remove();
					diffEntries.add(Diffs.createListDiffEntry(index, false, o));
				}
			}
			if (changed) {
				setValues();
				fireListChange(Diffs
						.createListDiff((ListDiffEntry[]) diffEntries
								.toArray(new ListDiffEntry[diffEntries.size()])));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public void clear() {
		updating = true;
		try {
			List diffEntries = new ArrayList();
			for (Iterator it = wrappedList.iterator(); it.hasNext();) {
				Object o = it.next();
				diffEntries.add(Diffs.createListDiffEntry(0, false, o));
			}
			wrappedList.clear();
			setValues();
			fireListChange(Diffs.createListDiff((ListDiffEntry[]) diffEntries
					.toArray(new ListDiffEntry[diffEntries.size()])));
		} finally {
			updating = false;
		}
	}

}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 221704)
 *     Matthew Hall - bug 223164
 *******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.ObservableMap;
import org.eclipse.core.internal.databinding.Util;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.0
 * 
 */
public class JavaBeanPropertyObservableMap extends ObservableMap implements
		IBeanObservable {

	private final Object object;

	private PropertyChangeListener mapListener = new PropertyChangeListener() {
		public void propertyChange(final PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						Map oldValue = wrappedMap;
						Map newValue = (Map) event.getNewValue();
						wrappedMap = new HashMap(newValue);
						
						fireMapChange(Diffs.computeMapDiff(oldValue, newValue));
					}
				});
			}
		}
	};

	private boolean updating = false;

	private PropertyDescriptor descriptor;

	private ListenerSupport collectionListenSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 */
	public JavaBeanPropertyObservableMap(Realm realm, Object object,
			PropertyDescriptor descriptor) {
		this(realm, object, descriptor, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param attachListeners
	 */
	public JavaBeanPropertyObservableMap(Realm realm, Object object,
			PropertyDescriptor descriptor, boolean attachListeners) {
		super(realm, new HashMap());
		this.object = object;
		this.descriptor = descriptor;
		this.attachListeners = attachListeners;
		if (attachListeners) {
			this.collectionListenSupport = new ListenerSupport(mapListener,
					descriptor.getName());
		}

		wrappedMap.putAll(getMap());
	}

	protected void firstListenerAdded() {
		if (attachListeners) {
			collectionListenSupport.hookListener(this.object);
		}
	}

	protected void lastListenerRemoved() {
		if (collectionListenSupport != null) {
			collectionListenSupport.dispose();
		}
	}

	private Object primGetMap() {
		try {
			Method readMethod = descriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, new Object[0]);
		} catch (IllegalArgumentException e) {
		} catch (IllegalAccessException e) {
		} catch (InvocationTargetException e) {
		}
		Assert.isTrue(false, "Could not read collection values"); //$NON-NLS-1$
		return null;
	}

	private void primSetMap(Object newValue) {
		Exception ex = null;
		try {
			Method writeMethod = descriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { newValue });
			return;
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
	}

	private Map getMap() {
		Map result = (Map) primGetMap();

		if (result == null)
			result = new HashMap();
		return result;
	}

	private void setMap() {
		primSetMap(new HashMap(wrappedMap));
	}

	public Object put(Object key, Object value) {
		checkRealm();
		updating = true;
		try {
			Object result = wrappedMap.put(key, value);
			if (!Util.equals(result, value)) {
				setMap();
				if (result == null) {
					fireMapChange(Diffs.createMapDiffSingleAdd(key, value));
				} else {
					fireMapChange(Diffs.createMapDiffSingleChange(key, result,
							value));
				}
			}
			return result;
		} finally {
			updating = false;
		}
	}

	public void putAll(Map map) {
		checkRealm();
		updating = true;
		try {
			Set addedKeys = new HashSet(map.size());
			Map changes = new HashMap(map.size());
			for (Iterator it = map.entrySet().iterator(); it.hasNext();) {
				Map.Entry entry = (Entry) it.next();
				Object key = entry.getKey();
				Object newValue = entry.getValue();
				Object oldValue = wrappedMap.put(key, newValue);
				if (oldValue == null) {
					addedKeys.add(key);
				} else if (!Util.equals(oldValue, newValue)) {
					changes.put(key, oldValue);
				}
			}
			if (!addedKeys.isEmpty() || !changes.isEmpty()) {
				setMap();
				fireMapChange(Diffs.createMapDiff(addedKeys,
						Collections.EMPTY_SET, changes.keySet(), changes,
						wrappedMap));
			}
		} finally {
			updating = false;
		}
	}

	public Object remove(Object key) {
		checkRealm();
		updating = true;
		try {
			Object result = wrappedMap.remove(key);
			if (result!=null) {
				setMap();
				fireMapChange(Diffs.createMapDiffSingleRemove(key, result));
			}
			return result;
		} finally {
			updating = false;
		}
	}

	public void clear() {
		checkRealm();
		if (wrappedMap.isEmpty())
			return;
		updating = true;
		try {
			Map oldMap = wrappedMap;
			wrappedMap = new HashMap();
			setMap();
			fireMapChange(Diffs.computeMapDiff(oldMap, Collections.EMPTY_MAP));
		} finally {
			updating = false;
		}
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return descriptor;
	}
}




/*******************************************************************************
 * Copyright (c) 2006-2008 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
 *     Brad Reynolds - bug 171616
 *     Matthew Hall - bug 221351, 223164
 *******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.ObservableSet;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableSet extends ObservableSet implements IBeanObservable {

	private final Object object;

	private PropertyChangeListener collectionListener = new PropertyChangeListener() {
		public void propertyChange(java.beans.PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						Set newElements = new HashSet(Arrays
								.asList(getValues()));
						Set addedElements = new HashSet(newElements);
						Set removedElements = new HashSet(wrappedSet);
						// remove all new elements from old elements to compute
						// the removed elements
						removedElements.removeAll(newElements);
						addedElements.removeAll(wrappedSet);
						wrappedSet = newElements;
						fireSetChange(Diffs.createSetDiff(addedElements,
								removedElements));
					}
				});
			}
		}
	};

	private boolean updating = false;

	private PropertyDescriptor descriptor;

	private ListenerSupport collectionListenSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 */
	public JavaBeanObservableSet(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType) {
		this(realm, object, descriptor, elementType, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 * @param attachListeners
	 */
	public JavaBeanObservableSet(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType,
			boolean attachListeners) {
		super(realm, new HashSet(), elementType);
		this.object = object;
		this.descriptor = descriptor;
		this.attachListeners = attachListeners;
		if (attachListeners) {
			this.collectionListenSupport = new ListenerSupport(
					collectionListener, descriptor.getName());
		}

		wrappedSet.addAll(Arrays.asList(getValues()));
	}

	protected void firstListenerAdded() {
		if (attachListeners) {
			collectionListenSupport.hookListener(this.object);
		}
	}

	protected void lastListenerRemoved() {
		if (collectionListenSupport != null) {
			collectionListenSupport.dispose();
		}
	}

	private Object primGetValues() {
		try {
			Method readMethod = descriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, new Object[0]);
		} catch (IllegalArgumentException e) {
		} catch (IllegalAccessException e) {
		} catch (InvocationTargetException e) {
		}
		Assert.isTrue(false, "Could not read collection values"); //$NON-NLS-1$
		return null;
	}

	private Object[] getValues() {
		Object[] values = null;

		Object result = primGetValues();
		if (descriptor.getPropertyType().isArray())
			values = (Object[]) result;
		else {
			// TODO add jUnit for POJO (var. SettableValue) collections
			Collection list = (Collection) result;
			if (list != null)
				values = list.toArray();
		}
		if (values == null)
			values = new Object[0];
		return values;
	}

	private void setValues() {
		if (descriptor.getPropertyType().isArray()) {
			Class componentType = descriptor.getPropertyType()
					.getComponentType();
			Object[] newArray = (Object[]) Array.newInstance(componentType,
					wrappedSet.size());
			wrappedSet.toArray(newArray);
			primSetValues(newArray);
		} else {
			// assume that it is a java.util.Set
			primSetValues(new HashSet(wrappedSet));
		}
	}

	public boolean add(Object o) {
		getterCalled();
		updating = true;
		try {
			boolean added = wrappedSet.add(o);
			if (added) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.singleton(o),
						Collections.EMPTY_SET));
			}
			return added;
		} finally {
			updating = false;
		}
	}

	public boolean remove(Object o) {
		getterCalled();
		updating = true;
		try {
			boolean removed = wrappedSet.remove(o);
			if (removed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET,
						Collections.singleton(o)));
			}
			return removed;
		} finally {
			updating = false;
		}
	}

	public boolean addAll(Collection c) {
		getterCalled();
		updating = true;
		try {
			Set additions = new HashSet();
			for (Iterator iterator = c.iterator(); iterator.hasNext();) {
				Object element = iterator.next();
				if (wrappedSet.add(element))
					additions.add(element);
			}
			boolean changed = !additions.isEmpty();
			if (changed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(additions,
						Collections.EMPTY_SET));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		updating = true;
		try {
			Set removals = new HashSet();
			for (Iterator iterator = c.iterator(); iterator.hasNext();) {
				Object element = iterator.next();
				if (wrappedSet.remove(element))
					removals.add(element);
			}
			boolean changed = !removals.isEmpty();
			if (changed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET,
						removals));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		updating = true;
		try {
			Set removals = new HashSet();
			for (Iterator iterator = wrappedSet.iterator(); iterator.hasNext();) {
				Object element = iterator.next();
				if (!c.contains(element)) {
					iterator.remove();
					removals.add(element);
				}
			}
			boolean changed = !removals.isEmpty();
			if (changed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET,
						removals));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public void clear() {
		getterCalled();
		if (wrappedSet.isEmpty())
			return;

		updating = true;
		try {
			Set removals = new HashSet(wrappedSet);
			wrappedSet.clear();
			setValues();
			fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET, removals));
		} finally {
			updating = false;
		}
	}

	private void primSetValues(Object newValue) {
		Exception ex = null;
		try {
			Method writeMethod = descriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { newValue });
			return;
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return descriptor;
	}
}




 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 221704)
 *     Matthew Hall - bug 194734
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyDescriptor;
import java.util.Collection;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.map.DecoratingObservableMap;
import org.eclipse.core.databinding.observable.map.IMapChangeListener;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.internal.databinding.Util;

/**
 * {@link IBeanObservable} decorator for an {@link IObservableMap}.
 * 
 * @since 3.3
 */
public class BeanObservableMapDecorator extends DecoratingObservableMap
		implements IBeanObservable {
	private Object observed;
	private PropertyDescriptor propertyDescriptor;

	/**
	 * @param decorated
	 * @param observed 
	 * @param propertyDescriptor
	 */
	public BeanObservableMapDecorator(IObservableMap decorated,
			Object observed,
			PropertyDescriptor propertyDescriptor) {
		super(decorated, true);
		this.delegate = delegate;
		this.observed = observed;
		this.propertyDescriptor = propertyDescriptor;
	}

	public void dispose() {
		this.propertyDescriptor = null;
		super.dispose();

	public boolean isStale() {
		return delegate.isStale();
	}

	public boolean containsKey(Object key) {
		return delegate.containsKey(key);
	}

	public boolean containsValue(Object value) {
		return delegate.containsValue(value);
	}

	public Set entrySet() {
		return delegate.entrySet();
	}

	public Object get(Object key) {
		return delegate.get(key);
	}

	public Set keySet() {
		return delegate.keySet();
	}

	public Object put(Object key, Object value) {
		return delegate.put(key, value);
	}

	public Object remove(Object key) {
		return delegate.remove(key);
	}

	public Collection values() {
		return delegate.values();
	}

	public void putAll(Map map) {
		delegate.putAll(map);
	}

	public void clear() {
		delegate.clear();
	}

	public boolean isEmpty() {
		return delegate.isEmpty();
	}

	public int size() {
		return delegate.size();
	}

	public Object getObserved() {
		IObservable decorated = getDecorated();
		if (decorated instanceof IObserving)
			return ((IObserving) decorated).getObserved();
		return null;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	/**
	 * @return the wrapped map
	 */
	public IObservableMap getDelegate() {
		return delegate;
	}	
	public void dispose() {
		delegate.dispose();
	}

	public void addChangeListener(IChangeListener listener) {
		delegate.addChangeListener(listener);
	}

	public void removeChangeListener(IChangeListener listener) {
		delegate.removeChangeListener(listener);
	}

	public void addMapChangeListener(IMapChangeListener listener) {
		delegate.addMapChangeListener(listener);
	}

	public void removeMapChangeListener(IMapChangeListener listener) {
		delegate.removeMapChangeListener(listener);
	}

	public void addStaleListener(IStaleListener listener) {
		delegate.addStaleListener(listener);
	}

	public void removeStaleListener(IStaleListener listener) {
		delegate.removeStaleListener(listener);
	}

	public boolean equals(Object obj) {
		if (obj instanceof BeanObservableMapDecorator) {
			BeanObservableMapDecorator other = (BeanObservableMapDecorator) obj;
			return Util.equals(other.delegate, delegate);
		}
		return Util.equals(delegate, obj);
	}

	public int hashCode() {
		return delegate.hashCode();
	}
}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 194734
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyDescriptor;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.value.DecoratingObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.internal.databinding.Util;

/**
 * {@link IBeanObservable} decorator for an {@link IObservableValue}.
 * 
 * @since 3.3
 */
public class BeanObservableValueDecorator extends DecoratingObservableValue
		implements IBeanObservable {
	private PropertyDescriptor propertyDescriptor;
	private final PropertyDescriptor descriptor;
	private final IObservableValue observed;

	/**
	 * @param decorated
	 * @param propertyDescriptor
	 * @param descriptor
	 */
	public BeanObservableValueDecorator(IObservableValue decorated,
			PropertyDescriptor propertyDescriptor) {
		super(decorated, true);
		this.propertyDescriptor = propertyDescriptor;
		this.descriptor = descriptor;
	}

	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 void dispose() {
		this.propertyDescriptor = null;
		super.dispose();
	
	public boolean equals(Object obj) {
		if (obj instanceof BeanObservableValueDecorator) {
			BeanObservableValueDecorator other = (BeanObservableValueDecorator) obj;
			return Util.equals(other.delegate, delegate);
		}
		return Util.equals(delegate, obj);
	}

	public Realm getRealm() {
		return delegate.getRealm();
	}

	public Object getValue() {
		return delegate.getValue();
	}

	public Object getValueType() {
		return delegate.getValueType();
	}
	
	public int hashCode() {
		return delegate.hashCode();
	}

	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);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
	 */
	public Object getObserved() {
		IObservable decorated = getDecorated();
		if (decorated instanceof IObserving)
			return ((IObserving) decorated).getObserved();
		return null;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
	 */
	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}
	
	/**
	 * @return observable value delegate
	 */
	public IObservableValue getDelegate() {
		return delegate;
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 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
 *     Brad Reynolds - bug 164653
 *     Brad Reynolds - bug 164134, 171616
 *******************************************************************************/
package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.databinding.util.Policy;
import org.eclipse.core.internal.databinding.Util;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableValue extends AbstractObservableValue implements IBeanObservable {
	private final Object object;
	private boolean updating = false;

	private final PropertyDescriptor propertyDescriptor;
	private ListenerSupport listenerSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 */
	public JavaBeanObservableValue(Realm realm, Object object,
			PropertyDescriptor descriptor) {
		this(realm, object, descriptor, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param attachListeners
	 */
	public JavaBeanObservableValue(Realm realm, Object object,
			PropertyDescriptor descriptor, boolean attachListeners) {
		super(realm);
		this.object = object;
		this.propertyDescriptor = descriptor;
		this.attachListeners = attachListeners;
	}

	protected void firstListenerAdded() {
		if (!attachListeners) {
			return;
		}
			
		PropertyChangeListener listener = new PropertyChangeListener() {
			public void propertyChange(java.beans.PropertyChangeEvent event) {
				if (!updating) {
					final ValueDiff diff = Diffs.createValueDiff(event.getOldValue(),
											event.getNewValue());
					getRealm().exec(new Runnable(){
						public void run() {
							fireValueChange(diff);
						}});
				}
			}
		};
		
		if (listenerSupport == null) {
			listenerSupport = new ListenerSupport(listener, propertyDescriptor.getName());
		}
		
		listenerSupport.hookListener(object);
	}

	public void doSetValue(Object value) {
		updating = true;
		try {
			Object oldValue = doGetValue();
			
			if (Util.equals(oldValue, value)) {
				return;
			}
			
			Method writeMethod = propertyDescriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { value });
			fireValueChange(Diffs.createValueDiff(oldValue, doGetValue()));
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not change value of " + object + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
		} finally {
			updating = false;
		}
	}

	public Object doGetValue() {
		try {
			Method readMethod = propertyDescriptor.getReadMethod();
			if (readMethod == null) {
				throw new BindingException(propertyDescriptor.getName()
						+ " property does not have a read method."); //$NON-NLS-1$
			}
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, null);
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not read value of " + object + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
			return null;
		}
	}

	protected void lastListenerRemoved() {
		unhookListener();
	}

	private void unhookListener() {
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
	}

	public Object getValueType() {
		return propertyDescriptor.getPropertyType();
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		unhookListener();
		super.dispose();
	}
}




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 208858, 194734
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyDescriptor;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.list.DecoratingObservableList;
import org.eclipse.core.databinding.observable.list.AbstractObservableList;
import org.eclipse.core.databinding.observable.list.IListChangeListener;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * {@link IBeanObservable} decorator for an {@link IObservableList}.
 * 
 * @since 3.3
 */
public class BeanObservableListDecorator extends DecoratingObservableList
		implements IBeanObservable {
	private IObservableList delegate;
	private IStaleListener delegateStaleListener;
	private IListChangeListener delegateListChangeListener;

	private Object observed;
	private PropertyDescriptor propertyDescriptor;

	/**
	 * @param decorated
	 * @param observed
	 * @param propertyDescriptor
	 */
	public BeanObservableListDecorator(IObservableList decorated,
			PropertyDescriptor propertyDescriptor) {
		super(decorated, true);
		this.delegate = delegate;
		this.observed = observed;
		this.propertyDescriptor = propertyDescriptor;
	}

	public void add(int index, Object element) {
		delegate.add(index, element);
	}

	public boolean add(Object o) {
		return delegate.add(o);
	}

	public boolean addAll(Collection c) {
		return delegate.addAll(c);
	}

	public boolean addAll(int index, Collection c) {
		return delegate.addAll(index, c);
	}

	public void clear() {
		delegate.clear();
	}

	public void dispose() {
		this.propertyDescriptor = null;
		super.dispose();
	}

	public boolean equals(Object o) {
		getterCalled();
		if (o instanceof BeanObservableListDecorator) {
			BeanObservableListDecorator other = (BeanObservableListDecorator) o;
			return Util.equals(other.delegate, delegate);
		}
		return Util.equals(delegate, o);
	}

	public Object get(int index) {
		getterCalled();
		return delegate.get(index);
	}

	public Object getElementType() {
		return delegate.getElementType();
	}

	public int hashCode() {
		getterCalled();
		return delegate.hashCode();
	}

	public int indexOf(Object o) {
		getterCalled();
		return delegate.indexOf(o);
	}

	public Iterator iterator() {
		getterCalled();
		return delegate.iterator();
	}

	public int lastIndexOf(Object o) {
		getterCalled();
		return delegate.lastIndexOf(o);
	}

	public ListIterator listIterator() {
		getterCalled();
		return delegate.listIterator();
	}

	public ListIterator listIterator(int index) {
		getterCalled();
		return delegate.listIterator(index);
	}

	public Object move(int oldIndex, int newIndex) {
		return delegate.move(oldIndex, newIndex);
	}

	public Object remove(int index) {
		return delegate.remove(index);
	}

	public boolean remove(Object o) {
		return delegate.remove(o);
	}

	public boolean removeAll(Collection c) {
		return delegate.removeAll(c);
	}

	public boolean retainAll(Collection c) {
		return delegate.retainAll(c);
	}

	public Object set(int index, Object element) {
		return delegate.set(index, element);
	}

	protected int doGetSize() {
		return delegate.size();
	}

	public List subList(int fromIndex, int toIndex) {
		getterCalled();
		return delegate.subList(fromIndex, toIndex);
	}

	public Object[] toArray() {
		getterCalled();
		return delegate.toArray();
	}

	public Object[] toArray(Object[] a) {
		return delegate.toArray(a);
	}

	protected void firstListenerAdded() {
		delegateStaleListener = new IStaleListener() {
			public void handleStale(StaleEvent staleEvent) {
				fireStale();
			}
		};
		delegate.addStaleListener(delegateStaleListener);

		delegateListChangeListener = new IListChangeListener() {
			public void handleListChange(ListChangeEvent event) {
				fireListChange(event.diff);
			}
		};
		delegate.addListChangeListener(delegateListChangeListener);
	}

	protected void lastListenerRemoved() {
		delegate.removeStaleListener(delegateStaleListener);
		delegateStaleListener = null;

		delegate.removeListChangeListener(delegateListChangeListener);
		delegateListChangeListener = null;
	}

	private void getterCalled() {
		ObservableTracker.getterCalled(this);
	}

	/**
	 * @return list being delegated to
	 */
	public IObservableList getDelegate() {
		return delegate;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
	 */
	public Object getObserved() {
		IObservable decorated = getDecorated();
		if (decorated instanceof IObserving)
			return ((IObserving) decorated).getObserved();
		return null;
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
	 */
	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bugs 164268, 171616, 147515
 *     Matthew Hall - bugs 221704, 234686, 194734
 *     Thomas Kratz - bug 213787
 *******************************************************************************/
package org.eclipse.core.databinding.beans;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;

import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanPropertyObservableMap;
import org.eclipse.core.runtime.Assert;

/**

	 */
	public static IObservableValue observeValue(Realm realm, Object bean,
			String propertyName) {
		IValueProperty property = BeanProperties.valueProperty(bean.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableValueDecorator(PropertyObservables
				.observeValue(realm, bean, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(IObservableSet domain,
			Class beanClass, String propertyName) {
		IValueProperty property = BeanProperties.valueProperty(beanClass,
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
				domain, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(Realm realm, Object bean,
			String propertyName) {
		IMapProperty property = BeanProperties.mapProperty(bean.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
				realm, bean, property), propertyDescriptor);
	}

	/**

		return observeMap(Realm.getDefault(), bean, propertyName);
	}

	/*package*/ static PropertyDescriptor getPropertyDescriptor(Class beanClass,
			String propertyName) {
		BeanInfo beanInfo;
		try {
			beanInfo = Introspector.getBeanInfo(beanClass);
		} catch (IntrospectionException e) {
			// cannot introspect, give up
			return null;
		}
		PropertyDescriptor[] propertyDescriptors = beanInfo
				.getPropertyDescriptors();
		for (int i = 0; i < propertyDescriptors.length; i++) {
			PropertyDescriptor descriptor = propertyDescriptors[i];
			if (descriptor.getName().equals(propertyName)) {
				return descriptor;
			}
		}
		throw new BindingException(
				"Could not find property with name " + propertyName + " in class " + beanClass); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/**
	 * Returns an array of observable maps in the default realm tracking the
	 * current values of the named propertys for the beans in the given set.

	 */
	public static IObservableList observeList(Realm realm, Object bean,
			String propertyName, Class elementType) {
		IListProperty property = BeanProperties.listProperty(bean.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();

		return new BeanObservableListDecorator(PropertyObservables.observeList(
				realm, bean, property), propertyDescriptor);
	}

	/**


		IObservableValue value = MasterDetailObservables.detailValue(master,
				valueFactory(realm, propertyName), propertyType);
		return new BeanObservableValueDecorator(value, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						propertyName));

		return decorator;
	}

	/**

	 * @since 1.1
	 */
	public static IObservableValue observeDetailValue(Realm realm,
			IObservableValue master, Class masterType, String propertyName,
			Class propertyType) {
		Assert.isNotNull(masterType, "masterType cannot be null"); //$NON-NLS-1$
		IObservableValue value = MasterDetailObservables.detailValue(master,
				valueFactory(realm, propertyName), propertyType);
		return new BeanObservableValueDecorator(value, BeanPropertyHelper
				.getPropertyDescriptor(masterType, propertyName));
						propertyName));

		return decorator;
	}

	/**

		IObservableList observableList = MasterDetailObservables.detailList(
				master, listFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableListDecorator(observableList,
				BeanPropertyHelper.getValueTypePropertyDescriptor(master,
						propertyName));

		return decorator;
	}

	/**

		IObservableSet observableSet = MasterDetailObservables.detailSet(
				master, setFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						propertyName));

		return decorator;
	}

	/**

			IObservableValue master, String propertyName) {
		IObservableMap observableMap = MasterDetailObservables.detailMap(
				master, mapPropertyFactory(realm, propertyName));
		return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						propertyName));
		return decorator;
	}

	/**

	 */
	public static IObservableSet observeSet(Realm realm, Object bean,
			String propertyName, Class elementType) {
		ISetProperty property = BeanProperties.setProperty(bean.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();

		return new BeanObservableSetDecorator(PropertyObservables.observeSet(
				realm, bean, property), propertyDescriptor);
	}

	/**

	public static IObservableFactory mapPropertyFactory(String propertyName) {
		return mapPropertyFactory(Realm.getDefault(), propertyName);
	}

	/**
	 * @param elementType
	 *            can be <code>null</code>
	 * @param propertyDescriptor
	 * @return type of the items in a collection/array property
	 */
	/*package*/ static Class getCollectionElementType(Class elementType,
			PropertyDescriptor propertyDescriptor) {
		if (elementType == null) {
			Class propertyType = propertyDescriptor.getPropertyType();
			elementType = propertyType.isArray() ? propertyType
					.getComponentType() : Object.class;
		}

		return elementType;
	}

	/**
	 * @param observable
	 * @param propertyName
	 * @return property descriptor or <code>null</code>
	 */
	/* package*/ static PropertyDescriptor getValueTypePropertyDescriptor(
			IObservableValue observable, String propertyName) {
		return (observable.getValueType() != null) ? getPropertyDescriptor(
				(Class) observable.getValueType(), propertyName) : null;
	}
}




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Matthew Hall - bugs 221704, 234686, 194734
 *******************************************************************************/

package org.eclipse.core.databinding.beans;

import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanPropertyObservableMap;

/**
 * A factory for creating observable objects for POJOs (plain old java objects)

	 */
	public static IObservableValue observeValue(Realm realm, Object pojo,
			String propertyName) {
		IValueProperty property = PojoProperties.valueProperty(pojo.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableValueDecorator(PropertyObservables
				.observeValue(realm, pojo, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(IObservableSet domain,
			Class pojoClass, String propertyName) {
		IValueProperty property = PojoProperties.valueProperty(pojoClass,
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
				domain, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(Realm realm, Object pojo,
			String propertyName) {
		IMapProperty property = PojoProperties.mapProperty(pojo.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
				realm, pojo, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableList observeList(Realm realm, Object pojo,
			String propertyName, Class elementType) {
		IListProperty property = PojoProperties.listProperty(pojo.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableListDecorator(PropertyObservables.observeList(
				realm, pojo, property), propertyDescriptor);
				elementType, false);
	}

	/**

	 */
	public static IObservableSet observeSet(Realm realm, Object pojo,
			String propertyName, Class elementType) {
		ISetProperty property = PojoProperties.setProperty(pojo.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableSetDecorator(PropertyObservables.observeSet(
				realm, pojo, property), propertyDescriptor);
				elementType, false);
	}

	/**


		IObservableValue value = MasterDetailObservables.detailValue(master,
				valueFactory(realm, propertyName), propertyType);
		return new BeanObservableValueDecorator(value, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						master, propertyName));

		return decorator;
	}

	/**

		IObservableList observableList = MasterDetailObservables.detailList(
				master, listFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableListDecorator(observableList,
				BeanPropertyHelper.getValueTypePropertyDescriptor(master,
						propertyName));

		return decorator;
	}

	/**

		IObservableSet observableSet = MasterDetailObservables.detailSet(
				master, setFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						.getValueTypePropertyDescriptor(master, propertyName));

		return decorator;
	}

	/**

			IObservableValue master, String propertyName) {
		IObservableMap observableMap = MasterDetailObservables.detailMap(
				master, mapPropertyFactory(realm, propertyName));
		return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						.getValueTypePropertyDescriptor(master, propertyName));
		return decorator;
	}

	/**




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.beans;

import java.beans.PropertyDescriptor;

import org.eclipse.core.databinding.property.IProperty;

/**
 * @since 1.2
 * 
 */
public interface IBeanProperty extends IProperty {
	/**
	 * @return property descriptor for the bean property
	 */
	public PropertyDescriptor getPropertyDescriptor();
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.BasicMapProperty;

/**
 * @since 3.3
 * 
 */
public class BeanMapProperty extends BasicMapProperty implements IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedMap = Collections.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param attachListener
	 */
	public BeanMapProperty(PropertyDescriptor propertyDescriptor,
			boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							if (!isUpdating(source)) {
								Object oldValue = evt.getOldValue();
								Object newValue = evt.getNewValue();
								if (oldValue == null && newValue == null) {
									// Obscure condition indicating new and old
									// values are unknown
									oldValue = sourceToCachedMap.get(source);
									newValue = BeanPropertyHelper.getProperty(
											source, propertyDescriptor);
								}
								sourceToCachedMap.put(source, newValue);
								fireMapChange(source, Diffs.computeMapDiff(
										asMap(oldValue), asMap(newValue)));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedMap.put(source, BeanPropertyHelper.getProperty(
					source, propertyDescriptor));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedMap.remove(source);
		}
	}

	public Map getMap(Object source) {
		if (source == null)
			return Collections.EMPTY_MAP;
		Object propertyValue = BeanPropertyHelper.getProperty(source,
				propertyDescriptor);
		return asMap(propertyValue);
	}

	private Map asMap(Object propertyValue) {
		if (propertyValue == null)
			return new HashMap();
		return (Map) propertyValue;
	}

	protected void setMap(Object source, Map map, MapDiff diff) {
		if (source == null)
			return;

		super.setMap(source, map, diff);
		sourceToCachedMap.put(source, map);
	}

	protected void doSetMap(Object source, Map map) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor, map);
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedMap != null) {
			sourceToCachedMap.clear();
			sourceToCachedMap = null;
		}
		super.dispose();
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.property.BasicValueProperty;

/**
 * @since 3.3
 * 
 */
public class BeanValueProperty extends BasicValueProperty implements
		IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private Class valueType;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedValue = Collections
			.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param valueType
	 * @param attachListener
	 */
	public BeanValueProperty(PropertyDescriptor propertyDescriptor,
			Class valueType, boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.valueType = valueType == null ? propertyDescriptor
				.getPropertyType() : valueType;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							if (!isUpdating(source)) {
								Object oldValue = evt.getOldValue();
								Object newValue = evt.getNewValue();
								if (oldValue == null && newValue == null) {
									// Obscure condition indicating new and old
									// values are unknown
									oldValue = sourceToCachedValue.get(source);
									newValue = getValue(source);
								}
								sourceToCachedValue.put(source, newValue);
								fireValueChange(source, Diffs.createValueDiff(
										oldValue, newValue));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedValue.put(source, getValue(source));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedValue.remove(source);
		}
	}

	public Object getValue(Object source) {
		if (source == null)
			return null;
		return BeanPropertyHelper.getProperty(source, propertyDescriptor);
	}

	public void setValue(Object source, Object value) {
		if (source == null)
			return;
		super.setValue(source, value);
		sourceToCachedValue.put(source, getValue(source));
	}

	protected void doSetValue(Object source, Object value) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor, value);
	}

	public Object getValueType() {
		return valueType;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		valueType = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedValue != null) {
			sourceToCachedValue.clear();
			sourceToCachedValue = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.beans;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.beans.BeanListProperty;
import org.eclipse.core.internal.databinding.beans.BeanMapProperty;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.BeanSetProperty;
import org.eclipse.core.internal.databinding.beans.BeanValueProperty;

/**
 * @since 1.2
 */
public class PojoProperties {
	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName) {
		return valueProperty(beanClass, propertyName, null);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @param valueType
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName, Class valueType) {
		return new BeanValueProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), valueType, false);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass, String propertyName) {
		return setProperty(beanClass, propertyName, null);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @param elementType
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanSetProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, false);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName) {
		return listProperty(beanClass, propertyName, null);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @param elementType
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanListProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, false);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a map property for the given property name of the given bean
	 *         class.
	 */
	public static IMapProperty mapProperty(Class beanClass, String propertyName) {
		return new BeanMapProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), false);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.property.BasicListProperty;

/**
 * @since 3.3
 * 
 */
public class BeanListProperty extends BasicListProperty implements
		IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private Class elementType;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedList = Collections.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param elementType
	 * @param attachListener
	 */
	public BeanListProperty(PropertyDescriptor propertyDescriptor,
			Class elementType, boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.elementType = elementType == null ? BeanPropertyHelper
				.getCollectionPropertyElementType(propertyDescriptor)
				: elementType;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							if (!isUpdating(source)) {
								Object oldValue = evt.getOldValue();
								Object newValue = evt.getNewValue();
								if (oldValue == null && newValue == null) {
									// Obscure condition indicating new and old
									// values are unknown
									oldValue = sourceToCachedList.get(source);
									newValue = BeanPropertyHelper.getProperty(
											source, propertyDescriptor);
								}
								sourceToCachedList.put(source, newValue);
								fireListChange(source, Diffs.computeListDiff(
										asList(oldValue), asList(newValue)));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedList.put(source, BeanPropertyHelper.getProperty(
					source, propertyDescriptor));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedList.remove(source);
		}
	}

	public List getList(Object source) {
		if (source == null)
			return Collections.EMPTY_LIST;
		Object propertyValue = BeanPropertyHelper.getProperty(source,
				propertyDescriptor);
		return asList(propertyValue);
	}

	private List asList(Object propertyValue) {
		if (propertyValue == null)
			return new ArrayList();
		if (propertyDescriptor.getPropertyType().isArray())
			return new ArrayList(Arrays.asList((Object[]) propertyValue));
		return (List) propertyValue;
	}

	protected void setList(Object source, List list, ListDiff diff) {
		if (source == null)
			return;

		super.setList(source, list, diff);
		sourceToCachedList.put(source, list);
	}

	protected void doSetList(Object source, List list) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor,
				convertListToBeanPropertyType(list));
	}

	private Object convertListToBeanPropertyType(List list) {
		Object propertyValue = list;
		if (propertyDescriptor.getPropertyType().isArray()) {
			Class componentType = propertyDescriptor.getPropertyType()
					.getComponentType();
			Object[] array = (Object[]) Array.newInstance(componentType, list
					.size());
			list.toArray(array);
			propertyValue = array;
		}
		return propertyValue;
	}

	public Object getElementType() {
		return elementType;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		elementType = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedList != null) {
			sourceToCachedList.clear();
			sourceToCachedList = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.databinding.property.BasicSetProperty;

/**
 * @since 3.3
 * 
 */
public class BeanSetProperty extends BasicSetProperty implements IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private Class elementType;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedSet = Collections.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param elementType
	 * @param attachListener
	 */
	public BeanSetProperty(PropertyDescriptor propertyDescriptor,
			Class elementType, boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.elementType = elementType == null ? BeanPropertyHelper
				.getCollectionPropertyElementType(propertyDescriptor)
				: elementType;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							if (!isUpdating(source)) {
								Object oldValue = evt.getOldValue();
								Object newValue = evt.getNewValue();
								if (oldValue == null && newValue == null) {
									// Obscure condition indicating new and old
									// values are unknown
									oldValue = sourceToCachedSet.get(source);
									newValue = BeanPropertyHelper.getProperty(
											source, propertyDescriptor);
								}
								sourceToCachedSet.put(source, newValue);
								fireSetChange(source, Diffs.computeSetDiff(
										asSet(oldValue), asSet(newValue)));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedSet.put(source, BeanPropertyHelper.getProperty(
					source, propertyDescriptor));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedSet.remove(source);
		}
	}

	public Set getSet(Object source) {
		if (source == null)
			return Collections.EMPTY_SET;
		Object propertyValue = BeanPropertyHelper.getProperty(source,
				propertyDescriptor);
		return asSet(propertyValue);
	}

	private Set asSet(Object propertyValue) {
		if (propertyValue == null)
			return Collections.EMPTY_SET;
		if (propertyDescriptor.getPropertyType().isArray())
			return new HashSet(Arrays.asList((Object[]) propertyValue));
		return (Set) propertyValue;
	}

	protected void setSet(Object source, Set set, SetDiff diff) {
		if (source == null)
			return;
		super.setSet(source, set, diff);
		sourceToCachedSet.put(source, set);
	}

	protected void doSetSet(Object source, Set set) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor,
				convertSetToBeanPropertyType(set));
	}

	private Object convertSetToBeanPropertyType(Set set) {
		Object propertyValue = set;
		if (propertyDescriptor.getPropertyType().isArray()) {
			Class componentType = propertyDescriptor.getPropertyType()
					.getComponentType();
			Object[] array = (Object[]) Array.newInstance(componentType, set
					.size());
			set.toArray(array);
			propertyValue = array;
		}
		return propertyValue;
	}

	public Object getElementType() {
		return elementType;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		elementType = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedSet != null) {
			sourceToCachedSet.clear();
			sourceToCachedSet = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.beans;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.beans.BeanListProperty;
import org.eclipse.core.internal.databinding.beans.BeanMapProperty;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.BeanSetProperty;
import org.eclipse.core.internal.databinding.beans.BeanValueProperty;

/**
 * @since 1.2
 * 
 */
public class BeanProperties {
	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName) {
		return valueProperty(beanClass, propertyName, null);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @param valueType
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName, Class valueType) {
		return new BeanValueProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), valueType, true);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass, String propertyName) {
		return setProperty(beanClass, propertyName, null);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @param elementType
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanSetProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, true);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName) {
		return listProperty(beanClass, propertyName, null);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @param elementType
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanListProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, true);
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a map property for the given property name of the given bean
	 *         class.
	 */
	public static IMapProperty mapProperty(Class beanClass, String propertyName) {
		return new BeanMapProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), true);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.util.Policy;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

/**
 * @since 1.2
 * 
 */
public class BeanPropertyHelper {
	/**
	 * Sets the contents of the given property on the given source object to the
	 * given value.
	 * 
	 * @param source
	 *            the source object which has the property being updated
	 * @param propertyDescriptor
	 *            the property being changed
	 * @param value
	 *            the new value of the property
	 */
	public static void setProperty(Object source,
			PropertyDescriptor propertyDescriptor, Object value) {
		try {
			Method writeMethod = propertyDescriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(source, new Object[] { value });
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not change value of " + source + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
		}
	}

	/**
	 * Returns the contents of the given property for the given bean.
	 * 
	 * @param source
	 *            the source bean
	 * @param propertyDescriptor
	 *            the property to retrieve
	 * @return the contents of the given property for the given bean.
	 */
	public static Object getProperty(Object source,
			PropertyDescriptor propertyDescriptor) {
		try {
			Method readMethod = propertyDescriptor.getReadMethod();
			if (readMethod == null) {
				throw new BindingException(propertyDescriptor.getName()
						+ " property does not have a read method."); //$NON-NLS-1$
			}
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(source, null);
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not read value of " + source + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
			return null;
		}
	}

	/**
	 * Returns the element type of the given collection-typed property for the
	 * given bean.
	 * 
	 * @param descriptor
	 *            the property being inspected
	 * @return the element type of the given collection-typed property if it is
	 *         an array property, or Object.class otherwise.
	 */
	public static Class getCollectionPropertyElementType(
			PropertyDescriptor descriptor) {
		Class propertyType = descriptor.getPropertyType();
		return propertyType.isArray() ? propertyType.getComponentType()
				: Object.class;
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return the PropertyDescriptor for the named property on the given bean
	 *         class
	 */
	public static PropertyDescriptor getPropertyDescriptor(Class beanClass,
			String propertyName) {
		BeanInfo beanInfo;
		try {
			beanInfo = Introspector.getBeanInfo(beanClass);
		} catch (IntrospectionException e) {
			// cannot introspect, give up
			return null;
		}
		PropertyDescriptor[] propertyDescriptors = beanInfo
				.getPropertyDescriptors();
		for (int i = 0; i < propertyDescriptors.length; i++) {
			PropertyDescriptor descriptor = propertyDescriptors[i];
			if (descriptor.getName().equals(propertyName)) {
				return descriptor;
			}
		}
		throw new BindingException(
				"Could not find property with name " + propertyName + " in class " + beanClass); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/**
	 * @param observable
	 * @param propertyName
	 * @return property descriptor or <code>null</code>
	 */
	/* package */public static PropertyDescriptor getValueTypePropertyDescriptor(
			IObservableValue observable, String propertyName) {
		if (observable.getValueType() != null)
			return getPropertyDescriptor((Class) observable.getValueType(),
					propertyName);
		return null;
	}
}

Lines 7-13 Link Here

(-)src/org/eclipse/core/databinding/observable/map/ComputedObservableMap.java (-5 / +37 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Matthew Hall - bug 241585	10	* Matthew Hall - bugs 241585, 194734
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.core.databinding.observable.map;	13	package org.eclipse.core.databinding.observable.map;
Lines 31-37 Link Here
31	*/	31	*/
32	public abstract class ComputedObservableMap extends AbstractObservableMap {	32	public abstract class ComputedObservableMap extends AbstractObservableMap {
33		33
34	private final IObservableSet keySet;	34	private IObservableSet keySet;
35		35
36	private ISetChangeListener setChangeListener = new ISetChangeListener() {	36	private ISetChangeListener setChangeListener = new ISetChangeListener() {
37	public void handleSetChange(SetChangeEvent event) {	37	public void handleSetChange(SetChangeEvent event) {
Lines 109-118 Link Here
109	this.keySet.addSetChangeListener(setChangeListener);	109	this.keySet.addSetChangeListener(setChangeListener);
110	}	110	}
111		111
		112	/**
		113	* @deprecated Subclasses are no longer required to call this method.
		114	*/
112	protected void init() {	115	protected void init() {
113	for (Iterator it = this.keySet.iterator(); it.hasNext();) {	116	}
114	Object key = it.next();	117
115	hookListener(key);	118	protected void firstListenerAdded() {
		119	hookListeners();
		120	}
		121
		122	protected void lastListenerRemoved() {
		123	unhookListeners();
		124	}
		125
		126	private void hookListeners() {
		127	if (keySet != null) {
		128	for (Iterator it = this.keySet.iterator(); it.hasNext();) {
		129	Object key = it.next();
		130	hookListener(key);
		131	}
		132	}
		133	}
		134
		135	private void unhookListeners() {
		136	if (keySet != null) {
		137	Object[] keys = keySet.toArray();
		138	for (int i = 0; i < keys.length; i++) {
		139	unhookListener(keys[i]);
		140	}
		141	keySet = null;
116	}	142	}
117	}	143	}
118		144
Lines 163-166 Link Here
163	* @return the old value for the given key	189	* @return the old value for the given key
164	*/	190	*/
165	protected abstract Object doPut(Object key, Object value);	191	protected abstract Object doPut(Object key, Object value);
		192
		193	public void dispose() {
		194	unhookListeners();
		195	entrySet = null;
		196	super.dispose();
		197	}
166	}	198	}

Lines 7-17 Link Here

(-)src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java (-11 / +20 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bugs 164653, 167204
11	* Brad Reynolds - bug 167204	11	* Matthew Hall - bugs 118516, 208858, 208332, 194734
12	* Matthew Hall - bug 118516
13	* Matthew Hall - bug 208858
14	* Matthew Hall - bug 208332
15	*******************************************************************************/	12	*******************************************************************************/
16		13
17	package org.eclipse.core.databinding.observable.list;	14	package org.eclipse.core.databinding.observable.list;
Lines 76-86 Link Here
76	}	73	}
77		74
78	public synchronized void addListChangeListener(IListChangeListener listener) {	75	public synchronized void addListChangeListener(IListChangeListener listener) {
79	changeSupport.addListener(ListChangeEvent.TYPE, listener);	76	if (changeSupport != null) {
		77	changeSupport.addListener(ListChangeEvent.TYPE, listener);
		78	}
80	}	79	}
81		80
82	public synchronized void removeListChangeListener(IListChangeListener listener) {	81	public synchronized void removeListChangeListener(IListChangeListener listener) {
83	changeSupport.removeListener(ListChangeEvent.TYPE, listener);	82	if (changeSupport != null) {
		83	changeSupport.removeListener(ListChangeEvent.TYPE, listener);
		84	}
84	}	85	}
85		86
86	protected void fireListChange(ListDiff diff) {	87	protected void fireListChange(ListDiff diff) {
Lines 90-108 Link Here
90	}	91	}
91		92
92	public synchronized void addChangeListener(IChangeListener listener) {	93	public synchronized void addChangeListener(IChangeListener listener) {
93	changeSupport.addChangeListener(listener);	94	if (changeSupport != null) {
		95	changeSupport.addChangeListener(listener);
		96	}
94	}	97	}
95		98
96	public synchronized void removeChangeListener(IChangeListener listener) {	99	public synchronized void removeChangeListener(IChangeListener listener) {
97	changeSupport.removeChangeListener(listener);	100	if (changeSupport != null) {
		101	changeSupport.removeChangeListener(listener);
		102	}
98	}	103	}
99		104
100	public synchronized void addStaleListener(IStaleListener listener) {	105	public synchronized void addStaleListener(IStaleListener listener) {
101	changeSupport.addStaleListener(listener);	106	if (changeSupport != null) {
		107	changeSupport.addStaleListener(listener);
		108	}
102	}	109	}
103		110
104	public synchronized void removeStaleListener(IStaleListener listener) {	111	public synchronized void removeStaleListener(IStaleListener listener) {
105	changeSupport.removeStaleListener(listener);	112	if (changeSupport != null) {
		113	changeSupport.removeStaleListener(listener);
		114	}
106	}	115	}
107		116
108	/**	117	/**




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Collection;
import java.util.List;

/**
 * @since 1.2
 * 
 */
public interface IListProperty extends ICollectionProperty {
	/**
	 * @param source
	 * @return a List with the current contents of the source's list property
	 */
	List getList(Object source);

	/**
	 * @param source
	 * @param index
	 * @param c
	 * @return whether the source's list property was changed
	 */
	boolean addAll(Object source, int index, Collection c);

	/**
	 * @param source
	 * @param index
	 * @return the element at the given location in the source's list property
	 */
	Object get(Object source, int index);

	/**
	 * @param source
	 * @param index
	 * @param element
	 * @return the element previous at the given location in the source's list
	 *         property
	 */
	Object set(Object source, int index, Object element);

	/**
	 * @param source
	 * @param oldIndex
	 * @param newIndex
	 * @return the element that was moved
	 */
	Object move(Object source, int oldIndex, int newIndex);

	/**
	 * @param source
	 * @param index
	 * @param element
	 */
	void add(Object source, int index, Object element);

	/**
	 * @param source
	 * @param index
	 * @return the element that was removed from the source's list property
	 */
	Object remove(Object source, int index);

	/**
	 * @param source
	 * @param o
	 * @return the index of the first location of the given element in the
	 *         source's list property, or -1 if the list does not contain the
	 *         element
	 */
	int indexOf(Object source, Object o);

	/**
	 * @param source
	 * @param o
	 * @return the index of the last location of the given element in the
	 *         source's list property, or -1 if the list does not contain the
	 *         element
	 */
	int lastIndexOf(Object source, Object o);

	/**
	 * @param source
	 * @param listener
	 */
	public void addListChangeListener(Object source,
			IListPropertyChangeListener listener);

	/**
	 * @param source
	 * @param listener
	 */
	public void removeListChangeListener(Object source,
			IListPropertyChangeListener listener);
}




/*******************************************************************************
 * Copyright (c) 2008 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.core.databinding.property;

import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;

/**
 * @since 1.2
 */
public abstract class BasicMapProperty extends MapProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	protected void setMap(Object source, Map map, MapDiff diff) {
		if (diff == null) {
			diff = Diffs.computeMapDiff(getMap(source), map);
		}

		updateHelper.setUpdating(source, true);
		try {
			doSetMap(source, map);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			fireMapChange(source, diff);
		}
	}

	public void clear(Object source) {
		setMap(source, new HashMap(), Diffs.createMapDiffRemoveAll(new HashMap(
				getMap(source))));
	}

	public Object put(Object source, Object key, Object value) {
		Map map = new HashMap(getMap(source));
		boolean addition = !map.containsKey(key);
		Object result = map.put(key, value);
		MapDiff diff;
		if (addition) {
			diff = Diffs.createMapDiffSingleAdd(key, value);
		} else {
			diff = Diffs.createMapDiffSingleChange(key, result, value);
		}
		setMap(source, map, diff);
		return result;
	}

	public void putAll(Object source, Map t) {
		Map map = new HashMap(getMap(source));
		Set addedKeys = new HashSet();
		Set changedKeys = new HashSet();
		Map oldValues = new HashMap();
		Map newValues = new HashMap();
		for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			Object key = entry.getKey();
			Object newValue = entry.getValue();
			boolean addition = !map.containsKey(key);
			Object oldValue = map.put(key, newValue);
			if (addition) {
				addedKeys.add(key);
			} else {
				changedKeys.add(key);
				oldValues.put(key, oldValue);
			}
			newValues.put(key, newValue);
		}
		setMap(source, map, Diffs.createMapDiff(addedKeys,
				Collections.EMPTY_SET, changedKeys, oldValues, newValues));
	}

	public Object remove(Object source, Object key) {
		Map map = getMap(source);
		if (map.containsKey(key)) {
			map = new HashMap(map);
			Object result = map.remove(key);
			setMap(source, map, Diffs.createMapDiffSingleRemove(key, result));
			return result;
		}
		return null;
	}

	public int size(Object source) {
		return getMap(source).size();
	}

	protected abstract void doSetMap(Object source, Map map);

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Set;

/**
 * @since 1.2
 */
public interface ISetProperty extends ICollectionProperty {
	/**
	 * @param source
	 * @return a Set with the current contents of the source's set property
	 */
	public Set getSet(Object source);

	/**
	 * @param source
	 * @param listener
	 */
	public void addSetChangeListener(Object source,
			ISetPropertyChangeListener listener);

	/**
	 * @param source
	 * @param listener
	 */
	public void removeSetChangeListener(Object source,
			ISetPropertyChangeListener listener);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;

/**
 * @since 1.2
 * 
 */
public class ObservableProperties {
	/**
	 * @param observable
	 * @return blah
	 */
	public static IValueProperty detailValue(IObservableValue observable) {
		return null;
	}

	/**
	 * @param observable
	 * @return blah
	 */
	public static ISetProperty detailSet(IObservableSet observable) {
		return null;
	}

	/**
	 * @param observable
	 * @return blah
	 */
	public static IListProperty detailList(IObservableList observable) {
		return null;
	}

	/**
	 * @param observable
	 * @return blah
	 */
	public static IMapProperty detailMap(IObservableMap observable) {
		return null;
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.2
 * 
 */
public class ValuePropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * 
	 */
	public final IValueProperty property;

	/**
	 * ValueDiff with the old and new values of the property. May be null to
	 * indicate that the details of the value change are unknown.
	 */
	public final ValueDiff diff;

	/**
	 * @param source
	 * @param property
	 * @param diff
	 */
	public ValuePropertyChangeEvent(Object source, IValueProperty property,
			ValueDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((IValuePropertyChangeListener) listener)
				.handleValuePropertyChange(this);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.map.MapDiff;

/**
 * @since 1.2
 */
public abstract class MapProperty extends Property implements IMapProperty {
	public boolean containsKey(Object source, Object key) {
		return getMap(source).containsKey(key);
	}

	public boolean containsValue(Object source, Object value) {
		return getMap(source).containsValue(value);
	}

	public boolean equals(Object source, Object o) {
		return getMap(source).equals(o);
	}

	public Object get(Object source, Object key) {
		return getMap(source).get(key);
	}

	public int hashCode(Object source) {
		return getMap(source).hashCode();
	}

	public boolean isEmpty(Object source) {
		return getMap(source).isEmpty();
	}

	public int size(Object source) {
		return getMap(source).size();
	}

	public final void addMapChangeListener(Object source,
			IMapPropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeMapChangeListener(Object source,
			IMapPropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	protected final void fireMapChange(Object source, MapDiff diff) {
		getChangeSupport().firePropertyChange(
				new MapPropertyChangeEvent(source, this, diff));
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Collection;

import org.eclipse.core.databinding.observable.list.ListDiff;

/**
 * @since 1.2
 */
public abstract class ListProperty extends CollectionProperty implements
		IListProperty {
	Collection getCollection(Object source) {
		return getList(source);
	}

	public Object get(Object source, int index) {
		return getList(source).get(index);
	}

	public int indexOf(Object source, Object o) {
		return getList(source).indexOf(o);
	}

	public int lastIndexOf(Object source, Object o) {
		return getList(source).lastIndexOf(o);
	}

	public final void addListChangeListener(Object source,
			IListPropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeListChangeListener(Object source,
			IListPropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	protected final void fireListChange(Object source, ListDiff diff) {
		getChangeSupport().firePropertyChange(
				new ListPropertyChangeEvent(source, this, diff));
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property;

import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.AbstractObservableMap;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.MapPropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class PropertyObservableMap extends AbstractObservableMap implements
		IPropertyObservable {
	private Object source;
	private IMapProperty property;

	private volatile boolean updating = false;

	private boolean disposed = false;

	private transient volatile int modCount = 0;

	private IMapPropertyChangeListener listener = new IMapPropertyChangeListener() {
		public void handleMapPropertyChange(final MapPropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						getRealm().exec(new Runnable() {
							public void run() {
								modCount++;
								fireMapChange(event.diff);
							}
						});
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableMap(Realm realm, Object source,
			IMapProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

	private void getterCalled() {
		ObservableTracker.getterCalled(this);
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addMapChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeMapChangeListener(source, listener);
		}
	}

	public boolean containsKey(Object key) {
		getterCalled();
		return property.containsKey(source, key);
	}

	public boolean containsValue(Object value) {
		getterCalled();
		return property.containsValue(source, value);
	}

	public Set entrySet() {
		getterCalled();
		// unmodifiable for now
		return Collections.unmodifiableSet(property.getMap(source).entrySet());
	}

	public Object get(Object key) {
		getterCalled();
		return property.get(source, key);
	}

	public boolean isEmpty() {
		getterCalled();
		return property.isEmpty(source);
	}

	public Set keySet() {
		getterCalled();
		return Collections.unmodifiableSet(property.getMap(source).keySet());
	}

	public Object put(Object key, Object value) {
		checkRealm();
		return property.put(source, key, value);
	}

	public void putAll(Map m) {
		checkRealm();
		property.putAll(source, m);
	}

	public Object remove(Object key) {
		checkRealm();
		return property.remove(source, key);
	}

	public int size() {
		getterCalled();
		return property.size(source);
	}

	public Collection values() {
		getterCalled();
		return Collections.unmodifiableCollection(property.getMap(source)
				.values());
	}

	public void clear() {
		getterCalled();
		property.clear(source);
	}

	public boolean equals(Object o) {
		getterCalled();
		return property.equals(source, o);
	}

	public int hashCode() {
		getterCalled();
		return property.hashCode(source);
	}

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeMapChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.2
 */
public class SetPropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * 
	 */
	public final ISetProperty property;

	/**
	 * SetDiff enumerating the added and removed elements in the set. May be
	 * null to indicate that the details of the set change are unknown.
	 */
	public final SetDiff diff;

	/**
	 * @param source
	 * @param property
	 * @param diff
	 */
	public SetPropertyChangeEvent(Object source, ISetProperty property,
			SetDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((ISetPropertyChangeListener) listener).handleSetPropertyChange(this);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * @since 1.2
 * 
 */
public interface IValueProperty extends IProperty {
	/**
	 * @param source
	 * @return the property value
	 */
	public Object getValue(Object source);

	/**
	 * @param source
	 * @param value
	 */
	public void setValue(Object source, Object value);

	/**
	 * @return the value type of the property, or <code>null</code> if untyped.
	 */
	public Object getValueType();

	/**
	 * @param source
	 * @param listener
	 */
	public void addValueChangeListener(Object source,
			IValuePropertyChangeListener listener);

	/**
	 * @param source
	 * @param listener
	 */
	public void removeValueChangeListener(Object source,
			IValuePropertyChangeListener listener);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Map;

/**
 * @since 1.2
 */
public interface IMapProperty extends IProperty {
	/**
	 * @param source
	 * @return a Map with the current contents of the source's map property
	 */
	Map getMap(Object source);

	/**
	 * @param source
	 * @return the size of the source's map property
	 */
	int size(Object source);

	/**
	 * @param source
	 * @return whether the source's map property is empty
	 */
	boolean isEmpty(Object source);

	/**
	 * @param source
	 * @param key
	 * @return whether the given key is contained in the key set of the source's
	 *         map property
	 */
	boolean containsKey(Object source, Object key);

	/**
	 * @param source
	 * @param value
	 * @return whether the given value is contains in the values collection of
	 *         the source's map property
	 */
	boolean containsValue(Object source, Object value);

	/**
	 * @param source
	 * @param key
	 * @return the value associated with the given key in the source's map
	 *         property
	 */
	Object get(Object source, Object key);

	/**
	 * @param source
	 * @param key
	 * @param value
	 * @return the value that was previously associated with the given key in
	 *         the source's map property
	 */
	Object put(Object source, Object key, Object value);

	/**
	 * @param source
	 * @param key
	 * @return the value that was previously associated with the given key in
	 *         the source's map property
	 */
	Object remove(Object source, Object key);

	/**
	 * @param source
	 * @param t
	 */
	void putAll(Object source, Map t);

	/**
	 * @param source
	 */
	void clear(Object source);

	/**
	 * @param source
	 * @param o
	 * @return whether the source's map property is equal to the argument
	 */
	boolean equals(Object source, Object o);

	/**
	 * @param source
	 * @return the hash code of the source's map property
	 */
	int hashCode(Object source);

	/**
	 * @param source
	 * @param listener
	 */
	public void addMapChangeListener(Object source,
			IMapPropertyChangeListener listener);

	/**
	 * @param source
	 * @param listener
	 */
	public void removeMapChangeListener(Object source,
			IMapPropertyChangeListener listener);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * @since 1.2
 */
public interface IMapPropertyChangeListener extends IPropertyChangeListener {
	/**
	 * @param event
	 */
	public void handleMapPropertyChange(MapPropertyChangeEvent event);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.value.ValueDiff;

/**
 * @since 1.2
 */
public abstract class ValueProperty extends Property implements IValueProperty {
	public final void addValueChangeListener(Object source,
			IValuePropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeValueChangeListener(Object source,
			IValuePropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	protected final void fireValueChange(Object source, ValueDiff diff) {
		getChangeSupport().firePropertyChange(
				new ValuePropertyChangeEvent(source, this, diff));
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * @since 1.2
 */
public interface IValuePropertyChangeListener extends IPropertyChangeListener {
	/**
	 * @param event
	 */
	public void handleValuePropertyChange(ValuePropertyChangeEvent event);
}




/*******************************************************************************
 * Copyright (c) 2008 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.core.databinding.property;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;

/**
 * @since 1.2
 * 
 */
public abstract class BasicListProperty extends ListProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	protected void setList(Object source, List list, ListDiff diff) {
		if (diff == null) {
			diff = Diffs.computeListDiff(getList(source), list);
		}

		updateHelper.setUpdating(source, true);
		try {
			doSetList(source, list);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			fireListChange(source, diff);
		}
	}

	protected abstract void doSetList(Object source, List list);

	public boolean add(Object source, Object o) {
		add(source, size(source), o);
		return true;
	}

	public void add(Object source, int index, Object element) {
		List list = new ArrayList(getList(source));
		list.add(index, element);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				index, true, element)));
	}

	public boolean addAll(Object source, Collection c) {
		if (c.isEmpty())
			return false;
		addAll(source, size(source), c);
		return true;
	}

	public boolean addAll(Object source, int index, Collection c) {
		if (c.isEmpty()) {
			return false;
		}

		List list = new ArrayList(getList(source));
		List entries = new ArrayList();
		int i = index;
		for (Iterator it = c.iterator(); it.hasNext(); i++) {
			Object o = it.next();
			list.add(i, o);
			entries.add(Diffs.createListDiffEntry(i, true, o));
		}
		boolean changed = !entries.isEmpty();
		if (changed) {
			ListDiffEntry[] ea = (ListDiffEntry[]) entries
					.toArray(new ListDiffEntry[entries.size()]);
			setList(source, list, Diffs.createListDiff(ea));
		}
		return changed;
	}

	public void clear(Object source) {
		if (isEmpty(source))
			return;
		List list = getList(source);
		ListDiffEntry[] entries = new ListDiffEntry[list.size()];
		int i = 0;
		for (Iterator it = getList(source).iterator(); it.hasNext(); i++) {
			entries[i] = Diffs.createListDiffEntry(0, false, it.next());
		}
		setList(source, new ArrayList(), Diffs.createListDiff(entries));
	}

	public Object move(Object source, int oldIndex, int newIndex) {
		if (oldIndex == newIndex)
			return get(source, oldIndex);
		List list = new ArrayList(getList(source));
		Object result = list.remove(oldIndex);
		list.add(newIndex, result);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				oldIndex, false, result), Diffs.createListDiffEntry(newIndex,
				true, result)));
		return result;
	}

	public boolean remove(Object source, Object o) {
		int i = indexOf(source, o);
		if (i == -1)
			return false;
		remove(source, i);
		return true;
	}

	public Object remove(Object source, int index) {
		List list = new ArrayList(getList(source));
		Object result = list.remove(index);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				index, false, result)));
		return result;
	}

	public boolean removeAll(Object source, Collection c) {
		if (isEmpty(source)) {
			return false;
		}
		if (c.isEmpty()) {
			return false;
		}
		List list = new ArrayList(getList(source));
		List entries = new ArrayList();
		for (ListIterator it = list.listIterator(); it.hasNext();) {
			Object o = it.next();
			if (c.contains(o)) {
				entries.add(Diffs.createListDiffEntry(it.previousIndex(),
						false, o));
				it.remove();
			}
		}
		boolean changed = !entries.isEmpty();
		if (changed) {
			ListDiffEntry[] ea = (ListDiffEntry[]) entries
					.toArray(new ListDiffEntry[entries.size()]);
			setList(source, list, Diffs.createListDiff(ea));
		}
		return changed;
	}

	public boolean retainAll(Object source, Collection c) {
		if (isEmpty(source)) {
			return false;
		}
		if (c.isEmpty()) {
			clear(source);
			return true;
		}
		List list = new ArrayList(getList(source));
		List entries = new ArrayList();
		for (ListIterator it = list.listIterator(); it.hasNext();) {
			Object o = it.next();
			if (!c.contains(o)) {
				entries.add(Diffs.createListDiffEntry(it.previousIndex(),
						false, o));
				it.remove();
			}
		}
		boolean changed = !entries.isEmpty();
		if (changed) {
			ListDiffEntry[] ea = (ListDiffEntry[]) entries
					.toArray(new ListDiffEntry[entries.size()]);
			setList(source, list, Diffs.createListDiff(ea));
		}
		return changed;
	}

	public Object set(Object source, int index, Object element) {
		List list = new ArrayList(getList(source));
		Object result = list.set(index, element);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				index, false, result), Diffs.createListDiffEntry(index, true,
				element)));
		return result;
	}

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property.masterdetail;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.property.masterdetail.ListPropertyDetailValueList;
import org.eclipse.core.internal.databinding.property.masterdetail.MapPropertyDetailValueMap;
import org.eclipse.core.internal.databinding.property.masterdetail.SetPropertyDetailValueMap;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailList;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailMap;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailSet;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailValue;

/**
 * @since 1.2
 */
public class MasterDetailProperties {
	// Properties of IValueProperty master properties

	/**
	 * @param masterValue
	 * @param detailValue
	 * @return blah
	 */
	public static IValueProperty detailValue(IValueProperty masterValue,
			IValueProperty detailValue) {
		return new ValuePropertyDetailValue(masterValue, detailValue);
	}

	/**
	 * @param masterValue
	 * @param detailList
	 * @return blah
	 */
	public static IListProperty detailList(IValueProperty masterValue,
			IListProperty detailList) {
		return new ValuePropertyDetailList(masterValue, detailList);
	}

	/**
	 * @param masterValue
	 * @param detailSet
	 * @return blah
	 */
	public static ISetProperty detailSet(IValueProperty masterValue,
			ISetProperty detailSet) {
		return new ValuePropertyDetailSet(masterValue, detailSet);
	}

	/**
	 * @param masterValue
	 * @param detailMap
	 * @return blah
	 */
	public static IMapProperty detailMap(IValueProperty masterValue,
			IMapProperty detailMap) {
		return new ValuePropertyDetailMap(masterValue, detailMap);
	}

	// Properties of IListProperty master properties

	/**
	 * @param masterList
	 * @param detailValue
	 * @return blah
	 */
	public static IListProperty detailList(IListProperty masterList,
			IValueProperty detailValue) {
		return new ListPropertyDetailValueList(masterList, detailValue);
	}

	// Properties of ISetProperty master properties

	/**
	 * @param masterKeySet
	 * @param detailValues
	 * @return blah
	 */
	public static IMapProperty detailMap(ISetProperty masterKeySet,
			IValueProperty detailValues) {
		return new SetPropertyDetailValueMap(masterKeySet, detailValues);
	}

	// Properties of IMapProperty master properties

	/**
	 * @param masterMap
	 * @param detailValues
	 * @return blah
	 */
	public static IMapProperty detailMap(IMapProperty masterMap,
			IValueProperty detailValues) {
		return new MapPropertyDetailValueMap(masterMap, detailValues);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValueProperty;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 1.2
 * 
 */
public class ValuePropertyDetailValue extends ValueProperty implements
		IValueProperty {
	private IValueProperty masterProperty;
	private IValueProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements
			IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			Object oldValue = detailProperty.getValue(oldSource);
			Object newValue = detailProperty.getValue(newSource);

			ValueDiff diff = Diffs.createValueDiff(oldValue, newValue);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireValueChange(source, diff);
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			fireValueChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailValue(IValueProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addValueChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeValueChangeListener(
					detailListener.masterValue, detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public Object getValue(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getValue(masterValue);
	}

	public Object getValueType() {
		return detailProperty.getValueType();
	}

	public void setValue(Object source, Object value) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.setValue(masterValue, value);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property;

import java.util.AbstractSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.IStaleListener;
import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.StaleEvent;
import org.eclipse.core.databinding.observable.map.AbstractObservableMap;
import org.eclipse.core.databinding.observable.map.IMapChangeListener;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.map.MapChangeEvent;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class MapValuePropertyObservableMap extends AbstractObservableMap
		implements IObserving {
	private IObservableMap map;
	private IValueProperty property;

	private Map keyToMasterValueListener;

	private boolean updating = false;
	private boolean disposed = false;

	private IMapChangeListener mapListener = new IMapChangeListener() {
		public void handleMapChange(final MapChangeEvent event) {
			if (!updating && !disposed) {
				getRealm().exec(new Runnable() {
					public void run() {
						Map oldValues = new HashMap();
						Map newValues = new HashMap();

						Set addedKeys = event.diff.getAddedKeys();
						for (Iterator it = addedKeys.iterator(); it.hasNext();) {
							Object key = it.next();
							Object newSource = event.diff.getNewValue(key);
							Object newValue = property.getValue(newSource);
							newValues.put(key, newValue);
							addPropertySourceListener(key, newSource);
						}

						Set removedKeys = event.diff.getRemovedKeys();
						for (Iterator it = removedKeys.iterator(); it.hasNext();) {
							Object key = it.next();
							Object oldSource = event.diff.getOldValue(key);
							Object oldValue = property.getValue(oldSource);
							oldValues.put(key, oldValue);
							removePropertySourceListener(key, oldSource);
						}

						Set changedKeys = new HashSet(event.diff
								.getChangedKeys());
						for (Iterator it = changedKeys.iterator(); it.hasNext();) {
							Object key = it.next();

							Object oldSource = event.diff.getOldValue(key);
							Object newSource = event.diff.getNewValue(key);

							Object oldValue = property.getValue(oldSource);
							Object newValue = property.getValue(newSource);

							if (Util.equals(oldValue, newValue)) {
								it.remove();
							} else {
								oldValues.put(key, oldValue);
								newValues.put(key, newValue);
							}

							removePropertySourceListener(key, oldSource);
							addPropertySourceListener(key, newSource);
						}

						fireMapChange(Diffs.createMapDiff(addedKeys,
								removedKeys, changedKeys, oldValues, newValues));
					}
				});
			}
		}
	};

	private IStaleListener staleListener = new IStaleListener() {
		public void handleStale(StaleEvent staleEvent) {
			fireStale();
		}
	};

	/**
	 * @param map
	 * @param valueProperty
	 */
	public MapValuePropertyObservableMap(IObservableMap map,
			IValueProperty valueProperty) {
		super(map.getRealm());
		this.map = map;
		this.property = valueProperty;

		this.keyToMasterValueListener = new IdentityHashMap();
	}

	private class ValuePropertySourceChangeListener implements
			IValuePropertyChangeListener {
		private final Object key;

		public ValuePropertySourceChangeListener(Object key) {
			this.key = key;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object oldValue = property.getValue(oldSource);
			property.removeValueChangeListener(oldSource, this);

			Object newSource = event.diff.getNewValue();
			Object newValue = property.getValue(newSource);
			property.addValueChangeListener(newSource, this);

			if (!Util.equals(oldValue, newValue))
				fireMapChange(Diffs.createMapDiffSingleChange(key, oldValue,
						newValue));
		}
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			map.addMapChangeListener(mapListener);
			map.addStaleListener(staleListener);
			for (Iterator iterator = map.entrySet().iterator(); iterator
					.hasNext();) {
				Map.Entry entry = (Map.Entry) iterator.next();
				Object key = entry.getKey();
				Object masterValue = entry.getValue();

				addPropertySourceListener(key, masterValue);
			}
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			map.removeMapChangeListener(mapListener);
			map.removeStaleListener(staleListener);
			for (Iterator iterator = map.entrySet().iterator(); iterator
					.hasNext();) {
				Map.Entry entry = (Map.Entry) iterator.next();
				Object key = entry.getKey();
				Object propertySource = entry.getValue();

				removePropertySourceListener(key, propertySource);
			}
		}
	}

	private void addPropertySourceListener(Object key, Object propertySource) {
		IValuePropertyChangeListener propertyListener = new ValuePropertySourceChangeListener(
				key);
		property.addValueChangeListener(propertySource, propertyListener);
		keyToMasterValueListener.put(key, propertyListener);
	}

	private void removePropertySourceListener(Object key, Object propertySource) {
		IValuePropertyChangeListener propertyListener = (IValuePropertyChangeListener) keyToMasterValueListener
				.remove(key);
		if (propertyListener != null) {
			property
					.removeValueChangeListener(propertySource, propertyListener);
		}
	}

	protected Object doGet(Object key) {
		if (!map.containsKey(key))
			return null;
		return property.getValue(map.get(key));
	}

	protected Object doPut(Object key, Object value) {
		if (!map.containsKey(key))
			return null;
		Object source = map.get(key);

		Object oldValue = property.getValue(source);

		updating = true;
		try {
			property.setValue(source, value);
		} finally {
			updating = false;
		}

		Object newValue = property.getValue(source);

		if (!Util.equals(oldValue, newValue)) {
			fireMapChange(Diffs.createMapDiffSingleChange(key, oldValue,
					newValue));
		}

		return oldValue;
	}

	private Set entrySet;

	public Set entrySet() {
		getterCalled();
		if (entrySet == null)
			entrySet = new EntrySet();
		return entrySet;
	}

	class EntrySet extends AbstractSet {
		public Iterator iterator() {
			return new Iterator() {
				Iterator it = map.entrySet().iterator();

				public boolean hasNext() {
					getterCalled();
					return it.hasNext();
				}

				public Object next() {
					getterCalled();
					Map.Entry next = (Map.Entry) it.next();
					return new MapEntry(next.getKey());
				}

				public void remove() {
					it.remove();
				}
			};
		}

		public int size() {
			return map.size();
		}
	}

	class MapEntry implements Map.Entry {
		private Object key;

		MapEntry(Object key) {
			this.key = key;
		}

		public Object getKey() {
			getterCalled();
			return key;
		}

		public Object getValue() {
			getterCalled();
			return get(key);
		}

		public Object setValue(Object value) {
			return put(key, value);
		}

		public boolean equals(Object o) {
			getterCalled();
			if (o == this)
				return true;
			if (o == null)
				return false;
			if (!(o instanceof Map.Entry))
				return false;
			Map.Entry that = (Map.Entry) o;
			return Util.equals(this.getKey(), that.getKey())
					&& Util.equals(this.getValue(), that.getValue());
		}

		public int hashCode() {
			getterCalled();
			Object value = getValue();
			return (key == null ? 0 : key.hashCode())
					^ (value == null ? 0 : value.hashCode());
		}
	}

	public boolean isStale() {
		getterCalled();
		return map.isStale();
	}

	private void getterCalled() {
		ObservableTracker.getterCalled(this);
	}

	public Object getObserved() {
		return map;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property = null;
		}

		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.ISetPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.MapProperty;
import org.eclipse.core.databinding.property.SetPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class SetPropertyDetailValueMap extends MapProperty {
	private final ISetProperty masterProperty;
	private final IValueProperty detailProperty;

	private Map sourceToMasterElementToDetailListener = new HashMap();

	private ISetPropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements ISetPropertyChangeListener {
		public void handleSetPropertyChange(final SetPropertyChangeEvent event) {
			Object source = event.getSource();

			MapDiff diff;
			if (event.diff == null) {
				diff = null;
			} else {
				final Set removals = event.diff.getRemovals();
				final Set additions = event.diff.getAdditions();

				diff = new MapDiff() {
					public Set getAddedKeys() {
						return additions;
					}

					public Set getChangedKeys() {
						return Collections.EMPTY_SET;
					}

					public Object getNewValue(Object key) {
						return getValue(key);
					}

					public Object getOldValue(Object key) {
						return getValue(key);
					}

					private Object getValue(Object key) {
						return detailProperty.getValue(key);
					}

					public Set getRemovedKeys() {
						return removals;
					}
				};

				for (Iterator it = removals.iterator(); it.hasNext();) {
					removeElementPropertyListener(source, it.next());
				}
				for (Iterator it = additions.iterator(); it.hasNext();) {
					addElementPropertyListener(source, it.next());
				}
			}

			fireMapChange(source, diff);
		}

		private void addElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener == null) {
				sourceToMasterElementToDetailListener.put(source,
						elementToDetailListener = new HashMap());
			}
			if (!elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = new DetailPropertyListener(
						source, element);
				detailProperty.addValueChangeListener(element, detailListener);
				elementToDetailListener.put(element, detailListener);
			}
		}

		private void removeElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener != null
					&& elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = (DetailPropertyListener) elementToDetailListener
						.remove(element);
				detailProperty.removeValueChangeListener(element,
						detailListener);
			}
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			MapDiff diff;
			if (event.diff == null) {
				diff = null;
			} else {
				diff = Diffs.createMapDiffSingleChange(masterValue, event.diff
						.getOldValue(), event.diff.getNewValue());
			}
			fireMapChange(source, diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public SetPropertyDetailValueMap(ISetProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addSetChangeListener(source, masterListener);

		Map masterElementToDetailListener = new HashMap();
		for (Iterator it = masterProperty.getSet(source).iterator(); it
				.hasNext();) {
			Object masterElement = it.next();
			DetailPropertyListener detailListener = new DetailPropertyListener(
					source, masterElement);
			detailProperty
					.addValueChangeListener(masterElement, detailListener);
			masterElementToDetailListener.put(masterElement, detailListener);
		}

		sourceToMasterElementToDetailListener.put(source,
				masterElementToDetailListener);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeSetChangeListener(source, masterListener);
		Map masterElementToDetailListener = (Map) sourceToMasterElementToDetailListener
				.remove(source);
		if (masterElementToDetailListener != null) {
			for (Iterator it = masterElementToDetailListener.entrySet()
					.iterator(); it.hasNext();) {
				Map.Entry entry = (Map.Entry) it.next();
				detailProperty.removeValueChangeListener(entry.getKey(),
						(DetailPropertyListener) entry.getValue());
			}
		}
	}

	public Map getMap(Object source) {
		Map result = new HashMap();
		for (Iterator it = masterProperty.getSet(source).iterator(); it
				.hasNext();) {
			Object element = it.next();
			result.put(element, detailProperty.getValue(element));
		}
		return result;
	}

	public void clear(Object source) {
		throw new UnsupportedOperationException();
	}

	public Object put(Object source, Object key, Object value) {
		if (!masterProperty.contains(source, key))
			return null;
		Object result = detailProperty.getValue(key);
		detailProperty.setValue(key, value);
		return result;
	}

	public void putAll(Object source, Map t) {
		Set masterSet = masterProperty.getSet(source);
		for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			if (masterSet.contains(entry.getKey())) {
				detailProperty.setValue(entry.getKey(), entry.getValue());
			}
		}
	}

	public Object remove(Object source, Object key) {
		throw new UnsupportedOperationException();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IListPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ListProperty;
import org.eclipse.core.databinding.property.ListPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class ValuePropertyDetailList extends ListProperty {
	private final IValueProperty masterProperty;
	private final IListProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements
			IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			List oldList = detailProperty.getList(oldSource);
			List newList = detailProperty.getList(newSource);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireListChange(source, Diffs.computeListDiff(oldList, newList));
		}
	}

	private class DetailPropertyListener implements IListPropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleListPropertyChange(ListPropertyChangeEvent event) {
			fireListChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailList(IValueProperty masterProperty,
			IListProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addListChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeListChangeListener(detailListener.masterValue,
					detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public List getList(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getList(masterValue);
	}

	public boolean add(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.add(masterValue, o);
	}

	public boolean addAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.addAll(masterValue, c);
	}

	public void clear(Object source) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.clear(masterValue);
	}

	public Object getElementType() {
		return detailProperty.getElementType();
	}

	public boolean remove(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, o);
	}

	public boolean removeAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.removeAll(masterValue, c);
	}

	public boolean retainAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.retainAll(masterValue, c);
	}

	public void add(Object source, int index, Object element) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.add(masterValue, index, element);
	}

	public boolean addAll(Object source, int index, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.addAll(masterValue, index, c);
	}

	public Object move(Object source, int oldIndex, int newIndex) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.move(masterValue, oldIndex, newIndex);
	}

	public Object remove(Object source, int index) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, index);
	}

	public Object set(Object source, int index, Object element) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.set(masterValue, index, element);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Collection;

import org.eclipse.core.databinding.observable.set.SetDiff;

/**
 * @since 1.2
 */
public abstract class SetProperty extends CollectionProperty implements
		ISetProperty {
	Collection getCollection(Object source) {
		return getSet(source);
	}

	public final void addSetChangeListener(Object source,
			ISetPropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeSetChangeListener(Object source,
			ISetPropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	protected final void fireSetChange(Object source, SetDiff diff) {
		getChangeSupport().firePropertyChange(
				new SetPropertyChangeEvent(source, this, diff));
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * Interface for observing a property of a source object.
 * 
 * @noimplement
 * @since 1.2
 */
public interface IProperty {
	/**
	 * Disposes the property, removing all property listeners on source objects.
	 */
	public void dispose();
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IListPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ListProperty;
import org.eclipse.core.databinding.property.ListPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class ListPropertyDetailValueList extends ListProperty {
	private final IListProperty masterProperty;
	private final IValueProperty detailProperty;

	private Map sourceToMasterElementToDetailListener = new HashMap();

	private IListPropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements IListPropertyChangeListener {
		public void handleListPropertyChange(ListPropertyChangeEvent event) {
			Object source = event.getSource();
			ListDiffEntry[] masterEntries = event.diff.getDifferences();
			ListDiffEntry[] detailEntries = new ListDiffEntry[masterEntries.length];
			Set masterElementsAdded = new HashSet();
			Set masterElementsRemoved = new HashSet();
			for (int i = 0; i < masterEntries.length; i++) {
				ListDiffEntry masterDifference = masterEntries[i];
				int index = masterDifference.getPosition();
				boolean addition = masterDifference.isAddition();
				Object masterElement = masterDifference.getElement();
				Object elementDetailValue = detailProperty
						.getValue(masterElement);
				detailEntries[i] = Diffs.createListDiffEntry(index, addition,
						elementDetailValue);
				if (addition)
					masterElementsAdded.add(masterElement);
				else
					masterElementsRemoved.add(masterElement);
			}

			ListDiff diff = Diffs.createListDiff(detailEntries);

			for (Iterator it = masterElementsRemoved.iterator(); it.hasNext();) {
				Object element = it.next();
				if (!masterProperty.contains(source, element))
					removeElementPropertyListener(source, element);
			}
			for (Iterator it = masterElementsAdded.iterator(); it.hasNext();) {
				Object element = it.next();
				if (masterProperty.contains(source, element))
					addElementPropertyListener(source, element);
			}

			fireListChange(source, diff);
		}

		private void addElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener == null) {
				sourceToMasterElementToDetailListener.put(source,
						elementToDetailListener = new HashMap());
			}
			if (!elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = new DetailPropertyListener(
						source, element);
				detailProperty.addValueChangeListener(element, detailListener);
				elementToDetailListener.put(element, detailListener);
			}
		}

		private void removeElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener != null
					&& elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = (DetailPropertyListener) elementToDetailListener
						.remove(element);
				detailProperty.removeValueChangeListener(element,
						detailListener);
			}
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object masterElement;

		DetailPropertyListener(Object source, Object masterElement) {
			this.source = source;
			this.masterElement = masterElement;
		}

		private int[] findIndices() {
			List indices = new ArrayList();

			List list = masterProperty.getList(source);
			for (ListIterator it = list.listIterator(); it.hasNext();) {
				if (Util.equals(masterElement, it.next()))
					indices.add(Integer.valueOf(it.previousIndex()));
			}

			int[] result = new int[indices.size()];
			for (int i = 0; i < result.length; i++) {
				result[i] = ((Integer) indices.get(i)).intValue();
			}
			return result;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			int[] indices = findIndices();
			Object oldValue = event.diff.getOldValue();
			Object newValue = event.diff.getNewValue();
			ListDiffEntry[] entries = new ListDiffEntry[indices.length * 2];
			for (int i = 0; i < indices.length; i++) {
				int index = indices[i];
				entries[i * 2] = Diffs.createListDiffEntry(index, false,
						oldValue);
				entries[i * 2 + 1] = Diffs.createListDiffEntry(index, true,
						newValue);
			}

			ListDiff diff = Diffs.createListDiff(entries);
			fireListChange(source, diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ListPropertyDetailValueList(IListProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addListChangeListener(source, masterListener);

		Map masterElementToDetailListener = new HashMap();
		for (Iterator it = masterProperty.getList(source).iterator(); it
				.hasNext();) {
			Object masterElement = it.next();
			DetailPropertyListener detailListener = new DetailPropertyListener(
					source, masterElement);
			detailProperty
					.addValueChangeListener(masterElement, detailListener);
			masterElementToDetailListener.put(masterElement, detailListener);
		}

		sourceToMasterElementToDetailListener.put(source,
				masterElementToDetailListener);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeListChangeListener(source, masterListener);
		Map masterElementToDetailListener = (Map) sourceToMasterElementToDetailListener
				.remove(source);
		if (masterElementToDetailListener != null) {
			for (Iterator it = masterElementToDetailListener.entrySet()
					.iterator(); it.hasNext();) {
				Map.Entry entry = (Map.Entry) it.next();
				detailProperty.removeValueChangeListener(entry.getKey(),
						(DetailPropertyListener) entry.getValue());
			}
		}
	}

	public List getList(Object source) {
		List result = new ArrayList();
		for (Iterator it = masterProperty.getList(source).iterator(); it
				.hasNext();) {
			result.add(detailProperty.getValue(it.next()));
		}
		return result;
	}

	public boolean add(Object source, Object o) {
		throw new UnsupportedOperationException();
	}

	public boolean addAll(Object source, Collection c) {
		throw new UnsupportedOperationException();
	}

	public void clear(Object source) {
		throw new UnsupportedOperationException();
	}

	public Object getElementType() {
		return detailProperty.getValueType();
	}

	public boolean remove(Object source, Object o) {
		throw new UnsupportedOperationException();
	}

	public boolean removeAll(Object source, Collection c) {
		throw new UnsupportedOperationException();
	}

	public boolean retainAll(Object source, Collection c) {
		throw new UnsupportedOperationException();
	}

	public void add(Object source, int index, Object element) {
		throw new UnsupportedOperationException();
	}

	public boolean addAll(Object source, int index, Collection c) {
		throw new UnsupportedOperationException();
	}

	public Object move(Object source, int oldIndex, int newIndex) {
		throw new UnsupportedOperationException();
	}

	public Object remove(Object source, int index) {
		throw new UnsupportedOperationException();
	}

	public Object set(Object source, int index, Object element) {
		Object masterElement = masterProperty.get(source, index);
		Object result = detailProperty.getValue(masterElement);
		detailProperty.setValue(masterElement, element);
		return result;
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.core.databinding.property;

import org.eclipse.core.databinding.observable.IObserving;

/**
 * @since 1.2
 * 
 */
public interface IPropertyObservable extends IObserving {
	/**
	 * @return the property being observed
	 */
	IProperty getProperty();
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.MapProperty;
import org.eclipse.core.databinding.property.MapPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class ValuePropertyDetailMap extends MapProperty {
	private final IValueProperty masterProperty;
	private final IMapProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterValueListener();

	private class MasterValueListener implements IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			Map oldMap = detailProperty.getMap(oldSource);
			Map newMap = detailProperty.getMap(newSource);
			MapDiff diff = Diffs.computeMapDiff(oldMap, newMap);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireMapChange(source, diff);
		}
	}

	private class DetailPropertyListener implements IMapPropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleMapPropertyChange(MapPropertyChangeEvent event) {
			fireMapChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailMap(IValueProperty masterProperty,
			IMapProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addMapChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeMapChangeListener(detailListener.masterValue,
					detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public Map getMap(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getMap(masterValue);
	}

	public void clear(Object source) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.clear(masterValue);
	}

	public Object put(Object source, Object key, Object value) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.put(masterValue, key, value);
	}

	public void putAll(Object source, Map t) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.putAll(masterValue, t);
	}

	public Object remove(Object source, Object key) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, key);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * @since 1.2
 */
public interface ISetPropertyChangeListener extends IPropertyChangeListener {
	/**
	 * @param event
	 */
	public void handleSetPropertyChange(SetPropertyChangeEvent event);
}




/*******************************************************************************
 * Copyright (c) 2008 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.core.databinding.property;

import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;

/**
 * @since 1.2
 * 
 */
public abstract class BasicSetProperty extends SetProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	protected void setSet(Object source, Set set, SetDiff diff) {
		if (diff == null) {
			diff = Diffs.computeSetDiff(getSet(source), set);
		}

		updateHelper.setUpdating(source, true);
		try {
			doSetSet(source, set);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			fireSetChange(source, diff);
		}
	}

	protected abstract void doSetSet(Object source, Set set);

	public boolean add(Object source, Object o) {
		Set set = getSet(source);
		if (!set.contains(o)) {
			set = new HashSet(set);
			boolean added = set.add(o);
			if (added)
				setSet(source, set, Diffs.createSetDiff(Collections
						.singleton(o), Collections.EMPTY_SET));
			return added;
		}
		return false;
	}

	public boolean addAll(Object source, Collection c) {
		Set set = getSet(source);
		Set additions = new HashSet();
		for (Iterator it = c.iterator(); it.hasNext();) {
			Object o = it.next();
			if (!set.contains(o)) {
				additions.add(o);
			}
		}
		boolean changed = !additions.isEmpty();
		if (changed) {
			set = new HashSet(set);
			set.addAll(additions);
			setSet(source, set, Diffs.createSetDiff(additions,
					Collections.EMPTY_SET));
		}
		return changed;
	}

	public void clear(Object source) {
		setSet(source, new HashSet(), Diffs.createSetDiff(
				Collections.EMPTY_SET, getSet(source)));
	}

	public boolean remove(Object source, Object o) {
		Set set = getSet(source);
		if (set.contains(o)) {
			set = new HashSet(set);
			boolean removed = set.remove(o);
			if (removed)
				setSet(source, set, Diffs.createSetDiff(Collections.EMPTY_SET,
						Collections.singleton(o)));
			return removed;
		}
		return false;
	}

	public boolean removeAll(Object source, Collection c) {
		Set set = new HashSet(getSet(source));
		Set removals = new HashSet();
		for (Iterator it = set.iterator(); it.hasNext();) {
			Object o = it.next();
			if (c.contains(o)) {
				removals.add(o);
				it.remove();
			}
		}
		boolean changed = !removals.isEmpty();
		if (changed) {
			setSet(source, set, Diffs.createSetDiff(Collections.EMPTY_SET,
					removals));
		}
		return changed;
	}

	public boolean retainAll(Object source, Collection c) {
		Set set = new HashSet(getSet(source));
		Set removals = new HashSet();
		for (Iterator it = set.iterator(); it.hasNext();) {
			Object o = it.next();
			if (!c.contains(o)) {
				removals.add(o);
				it.remove();
			}
		}
		boolean changed = !removals.isEmpty();
		if (changed) {
			setSet(source, set, Diffs.createSetDiff(Collections.EMPTY_SET,
					removals));
		}
		return changed;
	}

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.2
 */
public class MapPropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * 
	 */
	public final IMapProperty property;

	/**
	 * MapDiff enumerating the added, changed, and removed entries in the map.
	 * May be null to indicate that the details of the map change are unknown.
	 */
	public final MapDiff diff;

	/**
	 * @param source
	 * @param property
	 * @param diff
	 */
	public MapPropertyChangeEvent(Object source, IMapProperty property,
			MapDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((IMapPropertyChangeListener) listener).handleMapPropertyChange(this);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.EventObject;

/**
 * @since 1.2
 */
public abstract class PropertyChangeEvent extends EventObject {
	private static final long serialVersionUID = 1L;

	PropertyChangeEvent(Object source) {
		super(source);
	}

	abstract void dispatch(IPropertyChangeListener listener);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.2
 */
public class ListPropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * 
	 */
	public final IListProperty property;

	/**
	 * ListDiff enumerating the added and removed elements in the list. May be
	 * null to indicate that the details of the list change are unknown.
	 */
	public final ListDiff diff;

	/**
	 * @param source
	 * @param property
	 * @param diff
	 */
	public ListPropertyChangeEvent(Object source, IListProperty property,
			ListDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((IListPropertyChangeListener) listener).handleListPropertyChange(this);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Collection;

/**
 * @since 1.2
 * 
 */
public interface ICollectionProperty extends IProperty {
	/**
	 * @param source
	 * @return the size of the source's collection property
	 */
	int size(Object source);

	/**
	 * @param source
	 * @return whether the source's collection property is empty
	 */
	boolean isEmpty(Object source);

	/**
	 * @param source
	 * @param o
	 * @return whether the source's collection property contains the given
	 *         element
	 */
	boolean contains(Object source, Object o);

	/**
	 * @param source
	 * @return an array of all elements in the source's collection property
	 */
	Object[] toArray(Object source);

	/**
	 * @param source
	 * @param array
	 * @return an array of all elements in the source's collection property
	 */
	Object[] toArray(Object source, Object[] array);

	/**
	 * @param source
	 * @param o
	 * @return whether the element was added to the source's collection property
	 */
	boolean add(Object source, Object o);

	/**
	 * @param source
	 * @param o
	 * @return whether the element was removed from the source's collection
	 *         property
	 */
	boolean remove(Object source, Object o);

	/**
	 * @param source
	 * @param c
	 * @return whether the source's collection property contains all elements in
	 *         the given collection
	 */
	boolean containsAll(Object source, Collection c);

	/**
	 * @param source
	 * @param c
	 * @return whether the source's collection property was changed
	 */
	boolean addAll(Object source, Collection c);

	/**
	 * @param source
	 * @param c
	 * @return whether the source's collection property was changed
	 */
	boolean removeAll(Object source, Collection c);

	/**
	 * @param source
	 * @param c
	 * @return whether the source's collection property was changed
	 */
	boolean retainAll(Object source, Collection c);

	/**
	 * @param source
	 */
	void clear(Object source);

	/**
	 * @param source
	 * @param o
	 * @return whether the source's collection property is equal to the argument
	 */
	boolean equals(Object source, Object o);

	/**
	 * @param source
	 * @return the hash code of the source's collection property
	 */
	int hashCode(Object source);

	/**
	 * @return the type of the elements or <code>null</code> if untyped
	 */
	Object getElementType();
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.MapProperty;
import org.eclipse.core.databinding.property.MapPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class MapPropertyDetailValueMap extends MapProperty {
	private final IMapProperty masterProperty;
	private final IValueProperty detailProperty;

	private Map sourceToKeyToDetailListener = new HashMap();

	private IMapPropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements IMapPropertyChangeListener {
		public void handleMapPropertyChange(final MapPropertyChangeEvent event) {
			Object source = event.getSource();

			Map oldValues = new HashMap();
			Map newValues = new HashMap();

			Set addedKeys = event.diff.getAddedKeys();
			for (Iterator it = addedKeys.iterator(); it.hasNext();) {
				Object key = it.next();
				Object newMasterValue = event.diff.getNewValue(key);
				Object newDetailValue = detailProperty.getValue(newMasterValue);
				newValues.put(key, newDetailValue);
				addPropertySourceListener(source, key, newMasterValue);
			}

			Set removedKeys = event.diff.getRemovedKeys();
			for (Iterator it = removedKeys.iterator(); it.hasNext();) {
				Object key = it.next();
				Object oldMasterValue = event.diff.getOldValue(key);
				Object oldDetailValue = detailProperty.getValue(oldMasterValue);
				oldValues.put(key, oldDetailValue);
				removePropertySourceListener(source, key, oldMasterValue);
			}

			Set changedKeys = new HashSet(event.diff.getChangedKeys());
			for (Iterator it = changedKeys.iterator(); it.hasNext();) {
				Object key = it.next();

				Object oldMasterValue = event.diff.getOldValue(key);
				Object newMasterValue = event.diff.getNewValue(key);

				Object oldDetailValue = detailProperty.getValue(oldMasterValue);
				Object newDetailValue = detailProperty.getValue(newMasterValue);

				if (Util.equals(oldDetailValue, newDetailValue)) {
					it.remove();
				} else {
					oldValues.put(key, oldDetailValue);
					newValues.put(key, newDetailValue);
				}

				removePropertySourceListener(source, key, oldMasterValue);
				addPropertySourceListener(source, key, newMasterValue);
			}

			MapDiff diff = Diffs.createMapDiff(addedKeys, removedKeys,
					changedKeys, oldValues, newValues);

			fireMapChange(source, diff);
		}

		private void addPropertySourceListener(Object source, Object key,
				Object masterValue) {
			Map keyToDetailListener = (Map) sourceToKeyToDetailListener
					.get(source);
			if (keyToDetailListener == null) {
				sourceToKeyToDetailListener.put(source,
						keyToDetailListener = new HashMap());
			}
			if (!keyToDetailListener.containsKey(key)) {
				DetailPropertyListener detailListener = new DetailPropertyListener(
						source, key);
				detailProperty.addValueChangeListener(masterValue,
						detailListener);
				keyToDetailListener.put(key, detailListener);
			}
		}

		private void removePropertySourceListener(Object source, Object key,
				Object masterValue) {
			Map keyToDetailListener = (Map) sourceToKeyToDetailListener
					.get(source);
			if (keyToDetailListener != null
					&& keyToDetailListener.containsKey(key)) {
				DetailPropertyListener detailListener = (DetailPropertyListener) keyToDetailListener
						.remove(key);
				detailProperty.removeValueChangeListener(masterValue,
						detailListener);
			}
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object key;

		DetailPropertyListener(Object source, Object key) {
			this.source = source;
			this.key = key;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			fireMapChange(source, Diffs.createMapDiffSingleChange(key,
					event.diff.getOldValue(), event.diff.getNewValue()));
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public MapPropertyDetailValueMap(IMapProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addMapChangeListener(source, masterListener);

		Map keyToDetailListener = new HashMap();
		for (Iterator it = masterProperty.getMap(source).entrySet().iterator(); it
				.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			Object key = entry.getKey();
			Object masterValue = entry.getValue();
			DetailPropertyListener detailListener = new DetailPropertyListener(
					source, key);
			detailProperty.addValueChangeListener(masterValue, detailListener);
			keyToDetailListener.put(masterValue, detailListener);
		}

		sourceToKeyToDetailListener.put(source, keyToDetailListener);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeMapChangeListener(source, masterListener);
		Map masterElementToDetailListener = (Map) sourceToKeyToDetailListener
				.remove(source);
		if (masterElementToDetailListener != null) {
			for (Iterator it = masterElementToDetailListener.entrySet()
					.iterator(); it.hasNext();) {
				Map.Entry entry = (Map.Entry) it.next();
				detailProperty.removeValueChangeListener(entry.getKey(),
						(DetailPropertyListener) entry.getValue());
			}
		}
	}

	public Map getMap(Object source) {
		Map result = new HashMap();
		for (Iterator it = masterProperty.getMap(source).entrySet().iterator(); it
				.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			result.put(entry.getKey(), detailProperty
					.getValue(entry.getValue()));
		}
		return result;
	}

	public void clear(Object source) {
		throw new UnsupportedOperationException();
	}

	public Object put(Object source, Object key, Object value) {
		if (!masterProperty.containsKey(source, key))
			return null;
		Object masterValue = masterProperty.get(source, key);

		Object result = detailProperty.getValue(masterValue);
		detailProperty.setValue(masterValue, value);
		return result;
	}

	public void putAll(Object source, Map t) {
		for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			Object masterKey = entry.getKey();
			Object detailValue = entry.getValue();
			if (masterProperty.getMap(source).containsKey(masterKey)) {
				detailProperty.setValue(masterKey, detailValue);
			}
		}
	}

	public Object remove(Object source, Object key) {
		throw new UnsupportedOperationException();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.core.runtime.ListenerList;

/**
 * @since 1.2
 */
public class PropertyChangeSupport {
	private Property property;
	private Map changeListeners;

	PropertyChangeSupport(Property property) {
		this.property = property;
		this.changeListeners = null;
	}

	protected final void addListener(Object source,
			IPropertyChangeListener listener) {
		boolean hadListeners = hasListeners(source);

		if (changeListeners == null) {
			synchronized (this) {
				if (changeListeners == null) {
					changeListeners = Collections
							.synchronizedMap(new IdentityHashMap());
				}
			}
		}

		ListenerList listeners;
		synchronized (changeListeners) {
			if (changeListeners.containsKey(source)) {
				listeners = (ListenerList) changeListeners.get(source);
			} else {
				changeListeners.put(source, listeners = new ListenerList());
			}
		}

		synchronized (listeners) {
			listeners.add(listener);
		}

		if (!hadListeners)
			property.addListenerTo(source);
	}

	/**
	 * Returns whether the change support has listeners registered for the given
	 * property source
	 * 
	 * @param source
	 *            the property source
	 * @return whether the change support has listeners registered for the given
	 *         property source
	 */
	public boolean hasListeners(Object source) {
		return changeListeners != null && changeListeners.containsKey(source);
	}

	protected final void removeListener(Object source,
			IPropertyChangeListener listener) {
		if (changeListeners != null) {
			ListenerList listeners = (ListenerList) changeListeners.get(source);
			if (listeners != null) {
				listeners.remove(listener);
				if (listeners.isEmpty()) {
					synchronized (listeners) {
						if (listeners.isEmpty()) {
							changeListeners.remove(source);
							property.removeListenerFrom(source);
						}
					}
				}
			}
		}
	}

	protected final void firePropertyChange(PropertyChangeEvent event) {
		ListenerList listenerList;
		synchronized (this) {
			if (changeListeners == null)
				return;
			listenerList = (ListenerList) changeListeners
					.get(event.getSource());
		}
		if (listenerList != null) {
			Object[] listeners = listenerList.getListeners();
			for (int i = 0; i < listeners.length; i++) {
				event.dispatch((IPropertyChangeListener) listeners[i]);
			}
		}
	}

	void dispose() {
		if (changeListeners != null) {
			for (Iterator iterator = changeListeners.keySet().iterator(); iterator
					.hasNext();) {
				Object source = iterator.next();
				property.removeListenerFrom(source);
				iterator.remove();
			}
			changeListeners = null;
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.property.PropertyObservableList;
import org.eclipse.core.internal.databinding.property.PropertyObservableMap;
import org.eclipse.core.internal.databinding.property.PropertyObservableSet;
import org.eclipse.core.internal.databinding.property.PropertyObservableValue;
import org.eclipse.core.internal.databinding.property.SetValuePropertyObservableMap;

/**
 * @since 1.2
 * 
 */
public class PropertyObservables {
	/**
	 * @param source
	 * @param property
	 * @return an observable value that tracks the given property of the source
	 *         object.
	 * @since 1.2
	 */
	public static IObservableValue observeValue(Object source,
			IValueProperty property) {
		return observeValue(Realm.getDefault(), source, property);
	}

	/**
	 * @param realm
	 * @param source
	 * @param property
	 * @return an observable value that tracks the given property of the source
	 *         object
	 * @since 1.2
	 */
	public static IObservableValue observeValue(Realm realm, Object source,
			IValueProperty property) {
		return new PropertyObservableValue(realm, source, property);
	}

	/**
	 * @param source
	 * @param property
	 * @return an observable set that tracks the given property of the source
	 *         object
	 */
	public static IObservableSet observeSet(Object source, ISetProperty property) {
		return observeSet(Realm.getDefault(), source, property);
	}

	/**
	 * @param realm
	 * @param source
	 * @param property
	 * @return an observable set that tracks the given property of the source
	 *         object
	 */
	public static IObservableSet observeSet(Realm realm, Object source,
			ISetProperty property) {
		return new PropertyObservableSet(realm, source, property);
	}

	/**
	 * @param source
	 * @param property
	 * @return an observable list that tracks the given property of the source
	 *         object
	 */
	public static IObservableList observeList(Object source,
			IListProperty property) {
		return observeList(Realm.getDefault(), source, property);
	}

	/**
	 * @param realm
	 * @param source
	 * @param property
	 * @return an observable set that tracks the given property of the source
	 *         object
	 */
	public static IObservableList observeList(Realm realm, Object source,
			IListProperty property) {
		return new PropertyObservableList(realm, source, property);
	}

	/**
	 * @param source
	 * @param property
	 * @return an observable map that tracks the given property of the source
	 *         object
	 */
	public static IObservableMap observeMap(Object source, IMapProperty property) {
		return observeMap(Realm.getDefault(), source, property);
	}

	/**
	 * @param realm
	 * @param source
	 * @param property
	 * @return an observable set that tracks the given property of the source
	 *         object
	 */
	public static IObservableMap observeMap(Realm realm, Object source,
			IMapProperty property) {
		return new PropertyObservableMap(realm, source, property);
	}

	/**
	 * Returns an observable map in the default realm tracking the current
	 * values of the named property for the beans in the given set.
	 * 
	 * @param keySet
	 * @param valueProperty
	 * @return an observable map
	 */
	public static IObservableMap observeMap(IObservableSet keySet,
			IValueProperty valueProperty) {
		return new SetValuePropertyObservableMap(keySet, valueProperty);
	}

	/**
	 * Returns a factory for creating observable values tracking the given
	 * property of a particular source object
	 * 
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory valueFactory(IValueProperty property) {
		return valueFactory(Realm.getDefault(), property);
	}

	/**
	 * Returns a factory for creating observable values tracking the given
	 * property of a particular source object
	 * 
	 * @param realm
	 *            the realm to use
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory valueFactory(final Realm realm,
			final IValueProperty property) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeValue(realm, target, property);
			}
		};
	}

	/**
	 * Returns a factory for creating observable sets tracking the given
	 * property of a particular source object
	 * 
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory setFactory(ISetProperty property) {
		return setFactory(Realm.getDefault(), property);
	}

	/**
	 * Returns a factory for creating obervable sets tracking the given property
	 * of a particular source object
	 * 
	 * @param realm
	 *            the realm to use
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory setFactory(final Realm realm,
			final ISetProperty property) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeSet(realm, target, property);
			}
		};
	}

	/**
	 * Returns a factory for creating observable lists tracking the given
	 * property of a particular source object
	 * 
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory listFactory(IListProperty property) {
		return listFactory(Realm.getDefault(), property);
	}

	/**
	 * Returns a factory for creating obervable lists tracking the given
	 * property of a particular source object
	 * 
	 * @param realm
	 *            the realm to use
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory listFactory(final Realm realm,
			final IListProperty property) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeList(realm, target, property);
			}
		};
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.ISetPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.SetProperty;
import org.eclipse.core.databinding.property.SetPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class ValuePropertyDetailSet extends SetProperty {
	private final IValueProperty masterProperty;
	private final ISetProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements
			IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			Set oldSet = detailProperty.getSet(oldSource);
			Set newSet = detailProperty.getSet(newSource);
			SetDiff diff = Diffs.computeSetDiff(oldSet, newSet);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireSetChange(source, diff);
		}
	}

	private class DetailPropertyListener implements ISetPropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleSetPropertyChange(SetPropertyChangeEvent event) {
			fireSetChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailSet(IValueProperty masterProperty,
			ISetProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addSetChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeSetChangeListener(detailListener.masterValue,
					detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public Set getSet(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getSet(masterValue);
	}

	public boolean add(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.add(masterValue, o);
	}

	public boolean addAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.addAll(masterValue, c);
	}

	public void clear(Object source) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.clear(masterValue);
	}

	public Object getElementType() {
		return detailProperty.getElementType();
	}

	public boolean remove(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, o);
	}

	public boolean removeAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.removeAll(masterValue, c);
	}

	public boolean retainAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.retainAll(masterValue, c);
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;

import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.AbstractObservableList;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IListPropertyChangeListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.ListPropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class PropertyObservableList extends AbstractObservableList implements
		IPropertyObservable {
	private Object source;
	private IListProperty property;

	private volatile boolean updating = false;

	private boolean disposed = false;

	private transient volatile int modCount = 0;

	private IListPropertyChangeListener listener = new IListPropertyChangeListener() {
		public void handleListPropertyChange(final ListPropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						getRealm().exec(new Runnable() {
							public void run() {
								modCount++;
								fireListChange(event.diff);
							}
						});
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableList(Realm realm, Object source,
			IListProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addListChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeListChangeListener(source, listener);
		}
	}

	private void getterCalled() {
		ObservableTracker.getterCalled(this);
	}

	public Object getElementType() {
		return property.getElementType();
	}

	// Queries

	protected int doGetSize() {
		return property.size(source);
	}

	public boolean contains(Object o) {
		getterCalled();
		return property.contains(source, o);
	}

	public boolean containsAll(Collection c) {
		getterCalled();
		return property.containsAll(source, c);
	}

	public Object get(int index) {
		getterCalled();
		return property.get(source, index);
	}

	public int indexOf(Object o) {
		getterCalled();
		return property.indexOf(source, o);
	}

	public boolean isEmpty() {
		getterCalled();
		return property.isEmpty(source);
	}

	public int lastIndexOf(Object o) {
		getterCalled();
		return property.lastIndexOf(source, o);
	}

	public Object[] toArray() {
		getterCalled();
		return property.toArray(source);
	}

	public Object[] toArray(Object[] a) {
		getterCalled();
		return property.toArray(source, a);
	}

	// Single change operations

	public boolean add(Object o) {
		checkRealm();
		return property.add(source, o);
	}

	public Iterator iterator() {
		getterCalled();
		return new Iterator() {
			int lastReturned = -1;
			int expectedModCount = modCount;
			ListIterator delegate = new ArrayList(property.getList(source))
					.listIterator();

			public boolean hasNext() {
				getterCalled();
				checkForComodification();
				return delegate.hasNext();
			}

			public Object next() {
				getterCalled();
				checkForComodification();
				Object next = delegate.next();
				lastReturned = delegate.previousIndex();
				return next;
			}

			public void remove() {
				checkRealm();
				checkForComodification();
				if (lastReturned == -1)
					throw new IllegalStateException();

				delegate.remove(); // stay in sync

				property.remove(source, lastReturned);

				lastReturned = -1;
				expectedModCount = modCount;
			}

			private void checkForComodification() {
				if (expectedModCount != modCount)
					throw new ConcurrentModificationException();
			}
		};
	}

	public Object move(int oldIndex, int newIndex) {
		getterCalled();
		return property.move(source, oldIndex, newIndex);
	}

	public boolean remove(Object o) {
		getterCalled();
		return property.remove(source, o);
	}

	public void add(int index, Object o) {
		getterCalled();
		property.add(source, index, o);
	}

	public ListIterator listIterator() {
		return listIterator(0);
	}

	public ListIterator listIterator(final int index) {
		getterCalled();
		return new ListIterator() {
			int lastReturned = -1;
			int expectedModCount = modCount;
			ListIterator delegate = new ArrayList(property.getList(source))
					.listIterator(index);

			public boolean hasNext() {
				getterCalled();
				checkForComodification();
				return delegate.hasNext();
			}

			public int nextIndex() {
				getterCalled();
				checkForComodification();
				return delegate.nextIndex();
			}

			public Object next() {
				getterCalled();
				checkForComodification();
				Object next = delegate.next();
				lastReturned = delegate.previousIndex();
				return next;
			}

			public boolean hasPrevious() {
				getterCalled();
				checkForComodification();
				return delegate.hasPrevious();
			}

			public int previousIndex() {
				getterCalled();
				checkForComodification();
				return delegate.previousIndex();
			}

			public Object previous() {
				getterCalled();
				checkForComodification();
				Object previous = delegate.previous();
				lastReturned = delegate.nextIndex();
				return previous;
			}

			public void add(Object o) {
				checkRealm();
				checkForComodification();
				int index = delegate.nextIndex();

				delegate.add(o); // keep in sync

				property.add(source, index, o);

				lastReturned = -1;
				expectedModCount = modCount;
			}

			public void set(Object o) {
				checkRealm();
				checkForComodification();

				delegate.set(o);

				property.set(source, lastReturned, o);

				expectedModCount = modCount;
			}

			public void remove() {
				checkRealm();
				checkForComodification();
				if (lastReturned == -1)
					throw new IllegalStateException();

				delegate.remove(); // keep in sync

				property.remove(source, lastReturned);

				lastReturned = -1;
				expectedModCount = modCount;
			}

			private void checkForComodification() {
				if (expectedModCount != modCount)
					throw new ConcurrentModificationException();
			}

		};
	}

	public Object remove(int index) {
		getterCalled();
		return property.remove(source, index);
	}

	public Object set(int index, Object o) {
		getterCalled();
		return property.set(source, index, o);
	}

	public List subList(int fromIndex, int toIndex) {
		getterCalled();
		return Collections.unmodifiableList(property.getList(source).subList(
				fromIndex, toIndex));
	}

	// Bulk change operations

	public boolean addAll(Collection c) {
		getterCalled();
		return property.addAll(source, c);
	}

	public boolean addAll(int index, Collection c) {
		getterCalled();
		return property.addAll(source, index, c);
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		return property.removeAll(source, c);
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		return property.retainAll(source, c);
	}

	public void clear() {
		getterCalled();
		property.clear(source);
	}

	public boolean equals(Object o) {
		getterCalled();
		return property.equals(source, o);
	}

	public int hashCode() {
		getterCalled();
		return property.hashCode(source);
	}

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeListChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property;

import java.util.HashMap;
import java.util.Map;

/**
 * @since 3.3
 * 
 */
public class PropertyUpdateHelper {
	private ThreadLocal localMap = new ThreadLocal() {
		protected Object initialValue() {
			return new HashMap();
		}
	};

	/**
	 * @param source
	 * @return blah
	 */
	public boolean isUpdating(Object source) {
		Map map = (Map) localMap.get();
		return map.containsKey(source);
	}

	/**
	 * @param source
	 * @param state
	 */
	public void setUpdating(Object source, boolean state) {
		Map map = (Map) localMap.get();
		Integer count = (Integer) map.get(source);
		int newCount = (count == null ? 0 : count.intValue())
				+ (state ? 1 : -1);
		if (newCount > 0)
			map.put(source, new Integer(newCount));
		else
			map.remove(source);
	}

	/**
	 * 
	 */
	public void dispose() {
		if (localMap != null) {
			Map map = (Map) localMap.get();
			if (map != null) {
				map.clear();
				localMap.set(null);
			}
			localMap = null;
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property;

import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.AbstractObservableSet;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.ISetPropertyChangeListener;
import org.eclipse.core.databinding.property.SetPropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class PropertyObservableSet extends AbstractObservableSet implements
		IPropertyObservable {
	private Object source;
	private ISetProperty property;

	private boolean updating = false;

	private boolean disposed = false;

	private transient volatile int modCount = 0;

	private ISetPropertyChangeListener listener = new ISetPropertyChangeListener() {
		public void handleSetPropertyChange(final SetPropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						getRealm().exec(new Runnable() {
							public void run() {
								modCount++;
								fireSetChange(event.diff);
							}
						});
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableSet(Realm realm, Object source,
			ISetProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addSetChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeSetChangeListener(source, listener);
		}
	}

	protected Set getWrappedSet() {
		return property.getSet(source);
	}

	public Object getElementType() {
		return property.getElementType();
	}

	// Queries

	protected int doGetSize() {
		return property.size(source);
	}

	// Single change operations

	public boolean add(Object o) {
		checkRealm();
		return property.add(source, o);
	}

	public Iterator iterator() {
		getterCalled();
		return new Iterator() {
			int expectedModCount = modCount;
			Iterator delegate = new HashSet(property.getSet(source)).iterator();
			Object last = null;

			public boolean hasNext() {
				getterCalled();
				checkForComodification();
				return delegate.hasNext();
			}

			public Object next() {
				getterCalled();
				checkForComodification();
				Object next = delegate.next();
				last = next;
				return next;
			}

			public void remove() {
				checkRealm();
				checkForComodification();

				delegate.remove(); // stay in sync

				property.remove(source, last);

				last = null;
				expectedModCount = modCount;
			}

			private void checkForComodification() {
				if (expectedModCount != modCount)
					throw new ConcurrentModificationException();
			}
		};
	}

	public boolean remove(Object o) {
		getterCalled();
		return property.remove(source, o);
	}

	// Bulk change operations

	public boolean addAll(Collection c) {
		getterCalled();
		return property.addAll(source, c);
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		return property.removeAll(source, c);
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		return property.retainAll(source, c);
	}

	public void clear() {
		getterCalled();
		property.clear(source);
	}

	public boolean equals(Object o) {
		return property.equals(source, o);
	}

	public int hashCode() {
		return property.hashCode(source);
	}

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeSetChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * Marker interface for all listener types in the properties framework.
 * 
 * @noimplement This interface is not intended to be implemented by clients.
 * 
 * @since 1.2
 */
public interface IPropertyChangeListener {

}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

import java.util.Collection;

/**
 * @since 1.2
 * 
 */
public abstract class CollectionProperty extends Property implements
		ICollectionProperty {
	abstract Collection getCollection(Object source);

	public boolean contains(Object source, Object o) {
		return getCollection(source).contains(o);
	}

	public boolean containsAll(Object source, Collection c) {
		return getCollection(source).containsAll(c);
	}

	public boolean equals(Object source, Object o) {
		return getCollection(source).equals(o);
	}

	public int hashCode(Object source) {
		return getCollection(source).hashCode();
	}

	public boolean isEmpty(Object source) {
		return getCollection(source).isEmpty();
	}

	public int size(Object source) {
		return getCollection(source).size();
	}

	public Object[] toArray(Object source, Object[] array) {
		return getCollection(source).toArray(array);
	}

	public Object[] toArray(Object source) {
		return getCollection(source).toArray();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.map.ComputedObservableMap;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class SetValuePropertyObservableMap extends ComputedObservableMap
		implements IObserving {
	private IValueProperty property;

	private boolean disposed = false;

	private IValuePropertyChangeListener listener = new IValuePropertyChangeListener() {
		public void handleValuePropertyChange(
				final ValuePropertyChangeEvent event) {
			if (!disposed) {
				getRealm().exec(new Runnable() {
					public void run() {
						Object key = event.getSource();
						Object oldValue = event.diff.getOldValue();
						Object newValue = event.diff.getNewValue();
						fireMapChange(Diffs.createMapDiffSingleChange(key,
								oldValue, newValue));
					}
				});
			}
		}
	};

	/**
	 * @param keySet
	 * @param valueProperty
	 */
	public SetValuePropertyObservableMap(IObservableSet keySet,
			IValueProperty valueProperty) {
		super(keySet);
		this.property = valueProperty;
	}

	protected Object doGet(Object key) {
		return property.getValue(key);
	}

	protected Object doPut(Object key, Object value) {
		Object result = property.getValue(key);
		property.setValue(key, value);
		return result;
	}

	protected void hookListener(Object addedKey) {
		if (!disposed)
			property.addValueChangeListener(addedKey, listener);
	}

	protected void unhookListener(Object removedKey) {
		if (!disposed)
			property.removeValueChangeListener(removedKey, listener);
	}

	public Object getObserved() {
		return keySet();
	}

	public synchronized void dispose() {
		super.dispose();

		if (!disposed) {
			disposed = true;
			property = null;
			listener = null;
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2008 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.core.databinding.property;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.internal.databinding.Util;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;

/**
 * @since 1.2
 * 
 */
public abstract class BasicValueProperty extends ValueProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	public void setValue(Object source, Object value) {
		Object oldValue = getValue(source);

		updateHelper.setUpdating(source, true);
		try {
			doSetValue(source, value);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			Object newValue = getValue(source);
			if (!Util.equals(oldValue, newValue)) {
				fireValueChange(source, Diffs.createValueDiff(oldValue,
						newValue));
			}
		}
	}

	protected abstract void doSetValue(Object source, Object value);

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.internal.databinding.property;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 1.2
 * 
 */
public class PropertyObservableValue extends AbstractObservableValue implements
		IPropertyObservable {
	private Object source;
	private IValueProperty property;

	private boolean updating = false;

	private boolean disposed = false;

	private IValuePropertyChangeListener listener = new IValuePropertyChangeListener() {
		public void handleValuePropertyChange(
				final ValuePropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						fireValueChange(event.diff);
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableValue(Realm realm, Object source,
			IValueProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addValueChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeValueChangeListener(source, listener);
		}
	}

	protected Object doGetValue() {
		return property.getValue(source);
	}

	protected void doSetValue(Object value) {
		Object oldValue = doGetValue();

		updating = true;
		try {
			property.setValue(source, value);
		} finally {
			updating = false;
		}

		Object newValue = doGetValue();
		if (!Util.equals(oldValue, newValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}

	public Object getValueType() {
		return property.getValueType();
	}

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeValueChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * @since 1.2
 */
public interface IListPropertyChangeListener extends IPropertyChangeListener {
	/**
	 * @param event
	 */
	public void handleListPropertyChange(ListPropertyChangeEvent event);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall 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:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * @since 1.2
 * 
 */
public abstract class Property implements IProperty {
	private PropertyChangeSupport changeSupport;

	synchronized PropertyChangeSupport getChangeSupport() {
		if (changeSupport == null)
			changeSupport = new PropertyChangeSupport(this);
		return changeSupport;
	}

	/**
	 * Notifies the property that the first listener has been added for the
	 * given source object. Implementers should register a listener on the
	 * source object which fires an appropriate change event when a property
	 * change is observed on the source.
	 * 
	 * @param source
	 *            the source object to observe for property changes.
	 * @see #removeListenerFrom(Object)
	 */
	protected abstract void addListenerTo(Object source);

	/**
	 * Notifies the property that the last listener has been removed for the
	 * given source object. Implementers should unregister any previously
	 * registered listeners from the source.
	 * 
	 * @param source
	 *            the source object to stop observing for property changes.
	 * @see #addListenerTo(Object)
	 */
	protected abstract void removeListenerFrom(Object source);

	/**
	 * Returns whether this property has listeners registered for the given
	 * property source
	 * 
	 * @param source
	 *            the property source
	 * @return whether this property has listeners registered for the given
	 *         property source
	 */
	protected boolean hasListeners(Object source) {
		return changeSupport != null && changeSupport.hasListeners(source);
	}

	public synchronized void dispose() {
		if (changeSupport != null) {
			changeSupport.dispose();
			changeSupport = null;
		}
	}
}

Return to bug 194734

Lines 11-29 Link Here

(-)src/org/eclipse/jface/tests/databinding/swt/SWTObservablesTest.java (-40 / +58 lines)
11		11
12	package org.eclipse.jface.tests.databinding.swt;	12	package org.eclipse.jface.tests.databinding.swt;
13		13
		14	import org.eclipse.core.databinding.observable.IDecoratingObservable;
14	import org.eclipse.core.databinding.observable.list.IObservableList;	15	import org.eclipse.core.databinding.observable.list.IObservableList;
		16	import org.eclipse.core.databinding.property.IPropertyObservable;
15	import org.eclipse.jface.databinding.conformance.util.RealmTester;	17	import org.eclipse.jface.databinding.conformance.util.RealmTester;
		18	import org.eclipse.jface.databinding.swt.ISWTObservable;
16	import org.eclipse.jface.databinding.swt.ISWTObservableValue;	19	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
17	import org.eclipse.jface.databinding.swt.SWTObservables;	20	import org.eclipse.jface.databinding.swt.SWTObservables;
18	import org.eclipse.jface.internal.databinding.swt.ButtonObservableValue;	21	import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
19	import org.eclipse.jface.internal.databinding.swt.CComboObservableList;	22	import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;
20	import org.eclipse.jface.internal.databinding.swt.CComboObservableValue;
21	import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;	23	import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;
22	import org.eclipse.jface.internal.databinding.swt.ComboObservableList;	24	import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
23	import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;	25	import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
24	import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;	26	import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;
25	import org.eclipse.jface.internal.databinding.swt.ListObservableList;
26	import org.eclipse.jface.internal.databinding.swt.ListObservableValue;
27	import org.eclipse.jface.internal.databinding.swt.SWTProperties;	27	import org.eclipse.jface.internal.databinding.swt.SWTProperties;
28	import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;	28	import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
29	import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;	29	import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;
Lines 55-68 Link Here
55		55
56	protected void setUp() throws Exception {	56	protected void setUp() throws Exception {
57	super.setUp();	57	super.setUp();
58		58
59	shell = getShell();	59	shell = getShell();
60	RealmTester.setDefault(SWTObservables.getRealm(shell.getDisplay()));	60	RealmTester.setDefault(SWTObservables.getRealm(shell.getDisplay()));
61	}	61	}
62		62
63	protected void tearDown() throws Exception {	63	protected void tearDown() throws Exception {
64	super.tearDown();	64	super.tearDown();
65		65
66	RealmTester.setDefault(null);	66	RealmTester.setDefault(null);
67	}	67	}
68		68
Lines 98-139 Link Here
98	Button button = new Button(shell, SWT.PUSH);	98	Button button = new Button(shell, SWT.PUSH);
99	ISWTObservableValue value = SWTObservables.observeSelection(button);	99	ISWTObservableValue value = SWTObservables.observeSelection(button);
100	assertNotNull(value);	100	assertNotNull(value);
101	assertTrue(value instanceof ButtonObservableValue);	101	assertTrue(value.getWidget() == button);
102	}	102	}
103		103
104	public void testObserveSelectionOfCombo() throws Exception {	104	public void testObserveSelectionOfCombo() throws Exception {
105	Combo combo = new Combo(shell, SWT.NONE);	105	Combo combo = new Combo(shell, SWT.NONE);
106	ISWTObservableValue value = SWTObservables.observeSelection(combo);	106	ISWTObservableValue value = SWTObservables.observeSelection(combo);
107	assertNotNull(value);	107	assertNotNull(value);
108	assertTrue(value instanceof ComboObservableValue);	108	assertTrue(value.getWidget() == combo);
109		109
110	ComboObservableValue comboObservable = (ComboObservableValue) value;	110	IPropertyObservable propertyObservable = getPropertyObservable(value);
111	assertEquals(SWTProperties.SELECTION, comboObservable.getAttribute());	111	assertTrue(propertyObservable.getProperty() instanceof ComboSelectionProperty);
112	}	112	}
113		113
114	public void testObserveSelectionOfCCombo() throws Exception {	114	public void testObserveSelectionOfCCombo() throws Exception {
115	CCombo combo = new CCombo(shell, SWT.NONE);	115	CCombo combo = new CCombo(shell, SWT.NONE);
116	ISWTObservableValue value = SWTObservables.observeSelection(combo);	116	ISWTObservableValue value = SWTObservables.observeSelection(combo);
117	assertNotNull(value);	117	assertNotNull(value);
118	assertTrue(value instanceof CComboObservableValue);	118	assertTrue(value.getWidget() == combo);
119		119
120	CComboObservableValue ccomboObservable = (CComboObservableValue) value;	120	IDecoratingObservable decorating = (IDecoratingObservable) value;
121	assertEquals(SWTProperties.SELECTION, ccomboObservable.getAttribute());	121	IPropertyObservable property = (IPropertyObservable) decorating
		122	.getDecorated();
		123	assertTrue(property.getProperty() instanceof CComboSelectionProperty);
122	}	124	}
123		125
124	public void testObserveSelectionOfList() throws Exception {	126	public void testObserveSelectionOfList() throws Exception {
125	List list = new List(shell, SWT.NONE);	127	List list = new List(shell, SWT.NONE);
126	ISWTObservableValue value = SWTObservables.observeSelection(list);	128	ISWTObservableValue value = SWTObservables.observeSelection(list);
127	assertNotNull(value);	129	assertNotNull(value);
128	assertTrue(value instanceof ListObservableValue);	130	assertTrue(value.getWidget() == list);
129	}	131	}
130		132
131	public void testObserveSelectionOfScale() throws Exception {	133	public void testObserveSelectionOfScale() throws Exception {
132	Scale scale = new Scale(shell, SWT.NONE);	134	Scale scale = new Scale(shell, SWT.NONE);
133	ISWTObservableValue value = SWTObservables.observeSelection(scale);	135	ISWTObservableValue value = SWTObservables.observeSelection(scale);
134	assertNotNull(value);	136	assertNotNull(value);
135	assertTrue(value instanceof ScaleObservableValue);	137	assertTrue(value instanceof ScaleObservableValue);
136		138
137	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;	139	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;
138	assertEquals(SWTProperties.SELECTION, scaleObservable.getAttribute());	140	assertEquals(SWTProperties.SELECTION, scaleObservable.getAttribute());
139	}	141	}
Lines 185-204 Link Here
185	Combo combo = new Combo(shell, SWT.NONE);	187	Combo combo = new Combo(shell, SWT.NONE);
186	ISWTObservableValue value = SWTObservables.observeText(combo);	188	ISWTObservableValue value = SWTObservables.observeText(combo);
187	assertNotNull(value);	189	assertNotNull(value);
188	assertTrue(value instanceof ComboObservableValue);	190	assertTrue(value.getWidget() == combo);
189		191
190	ComboObservableValue comboObservable = (ComboObservableValue) value;	192	assertTrue(getPropertyObservable(value).getProperty() instanceof ComboTextProperty);
191	assertEquals(SWTProperties.TEXT, comboObservable.getAttribute());	193	}
		194
		195	/**
		196	* @param observable
		197	* @return
		198	*/
		199	private IPropertyObservable getPropertyObservable(
		200	ISWTObservableValue observable) {
		201	IDecoratingObservable decoratingObservable = (IDecoratingObservable) observable;
		202	IPropertyObservable propertyObservable = (IPropertyObservable) decoratingObservable
		203	.getDecorated();
		204	return propertyObservable;
192	}	205	}
193		206
194	public void testObserveTextOfCCombo() throws Exception {	207	public void testObserveTextOfCCombo() throws Exception {
195	CCombo combo = new CCombo(shell, SWT.NONE);	208	CCombo combo = new CCombo(shell, SWT.NONE);
196	ISWTObservableValue value = SWTObservables.observeText(combo);	209	ISWTObservableValue value = SWTObservables.observeText(combo);
197	assertNotNull(value);	210	assertNotNull(value);
198	assertTrue(value instanceof CComboObservableValue);	211	assertTrue(value.getWidget() == combo);
199		212
200	CComboObservableValue ccomboObservable = (CComboObservableValue) value;	213	IDecoratingObservable decorating = (IDecoratingObservable) value;
201	assertEquals(SWTProperties.TEXT, ccomboObservable.getAttribute());	214	IPropertyObservable property = (IPropertyObservable) decorating
		215	.getDecorated();
		216	assertTrue(property.getProperty() instanceof CComboTextProperty);
202	}	217	}
203		218
204	public void testObserveTextOfUnsupportedControl() throws Exception {	219	public void testObserveTextOfUnsupportedControl() throws Exception {
Lines 214-234 Link Here
214	Combo combo = new Combo(shell, SWT.NONE);	229	Combo combo = new Combo(shell, SWT.NONE);
215	IObservableList list = SWTObservables.observeItems(combo);	230	IObservableList list = SWTObservables.observeItems(combo);
216	assertNotNull(list);	231	assertNotNull(list);
217	assertTrue(list instanceof ComboObservableList);	232	assertTrue(list instanceof ISWTObservable);
		233	assertTrue(((ISWTObservable) list).getWidget() == combo);
218	}	234	}
219		235
220	public void testObserveItemsOfCCombo() throws Exception {	236	public void testObserveItemsOfCCombo() throws Exception {
221	CCombo ccombo = new CCombo(shell, SWT.NONE);	237	CCombo ccombo = new CCombo(shell, SWT.NONE);
222	IObservableList list = SWTObservables.observeItems(ccombo);	238	IObservableList list = SWTObservables.observeItems(ccombo);
223	assertNotNull(list);	239	assertNotNull(list);
224	assertTrue(list instanceof CComboObservableList);	240	ISWTObservable swtObservable = (ISWTObservable) list;
		241	assertTrue(swtObservable.getWidget() == ccombo);
225	}	242	}
226		243
227	public void testObserveItemsOfList() throws Exception {	244	public void testObserveItemsOfList() throws Exception {
228	List list = new List(shell, SWT.NONE);	245	List list = new List(shell, SWT.NONE);
229	IObservableList observableList = SWTObservables.observeItems(list);	246	IObservableList observableList = SWTObservables.observeItems(list);
230	assertNotNull(observableList);	247	assertNotNull(observableList);
231	assertTrue(observableList instanceof ListObservableList);	248	ISWTObservable swtObservable = (ISWTObservable) observableList;
		249	assertTrue(swtObservable.getWidget() == list);
232	}	250	}
233		251
234	public void testObserveItemsOfUnsupportedControl() throws Exception {	252	public void testObserveItemsOfUnsupportedControl() throws Exception {
Lines 258-280 Link Here
258		276
259	}	277	}
260	}	278	}
261		279
262	public void testObserveMinOfSpinner() throws Exception {	280	public void testObserveMinOfSpinner() throws Exception {
263	Spinner spinner = new Spinner(shell, SWT.NONE);	281	Spinner spinner = new Spinner(shell, SWT.NONE);
264	ISWTObservableValue value = SWTObservables.observeMin(spinner);	282	ISWTObservableValue value = SWTObservables.observeMin(spinner);
265	assertNotNull(value);	283	assertNotNull(value);
266	assertTrue(value instanceof SpinnerObservableValue);	284	assertTrue(value instanceof SpinnerObservableValue);
267		285
268	SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;	286	SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;
269	assertEquals(SWTProperties.MIN, spinnerObservable.getAttribute());	287	assertEquals(SWTProperties.MIN, spinnerObservable.getAttribute());
270	}	288	}
271		289
272	public void testObserveMinOfScale() throws Exception {	290	public void testObserveMinOfScale() throws Exception {
273	Scale scale = new Scale(shell, SWT.NONE);	291	Scale scale = new Scale(shell, SWT.NONE);
274	ISWTObservableValue value = SWTObservables.observeMin(scale);	292	ISWTObservableValue value = SWTObservables.observeMin(scale);
275	assertNotNull(value);	293	assertNotNull(value);
276	assertTrue(value instanceof ScaleObservableValue);	294	assertTrue(value instanceof ScaleObservableValue);
277		295
278	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;	296	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;
279	assertEquals(SWTProperties.MIN, scaleObservable.getAttribute());	297	assertEquals(SWTProperties.MIN, scaleObservable.getAttribute());
280	}	298	}
Lines 284-313 Link Here
284	try {	302	try {
285	SWTObservables.observeMin(text);	303	SWTObservables.observeMin(text);
286	fail("Exception should have been thrown");	304	fail("Exception should have been thrown");
287	} catch (IllegalArgumentException e) {	305	} catch (IllegalArgumentException e) {
288	}	306	}
289	}	307	}
290		308
291	public void testObserveMaxOfSpinner() throws Exception {	309	public void testObserveMaxOfSpinner() throws Exception {
292	Spinner spinner = new Spinner(shell, SWT.NONE);	310	Spinner spinner = new Spinner(shell, SWT.NONE);
293	ISWTObservableValue value = SWTObservables.observeMax(spinner);	311	ISWTObservableValue value = SWTObservables.observeMax(spinner);
294	assertNotNull(value);	312	assertNotNull(value);
295	assertTrue(value instanceof SpinnerObservableValue);	313	assertTrue(value instanceof SpinnerObservableValue);
296		314
297	SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;	315	SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;
298	assertEquals(SWTProperties.MAX, spinnerObservable.getAttribute());	316	assertEquals(SWTProperties.MAX, spinnerObservable.getAttribute());
299	}	317	}
300		318
301	public void testObserveMaxOfScale() throws Exception {	319	public void testObserveMaxOfScale() throws Exception {
302	Scale scale = new Scale(shell, SWT.NONE);	320	Scale scale = new Scale(shell, SWT.NONE);
303	ISWTObservableValue value = SWTObservables.observeMax(scale);	321	ISWTObservableValue value = SWTObservables.observeMax(scale);
304	assertNotNull(value);	322	assertNotNull(value);
305	assertTrue(value instanceof ScaleObservableValue);	323	assertTrue(value instanceof ScaleObservableValue);
306		324
307	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;	325	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;
308	assertEquals(SWTProperties.MAX, scaleObservable.getAttribute());	326	assertEquals(SWTProperties.MAX, scaleObservable.getAttribute());
309	}	327	}
310		328
311	public void testObserveMaxOfUnsupportedControl() throws Exception {	329	public void testObserveMaxOfUnsupportedControl() throws Exception {
312	Text text = new Text(shell, SWT.NONE);	330	Text text = new Text(shell, SWT.NONE);
313	try {	331	try {
Lines 316-329 Link Here
316	} catch (IllegalArgumentException e) {	334	} catch (IllegalArgumentException e) {
317	}	335	}
318	}	336	}
319		337
320	public void testObserveEditableOfText() throws Exception {	338	public void testObserveEditableOfText() throws Exception {
321	Text text = new Text(shell, SWT.NONE);	339	Text text = new Text(shell, SWT.NONE);
322	ISWTObservableValue value = SWTObservables.observeEditable(text);	340	ISWTObservableValue value = SWTObservables.observeEditable(text);
323	assertNotNull(value);	341	assertNotNull(value);
324	assertTrue(value instanceof TextEditableObservableValue);	342	assertTrue(value instanceof TextEditableObservableValue);
325	}	343	}
326		344
327	public void testObserveEditableOfUnsupportedControl() throws Exception {	345	public void testObserveEditableOfUnsupportedControl() throws Exception {
328	Label label = new Label(shell, SWT.NONE);	346	Label label = new Label(shell, SWT.NONE);
329	try {	347	try {

Lines 7-16 Link Here

(-)src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java (-18 / +16 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Matthew Hall - bug 194734
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.core.tests.databinding.beans;	13	package org.eclipse.core.tests.databinding.beans;
13		14
		15	import org.eclipse.core.databinding.beans.IBeanObservable;
14	import org.eclipse.core.databinding.beans.PojoObservables;	16	import org.eclipse.core.databinding.beans.PojoObservables;
15	import org.eclipse.core.databinding.observable.Realm;	17	import org.eclipse.core.databinding.observable.Realm;
16	import org.eclipse.core.databinding.observable.list.IObservableList;	18	import org.eclipse.core.databinding.observable.list.IObservableList;
Lines 19-28 Link Here
19	import org.eclipse.core.databinding.observable.set.IObservableSet;	21	import org.eclipse.core.databinding.observable.set.IObservableSet;
20	import org.eclipse.core.databinding.observable.set.WritableSet;	22	import org.eclipse.core.databinding.observable.set.WritableSet;
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	23	import org.eclipse.core.databinding.observable.value.IObservableValue;
22	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
23	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
24	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
25	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
26	import org.eclipse.core.tests.internal.databinding.beans.Bean;	24	import org.eclipse.core.tests.internal.databinding.beans.Bean;
27	import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;	25	import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
28	import org.eclipse.jface.databinding.conformance.util.CurrentRealm;	26	import org.eclipse.jface.databinding.conformance.util.CurrentRealm;
Lines 47-58 Link Here
47	propertyName = "value";	45	propertyName = "value";
48	}	46	}
49		47
50	public void testObserveValue_ReturnsJavaBeanObservableValue()	48	public void testObserveValue_ReturnsIBeanObservable()
51	throws Exception {	49	throws Exception {
52	IObservableValue value = PojoObservables.observeValue(pojo, propertyName);	50	IObservableValue value = PojoObservables.observeValue(pojo, propertyName);
53		51
54	assertNotNull(value);	52	assertNotNull(value);
55	assertTrue(value instanceof JavaBeanObservableValue);	53	assertTrue(value instanceof IBeanObservable);
56	}	54	}
57		55
58	public void testObserveValue_DoesNotAttachListeners() throws Exception {	56	public void testObserveValue_DoesNotAttachListeners() throws Exception {
Lines 62-78 Link Here
62	assertFalse(pojo.hasListeners(propertyName));	60	assertFalse(pojo.hasListeners(propertyName));
63	}	61	}
64		62
65	public void testObservableValueWithRealm_ReturnsJavaBeanObservable()	63	public void testObservableValueWithRealm_ReturnsIBeanObservable()
66	throws Exception {	64	throws Exception {
67	CurrentRealm realm = new CurrentRealm(true);	65	CurrentRealm realm = new CurrentRealm(true);
68	IObservableValue value = PojoObservables.observeValue(realm, pojo,	66	IObservableValue value = PojoObservables.observeValue(realm, pojo,
69	propertyName);	67	propertyName);
70		68
71	assertNotNull(value);	69	assertNotNull(value);
72	assertTrue(value instanceof JavaBeanObservableValue);	70	assertTrue(value instanceof IBeanObservable);
73	}	71	}
74		72
75	public void testObservableMap_ReturnsJavaBeanObservableMap()	73	public void testObservableMap_ReturnsIBeanObservable()
76	throws Exception {	74	throws Exception {
77	IObservableSet set = new WritableSet();	75	IObservableSet set = new WritableSet();
78	set.add(new Bean());	76	set.add(new Bean());
Lines 80-86 Link Here
80	IObservableMap map = PojoObservables.observeMap(set, Bean.class,	78	IObservableMap map = PojoObservables.observeMap(set, Bean.class,
81	propertyName);	79	propertyName);
82	assertNotNull(map);	80	assertNotNull(map);
83	assertTrue(map instanceof JavaBeanObservableMap);	81	assertTrue(map instanceof IBeanObservable);
84	}	82	}
85		83
86	public void testObservableMap_DoesNotAttachListeners() throws Exception {	84	public void testObservableMap_DoesNotAttachListeners() throws Exception {
Lines 101-109 Link Here
101	assertEquals(2, maps.length);	99	assertEquals(2, maps.length);
102	}	100	}
103		101
104	public void testObserveListWithElementType_ReturnsJavaBeanObservableList() throws Exception {	102	public void testObserveListWithElementType_ReturnsIBeanObservable() throws Exception {
105	IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);	103	IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);
106	assertTrue(list instanceof JavaBeanObservableList);	104	assertTrue(list instanceof IBeanObservable);
107	}	105	}
108		106
109	public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {	107	public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {
Lines 113-121 Link Here
113	assertFalse(pojo.hasListeners("list"));	111	assertFalse(pojo.hasListeners("list"));
114	}	112	}
115		113
116	public void testObserveList_ReturnsJavaBeanObservableList() throws Exception {	114	public void testObserveList_ReturnsIBeanObservable() throws Exception {
117	IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");	115	IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");
118	assertTrue(observable instanceof JavaBeanObservableList);	116	assertTrue(observable instanceof IBeanObservable);
119	}	117	}
120		118
121	public void testObserveList_DoesNotAttachListeners() throws Exception {	119	public void testObserveList_DoesNotAttachListeners() throws Exception {
Lines 125-133 Link Here
125	assertFalse(pojo.hasListeners("list"));	123	assertFalse(pojo.hasListeners("list"));
126	}	124	}
127		125
128	public void testObserveSetWithElementType_ReturnsJavaBeanObservableList() throws Exception {	126	public void testObserveSetWithElementType_ReturnsIBeanObservable() throws Exception {
129	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);	127	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);
130	assertTrue(list instanceof JavaBeanObservableSet);	128	assertTrue(list instanceof IBeanObservable);
131	}	129	}
132		130
133	public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {	131	public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {
Lines 137-145 Link Here
137	assertFalse(pojo.hasListeners("set"));	135	assertFalse(pojo.hasListeners("set"));
138	}	136	}
139		137
140	public void testObserveSet_ReturnsJavaBeanObservableList() throws Exception {	138	public void testObserveSet_ReturnsIBeanObservable() throws Exception {
141	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");	139	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");
142	assertTrue(list instanceof JavaBeanObservableSet);	140	assertTrue(list instanceof IBeanObservable);
143	}	141	}
144		142
145	public void testObserveSet_DoesNotAttachListeners() throws Exception {	143	public void testObserveSet_DoesNotAttachListeners() throws Exception {

Removed Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/ListObservableValue.java (-109 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653
11	* Ashley Cambrell - bug 198904
12	*******************************************************************************/
13	package org.eclipse.jface.internal.databinding.swt;
14
15	import org.eclipse.core.databinding.observable.Diffs;
16	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.widgets.Event;
19	import org.eclipse.swt.widgets.List;
20	import org.eclipse.swt.widgets.Listener;
21
22	/**
23	* @since 3.2
24	*
25	*/
26	public class ListObservableValue extends AbstractSWTObservableValue {
27
28	private final List list;
29
30	private boolean updating = false;
31
32	private String currentValue;
33
34	private Listener listener;
35
36	/**
37	* @param list
38	*/
39	public ListObservableValue(List list) {
40	super(list);
41	this.list = list;
42	this.currentValue = (String) doGetValue();
43
44	if ((list.getStyle() & SWT.MULTI) > 0)
45	throw new IllegalArgumentException(
46	"SWT.SINGLE support only for a List selection"); //$NON-NLS-1$
47
48	listener = new Listener() {
49
50	public void handleEvent(Event event) {
51	if (!updating) {
52	Object oldValue = currentValue;
53	currentValue = (String) doGetValue();
54	fireValueChange(Diffs.createValueDiff(oldValue,
55	currentValue));
56	}
57	}
58
59	};
60	list.addListener(SWT.Selection, listener);
61	}
62
63	public void doSetValue(Object value) {
64	String oldValue = null;
65	if (list.getSelection() != null && list.getSelection().length > 0)
66	oldValue = list.getSelection()[0];
67	try {
68	updating = true;
69	String items[] = list.getItems();
70	int index = -1;
71	if (items != null && value != null) {
72	for (int i = 0; i < items.length; i++) {
73	if (value.equals(items[i])) {
74	index = i;
75	break;
76	}
77	}
78	list.select(index); // -1 will not "unselect"
79	}
80	currentValue = (String) value;
81	} finally {
82	updating = false;
83	}
84	fireValueChange(Diffs.createValueDiff(oldValue, value));
85	}
86
87	public Object doGetValue() {
88	int index = list.getSelectionIndex();
89	if (index >= 0)
90	return list.getItem(index);
91	return null;
92	}
93
94	public Object getValueType() {
95	return String.class;
96	}
97
98	/*
99	* (non-Javadoc)
100	*
101	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
102	*/
103	public synchronized void dispose() {
104	super.dispose();
105	if (listener != null && !list.isDisposed()) {
106	list.removeListener(SWT.Selection, listener);
107	}
108	}
109	}

Lines 21-38 Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/SWTProperties.java (-26 / +1 lines)
21	public interface SWTProperties {	21	public interface SWTProperties {
22		22
23	/**	23	/**
24	* Applies to Control
25	*/
26	public static final String ENABLED = "enabled"; //$NON-NLS-1$
27	/**
28	* Applies to Control
29	*/
30	public static final String VISIBLE = "visible"; //$NON-NLS-1$
31	/**
32	* Applies to Control
33	*/
34	public static final String TOOLTIP_TEXT = "tooltip"; //$NON-NLS-1$
35	/**
36	* Applies to	24	* Applies to
37	*/	25	*/
38	public static final String ITEMS = "items"; //$NON-NLS-1$	26	public static final String ITEMS = "items"; //$NON-NLS-1$
Lines 56-77 Link Here
56	* Applies to Text, Label, Combo	44	* Applies to Text, Label, Combo
57	*/	45	*/
58	public static final String TEXT = "text"; //$NON-NLS-1$	46	public static final String TEXT = "text"; //$NON-NLS-1$
59		47
60	/**	48	/**
61	* Applies to Label, CLabel.	49	* Applies to Label, CLabel.
62	*/	50	*/
63	public static final String IMAGE = "image"; //$NON-NLS-1$	51	public static final String IMAGE = "image"; //$NON-NLS-1$
64	/**
65	* Applies to Control
66	*/
67	public static final String FOREGROUND = "foreground"; //$NON-NLS-1$
68	/**
69	* Applies to Control
70	*/
71	public static final String BACKGROUND = "background"; //$NON-NLS-1$
72	/**
73	* Applies to Control
74	*/
75	public static final String FONT = "font"; //$NON-NLS-1$
76
77	}	52	}

Lines 19-39 Link Here

(-)src/org/eclipse/jface/databinding/swt/SWTObservables.java (-47 / +68 lines)
19		19
20	import org.eclipse.core.databinding.observable.Realm;	20	import org.eclipse.core.databinding.observable.Realm;
21	import org.eclipse.core.databinding.observable.list.IObservableList;	21	import org.eclipse.core.databinding.observable.list.IObservableList;
22	import org.eclipse.jface.internal.databinding.swt.ButtonObservableValue;	22	import org.eclipse.core.databinding.property.IListProperty;
23	import org.eclipse.jface.internal.databinding.swt.CComboObservableList;	23	import org.eclipse.core.databinding.property.IValueProperty;
24	import org.eclipse.jface.internal.databinding.swt.CComboObservableValue;	24	import org.eclipse.core.databinding.property.PropertyObservables;
		25	import org.eclipse.jface.internal.databinding.internal.swt.LinkObservableValue;
25	import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionObservableValue;	26	import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionObservableValue;
26	import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;	27	import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;
27	import org.eclipse.jface.internal.databinding.swt.ComboObservableList;
28	import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;
29	import org.eclipse.jface.internal.databinding.internal.swt.LinkObservableValue;
30	import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionObservableValue;	28	import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionObservableValue;
31	import org.eclipse.jface.internal.databinding.swt.ControlObservableValue;
32	import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;	29	import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;
33	import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;	30	import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;
34	import org.eclipse.jface.internal.databinding.swt.ListObservableList;
35	import org.eclipse.jface.internal.databinding.swt.ListObservableValue;
36	import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionObservableValue;	31	import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionObservableValue;
		32	import org.eclipse.jface.internal.databinding.swt.SWTObservableListDecorator;
		33	import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
37	import org.eclipse.jface.internal.databinding.swt.SWTProperties;	34	import org.eclipse.jface.internal.databinding.swt.SWTProperties;
38	import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;	35	import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
39	import org.eclipse.jface.internal.databinding.swt.ShellObservableValue;	36	import org.eclipse.jface.internal.databinding.swt.ShellObservableValue;
Lines 88-100 Link Here
88		85
89	/**	86	/**
90	* Returns an observable which delays notification of value change events	87	* Returns an observable which delays notification of value change events
91	* from <code>observable</code> until <code>delay</code> milliseconds	88	* from <code>observable</code> until <code>delay</code> milliseconds have
92	* have passed since the last change event, or until a FocusOut event is	89	* passed since the last change event, or until a FocusOut event is received
93	* received from the underlying widget (whichever happens earlier). This	90	* from the underlying widget (whichever happens earlier). This class helps
94	* class helps to delay validation until the user stops typing. To notify	91	* to delay validation until the user stops typing. To notify about pending
95	* about pending changes, the returned observable value will fire a stale	92	* changes, the returned observable value will fire a stale event when the
96	* event when the wrapped observable value fires a change event, but this	93	* wrapped observable value fires a change event, but this change is being
97	* change is being delayed.	94	* delayed.
98	*	95	*
99	* @param delay	96	* @param delay
100	* @param observable	97	* @param observable
Lines 104-111 Link Here
104	*	101	*
105	* @since 1.2	102	* @since 1.2
106	*/	103	*/
107	public static ISWTObservableValue observeDelayedValue(int delay, ISWTObservableValue observable) {	104	public static ISWTObservableValue observeDelayedValue(int delay,
108	return new DelayedObservableValue(delay, observable);	105	ISWTObservableValue observable) {
		106	return new DelayedObservableValue(delay, observable);
		107	}
		108
		109	private static ISWTObservableValue observeControlValueProperty(
		110	Control control, IValueProperty property) {
		111	return new SWTObservableValueDecorator(
		112	PropertyObservables.observeValue(
		113	getRealm(control.getDisplay()), control, property),
		114	control);
109	}	115	}
110		116
111	/**	117	/**
Lines 114-120 Link Here
114	* control	120	* control
115	*/	121	*/
116	public static ISWTObservableValue observeEnabled(Control control) {	122	public static ISWTObservableValue observeEnabled(Control control) {
117	return new ControlObservableValue(control, SWTProperties.ENABLED);	123	return observeControlValueProperty(control, ControlProperties
		124	.enabledProperty());
118	}	125	}
119		126
120	/**	127	/**
Lines 123-129 Link Here
123	* control	130	* control
124	*/	131	*/
125	public static ISWTObservableValue observeVisible(Control control) {	132	public static ISWTObservableValue observeVisible(Control control) {
126	return new ControlObservableValue(control, SWTProperties.VISIBLE);	133	return observeControlValueProperty(control, ControlProperties
		134	.visibleProperty());
127	}	135	}
128		136
129	/**	137	/**
Lines 132-138 Link Here
132	* control	140	* control
133	*/	141	*/
134	public static ISWTObservableValue observeTooltipText(Control control) {	142	public static ISWTObservableValue observeTooltipText(Control control) {
135	return new ControlObservableValue(control, SWTProperties.TOOLTIP_TEXT);	143	return observeControlValueProperty(control, ControlProperties
		144	.toolTipTextProperty());
136	}	145	}
137		146
138	/**	147	/**
Lines 153-178 Link Here
153	* if <code>control</code> type is unsupported	162	* if <code>control</code> type is unsupported
154	*/	163	*/
155	public static ISWTObservableValue observeSelection(Control control) {	164	public static ISWTObservableValue observeSelection(Control control) {
		165	IValueProperty property;
156	if (control instanceof Spinner) {	166	if (control instanceof Spinner) {
157	return new SpinnerObservableValue((Spinner) control,	167	return new SpinnerObservableValue((Spinner) control,
158	SWTProperties.SELECTION);	168	SWTProperties.SELECTION);
159	} else if (control instanceof Button) {	169	} else if (control instanceof Button) {
160	return new ButtonObservableValue((Button) control);	170	property = ButtonProperties.selectionProperty();
161	} else if (control instanceof Combo) {	171	} else if (control instanceof Combo) {
162	return new ComboObservableValue((Combo) control,	172	property = ComboProperties.selectionProperty();
163	SWTProperties.SELECTION);
164	} else if (control instanceof CCombo) {	173	} else if (control instanceof CCombo) {
165	return new CComboObservableValue((CCombo) control,	174	property = CComboProperties.selectionProperty();
166	SWTProperties.SELECTION);
167	} else if (control instanceof List) {	175	} else if (control instanceof List) {
168	return new ListObservableValue((List) control);	176	property = ListProperties.selectionProperty();
169	} else if (control instanceof Scale) {	177	} else if (control instanceof Scale) {
170	return new ScaleObservableValue((Scale) control,	178	return new ScaleObservableValue((Scale) control,
171	SWTProperties.SELECTION);	179	SWTProperties.SELECTION);
		180	} else {
		181	throw new IllegalArgumentException(
		182	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
172	}	183	}
173		184
174	throw new IllegalArgumentException(	185	return observeControlValueProperty(control, property);
175	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
176	}	186	}
177		187
178	/**	188	/**
Lines 233-240 Link Here
233	* </ul>	243	* </ul>
234	*	244	*
235	* <li>org.eclipse.swt.widgets.Label</li>	245	* <li>org.eclipse.swt.widgets.Label</li>
		246	*
236	* @param control	247	* @param control
237	* @param event event type to register for change events	248	* @param event
		249	* event type to register for change events
238	* @return observable value	250	* @return observable value
239	* @throws IllegalArgumentException	251	* @throws IllegalArgumentException
240	* if <code>control</code> type is unsupported	252	* if <code>control</code> type is unsupported
Lines 266-271 Link Here
266	* if <code>control</code> type is unsupported	278	* if <code>control</code> type is unsupported
267	*/	279	*/
268	public static ISWTObservableValue observeText(Control control) {	280	public static ISWTObservableValue observeText(Control control) {
		281	IValueProperty property;
269	if (control instanceof Label) {	282	if (control instanceof Label) {
270	return new LabelObservableValue((Label) control);	283	return new LabelObservableValue((Label) control);
271	} else if (control instanceof Link) {	284	} else if (control instanceof Link) {
Lines 273-288 Link Here
273	} else if (control instanceof CLabel) {	286	} else if (control instanceof CLabel) {
274	return new CLabelObservableValue((CLabel) control);	287	return new CLabelObservableValue((CLabel) control);
275	} else if (control instanceof Combo) {	288	} else if (control instanceof Combo) {
276	return new ComboObservableValue((Combo) control, SWTProperties.TEXT);	289	property = ComboProperties.textProperty();
277	} else if (control instanceof CCombo) {	290	} else if (control instanceof CCombo) {
278	return new CComboObservableValue((CCombo) control,	291	property = CComboProperties.textProperty();
279	SWTProperties.TEXT);
280	} else if (control instanceof Shell) {	292	} else if (control instanceof Shell) {
281	return new ShellObservableValue((Shell) control);	293	return new ShellObservableValue((Shell) control);
		294	} else {
		295	throw new IllegalArgumentException(
		296	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
282	}	297	}
283		298
284	throw new IllegalArgumentException(	299	return observeControlValueProperty(control, property);
285	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
286	}	300	}
287		301
288	/**	302	/**
Lines 300-315 Link Here
300	* if <code>control</code> type is unsupported	314	* if <code>control</code> type is unsupported
301	*/	315	*/
302	public static IObservableList observeItems(Control control) {	316	public static IObservableList observeItems(Control control) {
		317	IListProperty property;
303	if (control instanceof Combo) {	318	if (control instanceof Combo) {
304	return new ComboObservableList((Combo) control);	319	property = ComboProperties.itemsProperty();
305	} else if (control instanceof CCombo) {	320	} else if (control instanceof CCombo) {
306	return new CComboObservableList((CCombo) control);	321	property = CComboProperties.itemsProperty();
307	} else if (control instanceof List) {	322	} else if (control instanceof List) {
308	return new ListObservableList((List) control);	323	property = ListProperties.itemsProperty();
		324	} else {
		325	throw new IllegalArgumentException(
		326	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
309	}	327	}
310		328
311	throw new IllegalArgumentException(	329	return new SWTObservableListDecorator(PropertyObservables.observeList(
312	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$	330	control, property), control);
313	}	331	}
314		332
315	/**	333	/**
Lines 349-355 Link Here
349	* control	367	* control
350	*/	368	*/
351	public static ISWTObservableValue observeForeground(Control control) {	369	public static ISWTObservableValue observeForeground(Control control) {
352	return new ControlObservableValue(control, SWTProperties.FOREGROUND);	370	return observeControlValueProperty(control, ControlProperties
		371	.foregroundProperty());
353	}	372	}
354		373
355	/**	374	/**
Lines 358-364 Link Here
358	* control	377	* control
359	*/	378	*/
360	public static ISWTObservableValue observeBackground(Control control) {	379	public static ISWTObservableValue observeBackground(Control control) {
361	return new ControlObservableValue(control, SWTProperties.BACKGROUND);	380	return observeControlValueProperty(control, ControlProperties
		381	.backgroundProperty());
362	}	382	}
363		383
364	/**	384	/**
Lines 366-377 Link Here
366	* @return an observable value tracking the font of the given control	386	* @return an observable value tracking the font of the given control
367	*/	387	*/
368	public static ISWTObservableValue observeFont(Control control) {	388	public static ISWTObservableValue observeFont(Control control) {
369	return new ControlObservableValue(control, SWTProperties.FONT);	389	return observeControlValueProperty(control, ControlProperties
		390	.fontProperty());
370	}	391	}
371		392
372	/**	393	/**
373	* Returns an observable observing the editable attribute of	394	* Returns an observable observing the editable attribute of the provided
374	* the provided <code>control</code>. The supported types are:	395	* <code>control</code>. The supported types are:
375	* <ul>	396	* <ul>
376	* <li>org.eclipse.swt.widgets.Text</li>	397	* <li>org.eclipse.swt.widgets.Text</li>
377	* </ul>	398	* </ul>
Lines 385-391 Link Here
385	if (control instanceof Text) {	406	if (control instanceof Text) {
386	return new TextEditableObservableValue((Text) control);	407	return new TextEditableObservableValue((Text) control);
387	}	408	}
388		409
389	throw new IllegalArgumentException(	410	throw new IllegalArgumentException(
390	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$	411	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
391	}	412	}

Added Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/SWTObservableListDecorator.java (+57 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006 The Pampered Chef, Inc. and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* The Pampered Chef, Inc. - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.jface.internal.databinding.swt;
13
14	import org.eclipse.core.databinding.observable.list.DecoratingObservableList;
15	import org.eclipse.core.databinding.observable.list.IObservableList;
16	import org.eclipse.jface.databinding.swt.ISWTObservable;
17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.widgets.Event;
19	import org.eclipse.swt.widgets.Listener;
20	import org.eclipse.swt.widgets.Widget;
21
22	/**
23	* @since 3.3
24	*
25	*/
26	public class SWTObservableListDecorator extends DecoratingObservableList
27	implements ISWTObservable {
28	private Widget widget;
29
30	/**
31	* @param decorated
32	* @param widget
33	*/
34	public SWTObservableListDecorator(IObservableList decorated, Widget widget) {
35	super(decorated, true);
36	this.widget = widget;
37	widget.addListener(SWT.Dispose, disposeListener);
38	}
39
40	private Listener disposeListener = new Listener() {
41	public void handleEvent(Event event) {
42	SWTObservableListDecorator.this.dispose();
43	}
44	};
45
46	public void dispose() {
47	this.widget = null;
48	super.dispose();
49	}
50
51	/**
52	* @return Returns the widget.
53	*/
54	public Widget getWidget() {
55	return widget;
56	}
57	}

Added Link Here

(-)src/org/eclipse/jface/databinding/swt/ButtonProperties.java (+28 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.jface.databinding.swt;
13
14	import org.eclipse.core.databinding.property.IValueProperty;
15	import org.eclipse.jface.internal.databinding.swt.ButtonSelectionProperty;
16
17	/**
18	* @since 1.3
19	*
20	*/
21	public class ButtonProperties {
22	/**
23	* @return blah
24	*/
25	public static IValueProperty selectionProperty() {
26	return new ButtonSelectionProperty();
27	}
28	}

Lines 7-174 Link Here

(-)src/org/eclipse/core/internal/databinding/beans/BeanObservableSetDecorator.java (-132 / +15 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Brad Reynolds - initial API and implementation	9	* Brad Reynolds - initial API and implementation
		10	* Matthew Hall - bug 194734
10	******************************************************************************/	11	******************************************************************************/
11		12
12	package org.eclipse.core.internal.databinding.beans;	13	package org.eclipse.core.internal.databinding.beans;
13		14
14	import java.beans.PropertyDescriptor;	15	import java.beans.PropertyDescriptor;
15	import java.util.Collection;
16	import java.util.Iterator;
17		16
18	import org.eclipse.core.databinding.beans.IBeanObservable;	17	import org.eclipse.core.databinding.beans.IBeanObservable;
19	import org.eclipse.core.databinding.observable.IChangeListener;	18	import org.eclipse.core.databinding.observable.IObservable;
20	import org.eclipse.core.databinding.observable.IStaleListener;	19	import org.eclipse.core.databinding.observable.IObserving;
21	import org.eclipse.core.databinding.observable.Realm;	20	import org.eclipse.core.databinding.observable.set.DecoratingObservableSet;
22	import org.eclipse.core.databinding.observable.set.IObservableSet;	21	import org.eclipse.core.databinding.observable.set.IObservableSet;
23	import org.eclipse.core.databinding.observable.set.ISetChangeListener;
24	import org.eclipse.core.internal.databinding.Util;
25		22
26	/**	23	/**
27	* {@link IBeanObservable} decorator for an {@link IObservableSet}.	24	* {@link IBeanObservable} decorator for an {@link IObservableSet}.
28	*	25	*
29	* @since 3.3	26	* @since 3.3
30	*/	27	*/
31	public class BeanObservableSetDecorator implements IObservableSet, IBeanObservable {	28	public class BeanObservableSetDecorator extends DecoratingObservableSet
32	private IObservableSet delegate;	29	implements IBeanObservable {
33	private Object observed;
34	private PropertyDescriptor propertyDescriptor;	30	private PropertyDescriptor propertyDescriptor;
35		31
36	/**	32	/**
37	* @param delegate	33	* @param decorated
38	* @param observed
39	* @param propertyDescriptor	34	* @param propertyDescriptor
40	*/	35	*/
41	public BeanObservableSetDecorator(IObservableSet delegate,	36	public BeanObservableSetDecorator(IObservableSet decorated,
42	Object observed,
43	PropertyDescriptor propertyDescriptor) {	37	PropertyDescriptor propertyDescriptor) {
44		38	super(decorated, true);
45	this.delegate = delegate;
46	this.observed = observed;
47	this.propertyDescriptor = propertyDescriptor;	39	this.propertyDescriptor = propertyDescriptor;
48	}	40	}
49		41
50	public boolean add(Object o) {
51	return delegate.add(o);
52	}
53
54	public boolean addAll(Collection c) {
55	return delegate.addAll(c);
56	}
57
58	public void addChangeListener(IChangeListener listener) {
59	delegate.addChangeListener(listener);
60	}
61
62	public void addSetChangeListener(ISetChangeListener listener) {
63	delegate.addSetChangeListener(listener);
64	}
65
66	public void addStaleListener(IStaleListener listener) {
67	delegate.addStaleListener(listener);
68	}
69
70	public void clear() {
71	delegate.clear();
72	}
73
74	public boolean contains(Object o) {
75	return delegate.contains(o);
76	}
77
78	public boolean containsAll(Collection c) {
79	return delegate.containsAll(c);
80	}
81
82	public void dispose() {	42	public void dispose() {
83	delegate.dispose();	43	this.propertyDescriptor = null;
84	}	44	super.dispose();
85
86	public boolean equals(Object obj) {
87	if (obj instanceof BeanObservableSetDecorator) {
88	BeanObservableSetDecorator other = (BeanObservableSetDecorator) obj;
89	return Util.equals(other.delegate, delegate);
90	}
91	return Util.equals(delegate, obj);
92	}	45	}
93		46
94	public Object getElementType() {
95	return delegate.getElementType();
96	}
97
98	public Realm getRealm() {
99	return delegate.getRealm();
100	}
101
102	public int hashCode() {
103	return delegate.hashCode();
104	}
105
106	public boolean isEmpty() {
107	return delegate.isEmpty();
108	}
109
110	public boolean isStale() {
111	return delegate.isStale();
112	}
113
114	public Iterator iterator() {
115	return delegate.iterator();
116	}
117
118	public boolean remove(Object o) {
119	return delegate.remove(o);
120	}
121
122	public boolean removeAll(Collection c) {
123	return delegate.removeAll(c);
124	}
125
126	public void removeChangeListener(IChangeListener listener) {
127	delegate.removeChangeListener(listener);
128	}
129
130	public void removeSetChangeListener(ISetChangeListener listener) {
131	delegate.removeSetChangeListener(listener);
132	}
133
134	public void removeStaleListener(IStaleListener listener) {
135	delegate.removeStaleListener(listener);
136	}
137
138	public boolean retainAll(Collection c) {
139	return delegate.retainAll(c);
140	}
141
142	public int size() {
143	return delegate.size();
144	}
145
146	public Object[] toArray() {
147	return delegate.toArray();
148	}
149
150	public Object[] toArray(Object[] a) {
151	return delegate.toArray(a);
152	}
153
154	/* (non-Javadoc)
155	* @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
156	*/
157	public Object getObserved() {	47	public Object getObserved() {
158	return observed;	48	IObservable decorated = getDecorated();
		49	if (decorated instanceof IObserving)
		50	return ((IObserving) decorated).getObserved();
		51	return null;
159	}	52	}
160		53
161	/* (non-Javadoc)
162	* @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
163	*/
164	public PropertyDescriptor getPropertyDescriptor() {	54	public PropertyDescriptor getPropertyDescriptor() {
165	return propertyDescriptor;	55	return propertyDescriptor;
166	}	56	}
167
168	/**
169	* @return the wrapped set
170	*/
171	public IObservableSet getDelegate() {
172	return delegate;
173	}
174	}	57	}

Removed Link Here

(-)src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java (-142 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 171616
11	* Matthew hall - bugs 223164, 241585
12	*******************************************************************************/
13
14	package org.eclipse.core.internal.databinding.beans;
15
16	import java.beans.PropertyChangeListener;
17	import java.beans.PropertyDescriptor;
18	import java.lang.reflect.Method;
19
20	import org.eclipse.core.databinding.beans.IBeanObservable;
21	import org.eclipse.core.databinding.observable.Diffs;
22	import org.eclipse.core.databinding.observable.map.ComputedObservableMap;
23	import org.eclipse.core.databinding.observable.set.IObservableSet;
24	import org.eclipse.core.databinding.util.Policy;
25	import org.eclipse.core.runtime.IStatus;
26	import org.eclipse.core.runtime.Status;
27
28	/**
29	* @since 1.0
30	*
31	*/
32	public class JavaBeanObservableMap extends ComputedObservableMap implements
33	IBeanObservable {
34
35	private PropertyDescriptor propertyDescriptor;
36
37	private PropertyChangeListener elementListener = new PropertyChangeListener() {
38	public void propertyChange(final java.beans.PropertyChangeEvent event) {
39	if (!updating) {
40	getRealm().exec(new Runnable() {
41	public void run() {
42	fireMapChange(Diffs.createMapDiffSingleChange(
43	event.getSource(), event.getOldValue(), event
44	.getNewValue()));
45	}
46	});
47	}
48	}
49	};
50
51	private ListenerSupport listenerSupport;
52
53	private boolean updating = false;
54
55	private boolean attachListeners;
56
57	/**
58	* @param domain
59	* @param propertyDescriptor
60	*/
61	public JavaBeanObservableMap(IObservableSet domain,
62	PropertyDescriptor propertyDescriptor) {
63	this(domain, propertyDescriptor, true);
64	}
65
66	/**
67	* @param domain
68	* @param propertyDescriptor
69	* @param attachListeners
70	*/
71	public JavaBeanObservableMap(IObservableSet domain,
72	PropertyDescriptor propertyDescriptor, boolean attachListeners) {
73	super(domain);
74
75	this.propertyDescriptor = propertyDescriptor;
76	this.attachListeners = attachListeners;
77	if (attachListeners) {
78	this.listenerSupport = new ListenerSupport(elementListener,
79	propertyDescriptor.getName());
80	}
81	init();
82	}
83
84	protected void hookListener(Object domainElement) {
85	if (attachListeners && domainElement != null) {
86	listenerSupport.hookListener(domainElement);
87	}
88	}
89
90	protected void unhookListener(Object domainElement) {
91	if (attachListeners && domainElement != null) {
92	listenerSupport.unhookListener(domainElement);
93	}
94	}
95
96	protected Object doGet(Object key) {
97	if (key == null) {
98	return null;
99	}
100	try {
101	Method readMethod = propertyDescriptor.getReadMethod();
102	if (!readMethod.isAccessible()) {
103	readMethod.setAccessible(true);
104	}
105	return readMethod.invoke(key, new Object[0]);
106	} catch (Exception e) {
107	Policy.getLog().log(
108	new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
109	IStatus.ERROR, "cannot get value", e)); //$NON-NLS-1$
110	throw new RuntimeException(e);
111	}
112	}
113
114	protected Object doPut(Object key, Object value) {
115	try {
116	Object oldValue = get(key);
117	propertyDescriptor.getWriteMethod().invoke(key,
118	new Object[] { value });
119	keySet().add(key);
120	return oldValue;
121	} catch (Exception e) {
122	Policy.getLog().log(
123	new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
124	IStatus.ERROR, "cannot set value", e)); //$NON-NLS-1$
125	throw new RuntimeException(e);
126	}
127	}
128
129	/* (non-Javadoc)
130	* @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
131	*/
132	public Object getObserved() {
133	return keySet();
134	}
135
136	/* (non-Javadoc)
137	* @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
138	*/
139	public PropertyDescriptor getPropertyDescriptor() {
140	return propertyDescriptor;
141	}
142	}

Removed Link Here

(-)src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableList.java (-410 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006-2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 171616
11	* Matthew Hall - bugs 208858, 221351, 213145, 223164
12	* Mike Evans - bug 217558
13	*******************************************************************************/
14
15	package org.eclipse.core.internal.databinding.beans;
16
17	import java.beans.PropertyChangeListener;
18	import java.beans.PropertyDescriptor;
19	import java.lang.reflect.Array;
20	import java.lang.reflect.InvocationTargetException;
21	import java.lang.reflect.Method;
22	import java.util.ArrayList;
23	import java.util.Arrays;
24	import java.util.Collection;
25	import java.util.Iterator;
26	import java.util.List;
27
28	import org.eclipse.core.databinding.BindingException;
29	import org.eclipse.core.databinding.beans.IBeanObservable;
30	import org.eclipse.core.databinding.observable.Diffs;
31	import org.eclipse.core.databinding.observable.Realm;
32	import org.eclipse.core.databinding.observable.list.ListDiffEntry;
33	import org.eclipse.core.databinding.observable.list.ObservableList;
34
35	/**
36	* @since 1.0
37	*
38	*/
39	public class JavaBeanObservableList extends ObservableList implements
40	IBeanObservable {
41
42	private final Object object;
43
44	private PropertyChangeListener collectionListener = new PropertyChangeListener() {
45	public void propertyChange(java.beans.PropertyChangeEvent event) {
46	if (!updating) {
47	getRealm().exec(new Runnable() {
48	public void run() {
49	updateWrappedList( new ArrayList( Arrays.asList(getValues() ) ) );
50	}
51	});
52	}
53	}
54	};
55
56	private boolean updating = false;
57
58	private PropertyDescriptor descriptor;
59
60	private ListenerSupport collectionListenSupport;
61
62	private boolean attachListeners;
63
64	/**
65	* @param realm
66	* @param object
67	* @param descriptor
68	* @param elementType
69	*/
70	public JavaBeanObservableList(Realm realm, Object object,
71	PropertyDescriptor descriptor, Class elementType) {
72	this(realm, object, descriptor, elementType, true);
73	}
74
75	/**
76	* @param realm
77	* @param object
78	* @param descriptor
79	* @param elementType
80	* @param attachListeners
81	*/
82	public JavaBeanObservableList(Realm realm, Object object,
83	PropertyDescriptor descriptor, Class elementType,
84	boolean attachListeners) {
85
86	super(realm, new ArrayList(), elementType);
87	this.object = object;
88	this.descriptor = descriptor;
89	this.attachListeners = attachListeners;
90
91	if (attachListeners) {
92	this.collectionListenSupport = new ListenerSupport(
93	collectionListener, descriptor.getName());
94	}
95
96	// initialize list without firing events
97	wrappedList.addAll(Arrays.asList(getValues()));
98	}
99
100	protected void firstListenerAdded() {
101	if (attachListeners) {
102	collectionListenSupport.hookListener(this.object);
103	}
104	}
105
106	protected void lastListenerRemoved() {
107	if (collectionListenSupport != null) {
108	collectionListenSupport.dispose();
109	}
110	}
111
112	public void dispose() {
113	super.dispose();
114	lastListenerRemoved();
115	}
116
117	private Object primGetValues() {
118	Exception ex = null;
119	try {
120	Method readMethod = descriptor.getReadMethod();
121	if (!readMethod.isAccessible()) {
122	readMethod.setAccessible(true);
123	}
124	return readMethod.invoke(object, new Object[0]);
125	} catch (IllegalArgumentException e) {
126	ex = e;
127	} catch (IllegalAccessException e) {
128	ex = e;
129	} catch (InvocationTargetException e) {
130	ex = e;
131	}
132	throw new BindingException("Could not read collection values", ex); //$NON-NLS-1$
133	}
134
135	private Object[] getValues() {
136	Object[] values = null;
137
138	Object result = primGetValues();
139	if (descriptor.getPropertyType().isArray())
140	values = (Object[]) result;
141	else {
142	// TODO add jUnit for POJO (var. SettableValue) collections
143	Collection list = (Collection) result;
144	if (list != null) {
145	values = list.toArray();
146	}
147	}
148	if (values == null)
149	values = new Object[0];
150	return values;
151	}
152
153	public Object getObserved() {
154	return object;
155	}
156
157	public PropertyDescriptor getPropertyDescriptor() {
158	return descriptor;
159	}
160
161	private void setValues() {
162	if (descriptor.getPropertyType().isArray()) {
163	Class componentType = descriptor.getPropertyType()
164	.getComponentType();
165	Object[] newArray = (Object[]) Array.newInstance(componentType,
166	wrappedList.size());
167	wrappedList.toArray(newArray);
168	primSetValues(newArray);
169	} else {
170	// assume that it is a java.util.List
171	primSetValues(new ArrayList(wrappedList));
172	}
173	}
174
175	private void primSetValues(Object newValue) {
176	Exception ex = null;
177	try {
178	Method writeMethod = descriptor.getWriteMethod();
179	if (!writeMethod.isAccessible()) {
180	writeMethod.setAccessible(true);
181	}
182	writeMethod.invoke(object, new Object[] { newValue });
183	return;
184	} catch (IllegalArgumentException e) {
185	ex = e;
186	} catch (IllegalAccessException e) {
187	ex = e;
188	} catch (InvocationTargetException e) {
189	ex = e;
190	}
191	throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
192	}
193
194	public Object set(int index, Object element) {
195	getterCalled();
196	updating = true;
197	try {
198	Object oldElement = wrappedList.set(index, element);
199	setValues();
200	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
201	index, false, oldElement), Diffs.createListDiffEntry(index,
202	true, element)));
203	return oldElement;
204	} finally {
205	updating = false;
206	}
207	}
208
209	public Object move(int oldIndex, int newIndex) {
210	getterCalled();
211	updating = true;
212	try {
213	int size = wrappedList.size();
214	if (oldIndex < 0 \|\| oldIndex >= size)
215	throw new IndexOutOfBoundsException(
216	"oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
217	if (newIndex < 0 \|\| newIndex >= size)
218	throw new IndexOutOfBoundsException(
219	"newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
220	if (oldIndex == newIndex)
221	return wrappedList.get(oldIndex);
222	Object element = wrappedList.remove(oldIndex);
223	wrappedList.add(newIndex, element);
224	setValues();
225	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
226	oldIndex, false, element), Diffs.createListDiffEntry(
227	newIndex, true, element)));
228	return element;
229	} finally {
230	updating = false;
231	}
232	}
233
234	public Object remove(int index) {
235	getterCalled();
236	updating = true;
237	try {
238	Object oldElement = wrappedList.remove(index);
239	setValues();
240	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
241	index, false, oldElement)));
242	return oldElement;
243	} finally {
244	updating = false;
245	}
246	}
247
248	public boolean add(Object element) {
249	updating = true;
250	try {
251	int index = wrappedList.size();
252	boolean result = wrappedList.add(element);
253	setValues();
254	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
255	index, true, element)));
256	return result;
257	} finally {
258	updating = false;
259	}
260	}
261
262	public void add(int index, Object element) {
263	updating = true;
264	try {
265	wrappedList.add(index, element);
266	setValues();
267	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
268	index, true, element)));
269	} finally {
270	updating = false;
271	}
272	}
273
274	public boolean addAll(Collection c) {
275	if (c.isEmpty()) {
276	return false;
277	}
278	updating = true;
279	try {
280	int index = wrappedList.size();
281	boolean result = wrappedList.addAll(c);
282	setValues();
283	ListDiffEntry[] entries = new ListDiffEntry[c.size()];
284	int i = 0;
285	for (Iterator it = c.iterator(); it.hasNext();) {
286	Object o = it.next();
287	entries[i++] = Diffs.createListDiffEntry(index++, true, o);
288	}
289	fireListChange(Diffs.createListDiff(entries));
290	return result;
291	} finally {
292	updating = false;
293	}
294	}
295
296	public boolean addAll(int index, Collection c) {
297	if (c.isEmpty()) {
298	return false;
299	}
300	updating = true;
301	try {
302	boolean result = wrappedList.addAll(index, c);
303	setValues();
304	ListDiffEntry[] entries = new ListDiffEntry[c.size()];
305	int i = 0;
306	for (Iterator it = c.iterator(); it.hasNext();) {
307	Object o = it.next();
308	entries[i++] = Diffs.createListDiffEntry(index++, true, o);
309	}
310	fireListChange(Diffs.createListDiff(entries));
311	return result;
312	} finally {
313	updating = false;
314	}
315	}
316
317	public boolean remove(Object o) {
318	getterCalled();
319	int index = wrappedList.indexOf(o);
320	if (index == -1) {
321	return false;
322	}
323	updating = true;
324	try {
325	Object oldElement = wrappedList.remove(index);
326	setValues();
327	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
328	index, false, oldElement)));
329	return true;
330	} finally {
331	updating = false;
332	}
333	}
334
335	public boolean removeAll(Collection c) {
336	getterCalled();
337	boolean changed = false;
338	updating = true;
339	try {
340	List diffEntries = new ArrayList();
341	for (Iterator it = c.iterator(); it.hasNext();) {
342	Object o = it.next();
343	int index = wrappedList.indexOf(o);
344	if (index != -1) {
345	changed = true;
346	Object oldElement = wrappedList.remove(index);
347	diffEntries.add(Diffs.createListDiffEntry(index, false,
348	oldElement));
349	}
350	}
351	if (changed) {
352	setValues();
353	fireListChange(Diffs
354	.createListDiff((ListDiffEntry[]) diffEntries
355	.toArray(new ListDiffEntry[diffEntries.size()])));
356	}
357	return changed;
358	} finally {
359	updating = false;
360	}
361	}
362
363	public boolean retainAll(Collection c) {
364	getterCalled();
365	boolean changed = false;
366	updating = true;
367	try {
368	List diffEntries = new ArrayList();
369	int index = 0;
370	for (Iterator it = wrappedList.iterator(); it.hasNext();) {
371	Object o = it.next();
372	boolean retain = c.contains(o);
373	if (retain) {
374	index++;
375	} else {
376	changed = true;
377	it.remove();
378	diffEntries.add(Diffs.createListDiffEntry(index, false, o));
379	}
380	}
381	if (changed) {
382	setValues();
383	fireListChange(Diffs
384	.createListDiff((ListDiffEntry[]) diffEntries
385	.toArray(new ListDiffEntry[diffEntries.size()])));
386	}
387	return changed;
388	} finally {
389	updating = false;
390	}
391	}
392
393	public void clear() {
394	updating = true;
395	try {
396	List diffEntries = new ArrayList();
397	for (Iterator it = wrappedList.iterator(); it.hasNext();) {
398	Object o = it.next();
399	diffEntries.add(Diffs.createListDiffEntry(0, false, o));
400	}
401	wrappedList.clear();
402	setValues();
403	fireListChange(Diffs.createListDiff((ListDiffEntry[]) diffEntries
404	.toArray(new ListDiffEntry[diffEntries.size()])));
405	} finally {
406	updating = false;
407	}
408	}
409
410	}

Removed Link Here

(-)src/org/eclipse/core/internal/databinding/beans/JavaBeanPropertyObservableMap.java (-241 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 221704)
10	* Matthew Hall - bug 223164
11	*******************************************************************************/
12
13	package org.eclipse.core.internal.databinding.beans;
14
15	import java.beans.PropertyChangeEvent;
16	import java.beans.PropertyChangeListener;
17	import java.beans.PropertyDescriptor;
18	import java.lang.reflect.InvocationTargetException;
19	import java.lang.reflect.Method;
20	import java.util.Collections;
21	import java.util.HashMap;
22	import java.util.HashSet;
23	import java.util.Iterator;
24	import java.util.Map;
25	import java.util.Set;
26
27	import org.eclipse.core.databinding.BindingException;
28	import org.eclipse.core.databinding.beans.IBeanObservable;
29	import org.eclipse.core.databinding.observable.Diffs;
30	import org.eclipse.core.databinding.observable.Realm;
31	import org.eclipse.core.databinding.observable.map.ObservableMap;
32	import org.eclipse.core.internal.databinding.Util;
33	import org.eclipse.core.runtime.Assert;
34
35	/**
36	* @since 1.0
37	*
38	*/
39	public class JavaBeanPropertyObservableMap extends ObservableMap implements
40	IBeanObservable {
41
42	private final Object object;
43
44	private PropertyChangeListener mapListener = new PropertyChangeListener() {
45	public void propertyChange(final PropertyChangeEvent event) {
46	if (!updating) {
47	getRealm().exec(new Runnable() {
48	public void run() {
49	Map oldValue = wrappedMap;
50	Map newValue = (Map) event.getNewValue();
51	wrappedMap = new HashMap(newValue);
52
53	fireMapChange(Diffs.computeMapDiff(oldValue, newValue));
54	}
55	});
56	}
57	}
58	};
59
60	private boolean updating = false;
61
62	private PropertyDescriptor descriptor;
63
64	private ListenerSupport collectionListenSupport;
65
66	private boolean attachListeners;
67
68	/**
69	* @param realm
70	* @param object
71	* @param descriptor
72	*/
73	public JavaBeanPropertyObservableMap(Realm realm, Object object,
74	PropertyDescriptor descriptor) {
75	this(realm, object, descriptor, true);
76	}
77
78	/**
79	* @param realm
80	* @param object
81	* @param descriptor
82	* @param attachListeners
83	*/
84	public JavaBeanPropertyObservableMap(Realm realm, Object object,
85	PropertyDescriptor descriptor, boolean attachListeners) {
86	super(realm, new HashMap());
87	this.object = object;
88	this.descriptor = descriptor;
89	this.attachListeners = attachListeners;
90	if (attachListeners) {
91	this.collectionListenSupport = new ListenerSupport(mapListener,
92	descriptor.getName());
93	}
94
95	wrappedMap.putAll(getMap());
96	}
97
98	protected void firstListenerAdded() {
99	if (attachListeners) {
100	collectionListenSupport.hookListener(this.object);
101	}
102	}
103
104	protected void lastListenerRemoved() {
105	if (collectionListenSupport != null) {
106	collectionListenSupport.dispose();
107	}
108	}
109
110	private Object primGetMap() {
111	try {
112	Method readMethod = descriptor.getReadMethod();
113	if (!readMethod.isAccessible()) {
114	readMethod.setAccessible(true);
115	}
116	return readMethod.invoke(object, new Object[0]);
117	} catch (IllegalArgumentException e) {
118	} catch (IllegalAccessException e) {
119	} catch (InvocationTargetException e) {
120	}
121	Assert.isTrue(false, "Could not read collection values"); //$NON-NLS-1$
122	return null;
123	}
124
125	private void primSetMap(Object newValue) {
126	Exception ex = null;
127	try {
128	Method writeMethod = descriptor.getWriteMethod();
129	if (!writeMethod.isAccessible()) {
130	writeMethod.setAccessible(true);
131	}
132	writeMethod.invoke(object, new Object[] { newValue });
133	return;
134	} catch (IllegalArgumentException e) {
135	ex = e;
136	} catch (IllegalAccessException e) {
137	ex = e;
138	} catch (InvocationTargetException e) {
139	ex = e;
140	}
141	throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
142	}
143
144	private Map getMap() {
145	Map result = (Map) primGetMap();
146
147	if (result == null)
148	result = new HashMap();
149	return result;
150	}
151
152	private void setMap() {
153	primSetMap(new HashMap(wrappedMap));
154	}
155
156	public Object put(Object key, Object value) {
157	checkRealm();
158	updating = true;
159	try {
160	Object result = wrappedMap.put(key, value);
161	if (!Util.equals(result, value)) {
162	setMap();
163	if (result == null) {
164	fireMapChange(Diffs.createMapDiffSingleAdd(key, value));
165	} else {
166	fireMapChange(Diffs.createMapDiffSingleChange(key, result,
167	value));
168	}
169	}
170	return result;
171	} finally {
172	updating = false;
173	}
174	}
175
176	public void putAll(Map map) {
177	checkRealm();
178	updating = true;
179	try {
180	Set addedKeys = new HashSet(map.size());
181	Map changes = new HashMap(map.size());
182	for (Iterator it = map.entrySet().iterator(); it.hasNext();) {
183	Map.Entry entry = (Entry) it.next();
184	Object key = entry.getKey();
185	Object newValue = entry.getValue();
186	Object oldValue = wrappedMap.put(key, newValue);
187	if (oldValue == null) {
188	addedKeys.add(key);
189	} else if (!Util.equals(oldValue, newValue)) {
190	changes.put(key, oldValue);
191	}
192	}
193	if (!addedKeys.isEmpty() \|\| !changes.isEmpty()) {
194	setMap();
195	fireMapChange(Diffs.createMapDiff(addedKeys,
196	Collections.EMPTY_SET, changes.keySet(), changes,
197	wrappedMap));
198	}
199	} finally {
200	updating = false;
201	}
202	}
203
204	public Object remove(Object key) {
205	checkRealm();
206	updating = true;
207	try {
208	Object result = wrappedMap.remove(key);
209	if (result!=null) {
210	setMap();
211	fireMapChange(Diffs.createMapDiffSingleRemove(key, result));
212	}
213	return result;
214	} finally {
215	updating = false;
216	}
217	}
218
219	public void clear() {
220	checkRealm();
221	if (wrappedMap.isEmpty())
222	return;
223	updating = true;
224	try {
225	Map oldMap = wrappedMap;
226	wrappedMap = new HashMap();
227	setMap();
228	fireMapChange(Diffs.computeMapDiff(oldMap, Collections.EMPTY_MAP));
229	} finally {
230	updating = false;
231	}
232	}
233
234	public Object getObserved() {
235	return object;
236	}
237
238	public PropertyDescriptor getPropertyDescriptor() {
239	return descriptor;
240	}
241	}

Lines 8-24 Link Here

(-)src/org/eclipse/core/databinding/beans/BeansObservables.java (-99 / +46 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bugs 164268, 171616, 147515	10	* Brad Reynolds - bugs 164268, 171616, 147515
11	* Matthew Hall - bug 221704, 234686	11	* Matthew Hall - bugs 221704, 234686, 194734
12	* Thomas Kratz - bug 213787	12	* Thomas Kratz - bug 213787
13	*******************************************************************************/	13	*******************************************************************************/
14	package org.eclipse.core.databinding.beans;	14	package org.eclipse.core.databinding.beans;
15		15
16	import java.beans.BeanInfo;
17	import java.beans.IntrospectionException;
18	import java.beans.Introspector;
19	import java.beans.PropertyDescriptor;	16	import java.beans.PropertyDescriptor;
20		17
21	import org.eclipse.core.databinding.BindingException;
22	import org.eclipse.core.databinding.observable.IObservable;	18	import org.eclipse.core.databinding.observable.IObservable;
23	import org.eclipse.core.databinding.observable.Realm;	19	import org.eclipse.core.databinding.observable.Realm;
24	import org.eclipse.core.databinding.observable.list.IObservableList;	20	import org.eclipse.core.databinding.observable.list.IObservableList;
Lines 27-41 Link Here
27	import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;	23	import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
28	import org.eclipse.core.databinding.observable.set.IObservableSet;	24	import org.eclipse.core.databinding.observable.set.IObservableSet;
29	import org.eclipse.core.databinding.observable.value.IObservableValue;	25	import org.eclipse.core.databinding.observable.value.IObservableValue;
		26	import org.eclipse.core.databinding.property.IListProperty;
		27	import org.eclipse.core.databinding.property.IMapProperty;
		28	import org.eclipse.core.databinding.property.ISetProperty;
		29	import org.eclipse.core.databinding.property.IValueProperty;
		30	import org.eclipse.core.databinding.property.PropertyObservables;
30	import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;	31	import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
31	import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;	32	import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;
32	import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;	33	import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
33	import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;	34	import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
34	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;	35	import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
35	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
36	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
37	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
38	import org.eclipse.core.internal.databinding.beans.JavaBeanPropertyObservableMap;
39	import org.eclipse.core.runtime.Assert;	36	import org.eclipse.core.runtime.Assert;
40		37
41	/**	38	/**
Lines 83-91 Link Here
83	*/	80	*/
84	public static IObservableValue observeValue(Realm realm, Object bean,	81	public static IObservableValue observeValue(Realm realm, Object bean,
85	String propertyName) {	82	String propertyName) {
86	PropertyDescriptor descriptor = getPropertyDescriptor(bean.getClass(),	83	IValueProperty property = BeanProperties.valueProperty(bean.getClass(),
87	propertyName);	84	propertyName);
88	return new JavaBeanObservableValue(realm, bean, descriptor);	85	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		86	.getPropertyDescriptor();
		87	return new BeanObservableValueDecorator(PropertyObservables
		88	.observeValue(realm, bean, property), propertyDescriptor);
89	}	89	}
90		90
91	/**	91	/**
Lines 103-111 Link Here
103	*/	103	*/
104	public static IObservableMap observeMap(IObservableSet domain,	104	public static IObservableMap observeMap(IObservableSet domain,
105	Class beanClass, String propertyName) {	105	Class beanClass, String propertyName) {
106	PropertyDescriptor descriptor = getPropertyDescriptor(beanClass,	106	IValueProperty property = BeanProperties.valueProperty(beanClass,
107	propertyName);	107	propertyName);
108	return new JavaBeanObservableMap(domain, descriptor);	108	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		109	.getPropertyDescriptor();
		110	return new BeanObservableMapDecorator(PropertyObservables.observeMap(
		111	domain, property), propertyDescriptor);
109	}	112	}
110		113
111	/**	114	/**
Lines 124-132 Link Here
124	*/	127	*/
125	public static IObservableMap observeMap(Realm realm, Object bean,	128	public static IObservableMap observeMap(Realm realm, Object bean,
126	String propertyName) {	129	String propertyName) {
127	PropertyDescriptor descriptor = getPropertyDescriptor(bean.getClass(),	130	IMapProperty property = BeanProperties.mapProperty(bean.getClass(),
128	propertyName);	131	propertyName);
129	return new JavaBeanPropertyObservableMap(realm, bean, descriptor);	132	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		133	.getPropertyDescriptor();
		134	return new BeanObservableMapDecorator(PropertyObservables.observeMap(
		135	realm, bean, property), propertyDescriptor);
130	}	136	}
131		137
132	/**	138	/**
Lines 145-171 Link Here
145	return observeMap(Realm.getDefault(), bean, propertyName);	151	return observeMap(Realm.getDefault(), bean, propertyName);
146	}	152	}
147		153
148	/package/ static PropertyDescriptor getPropertyDescriptor(Class beanClass,
149	String propertyName) {
150	BeanInfo beanInfo;
151	try {
152	beanInfo = Introspector.getBeanInfo(beanClass);
153	} catch (IntrospectionException e) {
154	// cannot introspect, give up
155	return null;
156	}
157	PropertyDescriptor[] propertyDescriptors = beanInfo
158	.getPropertyDescriptors();
159	for (int i = 0; i < propertyDescriptors.length; i++) {
160	PropertyDescriptor descriptor = propertyDescriptors[i];
161	if (descriptor.getName().equals(propertyName)) {
162	return descriptor;
163	}
164	}
165	throw new BindingException(
166	"Could not find property with name " + propertyName + " in class " + beanClass); //$NON-NLS-1$ //$NON-NLS-2$
167	}
168
169	/**	154	/**
170	* Returns an array of observable maps in the default realm tracking the	155	* Returns an array of observable maps in the default realm tracking the
171	* current values of the named propertys for the beans in the given set.	156	* current values of the named propertys for the beans in the given set.
Lines 251-262 Link Here
251	*/	236	*/
252	public static IObservableList observeList(Realm realm, Object bean,	237	public static IObservableList observeList(Realm realm, Object bean,
253	String propertyName, Class elementType) {	238	String propertyName, Class elementType) {
254	PropertyDescriptor propertyDescriptor = getPropertyDescriptor(bean	239	IListProperty property = BeanProperties.listProperty(bean.getClass(),
255	.getClass(), propertyName);	240	propertyName, elementType);
256	elementType = getCollectionElementType(elementType, propertyDescriptor);	241	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		242	.getPropertyDescriptor();
257		243
258	return new JavaBeanObservableList(realm, bean, propertyDescriptor,	244	return new BeanObservableListDecorator(PropertyObservables.observeList(
259	elementType);	245	realm, bean, property), propertyDescriptor);
260	}	246	}
261		247
262	/**	248	/**
Lines 439-449 Link Here
439		425
440	IObservableValue value = MasterDetailObservables.detailValue(master,	426	IObservableValue value = MasterDetailObservables.detailValue(master,
441	valueFactory(realm, propertyName), propertyType);	427	valueFactory(realm, propertyName), propertyType);
442	BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(	428	return new BeanObservableValueDecorator(value, BeanPropertyHelper
443	value, master, getValueTypePropertyDescriptor(master,	429	.getValueTypePropertyDescriptor(master, propertyName));
444	propertyName));
445
446	return decorator;
447	}	430	}
448		431
449	/**	432	/**
Lines 492-506 Link Here
492	* @since 1.1	475	* @since 1.1
493	*/	476	*/
494	public static IObservableValue observeDetailValue(Realm realm,	477	public static IObservableValue observeDetailValue(Realm realm,
495	IObservableValue master, Class masterType, String propertyName, Class propertyType) {	478	IObservableValue master, Class masterType, String propertyName,
		479	Class propertyType) {
496	Assert.isNotNull(masterType, "masterType cannot be null"); //$NON-NLS-1$	480	Assert.isNotNull(masterType, "masterType cannot be null"); //$NON-NLS-1$
497	IObservableValue value = MasterDetailObservables.detailValue(master,	481	IObservableValue value = MasterDetailObservables.detailValue(master,
498	valueFactory(realm, propertyName), propertyType);	482	valueFactory(realm, propertyName), propertyType);
499	BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(	483	return new BeanObservableValueDecorator(value, BeanPropertyHelper
500	value, master, getPropertyDescriptor(masterType,	484	.getPropertyDescriptor(masterType, propertyName));
501	propertyName));
502
503	return decorator;
504	}	485	}
505		486
506	/**	487	/**
Lines 551-561 Link Here
551	IObservableList observableList = MasterDetailObservables.detailList(	532	IObservableList observableList = MasterDetailObservables.detailList(
552	master, listFactory(realm, propertyName, propertyType),	533	master, listFactory(realm, propertyName, propertyType),
553	propertyType);	534	propertyType);
554	BeanObservableListDecorator decorator = new BeanObservableListDecorator(	535	return new BeanObservableListDecorator(observableList,
555	observableList, master, getValueTypePropertyDescriptor(master,	536	BeanPropertyHelper.getValueTypePropertyDescriptor(master,
556	propertyName));	537	propertyName));
557
558	return decorator;
559	}	538	}
560		539
561	/**	540	/**
Lines 599-609 Link Here
599	IObservableSet observableSet = MasterDetailObservables.detailSet(	578	IObservableSet observableSet = MasterDetailObservables.detailSet(
600	master, setFactory(realm, propertyName, propertyType),	579	master, setFactory(realm, propertyName, propertyType),
601	propertyType);	580	propertyType);
602	BeanObservableSetDecorator decorator = new BeanObservableSetDecorator(	581	return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
603	observableSet, master, getValueTypePropertyDescriptor(master,	582	.getValueTypePropertyDescriptor(master, propertyName));
604	propertyName));
605
606	return decorator;
607	}	583	}
608		584
609	/**	585	/**
Lines 642-651 Link Here
642	IObservableValue master, String propertyName) {	618	IObservableValue master, String propertyName) {
643	IObservableMap observableMap = MasterDetailObservables.detailMap(	619	IObservableMap observableMap = MasterDetailObservables.detailMap(
644	master, mapPropertyFactory(realm, propertyName));	620	master, mapPropertyFactory(realm, propertyName));
645	BeanObservableMapDecorator decorator = new BeanObservableMapDecorator(	621	return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
646	observableMap, master, getValueTypePropertyDescriptor(master,	622	.getValueTypePropertyDescriptor(master, propertyName));
647	propertyName));
648	return decorator;
649	}	623	}
650		624
651	/**	625	/**
Lines 688-699 Link Here
688	*/	662	*/
689	public static IObservableSet observeSet(Realm realm, Object bean,	663	public static IObservableSet observeSet(Realm realm, Object bean,
690	String propertyName, Class elementType) {	664	String propertyName, Class elementType) {
691	PropertyDescriptor propertyDescriptor = getPropertyDescriptor(bean	665	ISetProperty property = BeanProperties.setProperty(bean.getClass(),
692	.getClass(), propertyName);	666	propertyName, elementType);
693	elementType = getCollectionElementType(elementType, propertyDescriptor);	667	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		668	.getPropertyDescriptor();
694		669
695	return new JavaBeanObservableSet(realm, bean, propertyDescriptor,	670	return new BeanObservableSetDecorator(PropertyObservables.observeSet(
696	elementType);	671	realm, bean, property), propertyDescriptor);
697	}	672	}
698		673
699	/**	674	/**
Lines 828-859 Link Here
828	public static IObservableFactory mapPropertyFactory(String propertyName) {	803	public static IObservableFactory mapPropertyFactory(String propertyName) {
829	return mapPropertyFactory(Realm.getDefault(), propertyName);	804	return mapPropertyFactory(Realm.getDefault(), propertyName);
830	}	805	}
831
832	/**
833	* @param elementType
834	* can be <code>null</code>
835	* @param propertyDescriptor
836	* @return type of the items in a collection/array property
837	*/
838	/package/ static Class getCollectionElementType(Class elementType,
839	PropertyDescriptor propertyDescriptor) {
840	if (elementType == null) {
841	Class propertyType = propertyDescriptor.getPropertyType();
842	elementType = propertyType.isArray() ? propertyType
843	.getComponentType() : Object.class;
844	}
845
846	return elementType;
847	}
848
849	/**
850	* @param observable
851	* @param propertyName
852	* @return property descriptor or <code>null</code>
853	*/
854	/* package*/ static PropertyDescriptor getValueTypePropertyDescriptor(
855	IObservableValue observable, String propertyName) {
856	return (observable.getValueType() != null) ? getPropertyDescriptor(
857	(Class) observable.getValueType(), propertyName) : null;
858	}
859	}	806	}

Lines 14-19 Link Here

(-)META-INF/MANIFEST.MF (+4 lines)
14	org.eclipse.core.databinding.observable.masterdetail,	14	org.eclipse.core.databinding.observable.masterdetail,
15	org.eclipse.core.databinding.observable.set;x-internal:=false,	15	org.eclipse.core.databinding.observable.set;x-internal:=false,
16	org.eclipse.core.databinding.observable.value;x-internal:=false,	16	org.eclipse.core.databinding.observable.value;x-internal:=false,
		17	org.eclipse.core.databinding.property,
		18	org.eclipse.core.databinding.property.masterdetail,
17	org.eclipse.core.databinding.util,	19	org.eclipse.core.databinding.util,
18	org.eclipse.core.databinding.validation;x-internal:=false,	20	org.eclipse.core.databinding.validation;x-internal:=false,
19	org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",	21	org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",
Lines 21-26 Link Here
21	org.eclipse.core.internal.databinding.observable;x-internal:=true,	23	org.eclipse.core.internal.databinding.observable;x-internal:=true,
22	org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:="org.eclipse.jface.tests.databinding",	24	org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:="org.eclipse.jface.tests.databinding",
23	org.eclipse.core.internal.databinding.observable.tree;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",	25	org.eclipse.core.internal.databinding.observable.tree;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
		26	org.eclipse.core.internal.databinding.property;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
		27	org.eclipse.core.internal.databinding.property.masterdetail;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
24	org.eclipse.core.internal.databinding.validation;x-friends:="org.eclipse.jface.tests.databinding"	28	org.eclipse.core.internal.databinding.validation;x-friends:="org.eclipse.jface.tests.databinding"
25	Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"	29	Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"
26	Import-Package-Comment: see http://wiki.eclipse.org/	30	Import-Package-Comment: see http://wiki.eclipse.org/

Added Link Here

(-)src/org/eclipse/core/databinding/property/IListProperty.java (+105 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 194734)
10	******************************************************************************/
11
12	package org.eclipse.core.databinding.property;
13
14	import java.util.Collection;
15	import java.util.List;
16
17	/**
18	* @since 1.2
19	*
20	*/
21	public interface IListProperty extends ICollectionProperty {
22	/**
23	* @param source
24	* @return a List with the current contents of the source's list property
25	*/
26	List getList(Object source);
27
28	/**
29	* @param source
30	* @param index
31	* @param c
32	* @return whether the source's list property was changed
33	*/
34	boolean addAll(Object source, int index, Collection c);
35
36	/**
37	* @param source
38	* @param index
39	* @return the element at the given location in the source's list property
40	*/
41	Object get(Object source, int index);
42
43	/**
44	* @param source
45	* @param index
46	* @param element
47	* @return the element previous at the given location in the source's list
48	* property
49	*/
50	Object set(Object source, int index, Object element);
51
52	/**
53	* @param source
54	* @param oldIndex
55	* @param newIndex
56	* @return the element that was moved
57	*/
58	Object move(Object source, int oldIndex, int newIndex);
59
60	/**
61	* @param source
62	* @param index
63	* @param element
64	*/
65	void add(Object source, int index, Object element);
66
67	/**
68	* @param source
69	* @param index
70	* @return the element that was removed from the source's list property
71	*/
72	Object remove(Object source, int index);
73
74	/**
75	* @param source
76	* @param o
77	* @return the index of the first location of the given element in the
78	* source's list property, or -1 if the list does not contain the
79	* element
80	*/
81	int indexOf(Object source, Object o);
82
83	/**
84	* @param source
85	* @param o
86	* @return the index of the last location of the given element in the
87	* source's list property, or -1 if the list does not contain the
88	* element
89	*/
90	int lastIndexOf(Object source, Object o);
91
92	/**
93	* @param source
94	* @param listener
95	*/
96	public void addListChangeListener(Object source,
97	IListPropertyChangeListener listener);
98
99	/**
100	* @param source
101	* @param listener
102	*/
103	public void removeListChangeListener(Object source,
104	IListPropertyChangeListener listener);
105	}