Attachment 114858 Details for Bug 194734 – Experimenting with stateless property API

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

[patch] Experimenting with stateless property API

clipboard.txt (text/plain), 336.13 KB, created by Matthew Hall

on 2008-10-10 20:48:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Hall

Created: 2008-10-10 20:48:40 EDT

Size: 336.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface.tests.databinding
>Index: src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 JavaBeanObservableMapTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java	21 Jul 2008 20:59:39 -0000	1.4
>+++ src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableMapTest.java	11 Oct 2008 00:47:57 -0000
>@@ -7,7 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>- *     Matthew Hall - bugs 213145, 241585
>+ *     Matthew Hall - bugs 213145, 241585, 194734
>  *******************************************************************************/
> 
> package org.eclipse.core.tests.internal.databinding.beans;
>@@ -19,12 +19,17 @@
> 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;
>@@ -42,7 +47,8 @@
> 
> 	private PropertyDescriptor propertyDescriptor;
> 
>-	private JavaBeanObservableMap map;
>+	private IObservableMap map;
>+	private IBeanObservable beanObservable;
> 
> 	protected void setUp() throws Exception {
> 		ThreadRealm realm = new ThreadRealm();
>@@ -54,8 +60,11 @@
> 		set.add(model1);
> 		set.add(model2);
> 
>-		propertyDescriptor = new PropertyDescriptor("value", Bean.class);
>-		map = new JavaBeanObservableMap(set, propertyDescriptor);
>+		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 {
>@@ -135,11 +144,11 @@
> 	}
> 	
> 	public void testGetObserved() throws Exception {
>-		assertEquals(set, map.getObserved());
>+		assertEquals(set, beanObservable.getObserved());
> 	}
> 	
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertEquals(propertyDescriptor, map.getPropertyDescriptor());
>+		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
> 	}
> 	
> 	public void testConstructor_SkipRegisterListeners() throws Exception {
>@@ -148,7 +157,9 @@
> 		Bean bean = new Bean();
> 		set.add(bean);
> 		
>-		JavaBeanObservableMap observable = new JavaBeanObservableMap(set, new PropertyDescriptor("value", Bean.class), false);
>+		IObservableMap observable = PojoObservables.observeMap(set, Bean.class,
>+				"value");
>+		assertFalse(bean.hasListeners("value"));
> 		ChangeEventTracker.observe(observable);
> 
> 		assertFalse(bean.hasListeners("value"));
>@@ -160,7 +171,9 @@
> 		Bean bean = new Bean();
> 		set.add(bean);
> 		
>-		JavaBeanObservableMap observable = new JavaBeanObservableMap(set, new PropertyDescriptor("value", Bean.class));
>+		IObservableMap observable = BeansObservables.observeMap(set,
>+				Bean.class, "value");
>+		assertFalse(bean.hasListeners("value"));
> 		ChangeEventTracker.observe(observable);
> 
> 		assertTrue(bean.hasListeners("value"));
>Index: src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaBeanObservableValueTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java	20 Mar 2008 21:16:40 -0000	1.2
>+++ src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableValueTest.java	11 Oct 2008 00:47:57 -0000
>@@ -9,25 +9,27 @@
>  *     Brad Reynolds - initial API and implementation
>  *     Brad Reynolds - bug 171616
>  *     Katarzyna Marszalek - test case for bug 198519
>- *     Matthew Hall - bug 213145
>+ *     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;
>@@ -39,35 +41,34 @@
>  */
> public class JavaBeanObservableValueTest extends AbstractDefaultRealmTestCase {
> 	private Bean bean;
>-	private JavaBeanObservableValue observableValue;
>+	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 = new PropertyDescriptor(propertyName, Bean.class);
>-		observableValue = new JavaBeanObservableValue(Realm.getDefault(), bean, propertyDescriptor);
>+		propertyDescriptor = ((IBeanProperty) BeanProperties.valueProperty(
>+				Bean.class, propertyName)).getPropertyDescriptor();
>+		observableValue = BeansObservables.observeValue(bean, propertyName);
>+		beanObservable = (IBeanObservable) observableValue;
> 	}
> 
> 	public void testGetObserved() throws Exception {
>-		assertEquals(bean, observableValue.getObserved());
>+		assertEquals(bean, beanObservable.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-    	assertEquals(propertyDescriptor, observableValue.getPropertyDescriptor());
>+    	assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
> 	}
> 
> 	public void testSetValueThrowsExceptionThrownByBean() throws Exception {
> 		ThrowsSetException temp = new ThrowsSetException();
>-		JavaBeanObservableValue observable = new JavaBeanObservableValue(Realm
>-				.getDefault(), temp,
>-				new PropertyDescriptor("value", ThrowsSetException.class));
>+		IObservableValue observable = BeansObservables.observeValue(temp,
>+				"value");
> 
> 		try {
> 			observable.setValue("");
>@@ -79,9 +80,8 @@
> 	
> 	public void testGetValueThrowsExceptionThrownByBean() throws Exception {
> 		ThrowsGetException temp = new ThrowsGetException();
>-		JavaBeanObservableValue observable = new JavaBeanObservableValue(Realm
>-				.getDefault(), temp,
>-				new PropertyDescriptor("value", ThrowsGetException.class));
>+		IObservableValue observable = BeansObservables.observeValue(temp,
>+				"value");
> 
> 		try {
> 			observable.getValue();
>@@ -108,14 +108,16 @@
> 	}
> 
> 	public void testConstructor_RegistersListeners() throws Exception {
>-		JavaBeanObservableValue observable = new JavaBeanObservableValue(Realm.getDefault(), bean, propertyDescriptor);
>+		IObservableValue observable = BeansObservables.observeValue(bean,
>+				propertyName);
> 		ChangeEventTracker.observe(observable);
> 		
> 		assertTrue(bean.hasListeners(propertyName));
> 	}
> 	
> 	public void testConstructor_SkipRegisterListeners() throws Exception {
>-		JavaBeanObservableValue observable = new JavaBeanObservableValue(Realm.getDefault(), bean, propertyDescriptor, false);
>+		IObservableValue observable = PojoObservables.observeValue(bean,
>+				propertyName);
> 		ChangeEventTracker.observe(observable);
> 		
> 		assertFalse(bean.hasListeners(propertyName));
>@@ -138,13 +140,7 @@
> 		}
> 		
> 		public IObservableValue createObservableValue(Realm realm) {
>-			try {
>-				PropertyDescriptor propertyDescriptor = new PropertyDescriptor("value", Bean.class);
>-				return new JavaBeanObservableValue(realm, bean,
>-						propertyDescriptor);					
>-			} catch (IntrospectionException e) {
>-				throw new RuntimeException(e);
>-			}
>+			return BeansObservables.observeValue(realm, bean, "value");
> 		}
> 		
> 		public void change(IObservable observable) {
>Index: src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedListTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedListTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaBeanObservableArrayBasedListTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedListTest.java	20 Mar 2008 21:16:40 -0000	1.2
>+++ src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedListTest.java	11 Oct 2008 00:47:57 -0000
>@@ -7,12 +7,11 @@
>  *
>  * Contributors:
>  *     Brad Reynolds - initial API and implementation
>- *     Matthew Hall - bugs 221351, 213145
>+ *     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;
>@@ -23,13 +22,16 @@
> 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;
>@@ -42,7 +44,8 @@
>  */
> public class JavaBeanObservableArrayBasedListTest extends
> 		AbstractDefaultRealmTestCase {
>-	private JavaBeanObservableList list;
>+	private IObservableList list;
>+	private IBeanObservable beanObservable;
> 
> 	private PropertyDescriptor propertyDescriptor;
> 
>@@ -59,19 +62,21 @@
> 		super.setUp();
> 
> 		propertyName = "array";
>-		propertyDescriptor = new PropertyDescriptor(propertyName, Bean.class);
>+		propertyDescriptor = ((IBeanProperty) BeanProperties.listProperty(
>+				Bean.class, propertyName)).getPropertyDescriptor();
> 		bean = new Bean(new Object[0]);
> 
>-		list = new JavaBeanObservableList(SWTObservables.getRealm(Display
>-				.getDefault()), bean, propertyDescriptor, Bean.class);
>+		list = BeansObservables.observeList(SWTObservables.getRealm(Display
>+				.getDefault()), bean, propertyName);
>+		beanObservable = (IBeanObservable) list;
> 	}
> 
> 	public void testGetObserved() throws Exception {
>-		assertSame(bean, list.getObserved());
>+		assertSame(bean, beanObservable.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertSame(propertyDescriptor, list.getPropertyDescriptor());
>+		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
> 	}
> 
> 	public void testRegistersListenerAfterFirstListenerIsAdded()
>@@ -308,16 +313,14 @@
> 	}
> 
> 	public void testRemoveAll() throws Exception {
>-		List elements = Arrays.asList(new String[] { "1", "2" });
>-		list.addAll(elements);
>-		list.addAll(elements);
>-
>+		list.addAll(Arrays.asList(new String[] { "1", "2", "3", "4" }));
> 		assertEquals(4, bean.getArray().length);
>-		list.removeAll(elements);
>+
>+		list.removeAll(Arrays.asList(new String[] { "2", "4" }));
> 
> 		assertEquals(2, bean.getArray().length);
>-		assertEquals(elements.get(0), bean.getArray()[0]);
>-		assertEquals(elements.get(1), bean.getArray()[1]);
>+		assertEquals("1", bean.getArray()[0]);
>+		assertEquals("3", bean.getArray()[1]);
> 	}
> 
> 	public void testRemoveAllListChangeEvent() throws Exception {
>@@ -471,8 +474,10 @@
> 		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()));
>+		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));
> 	}
> 
>@@ -482,11 +487,6 @@
> 
> 		PropertyChangeEvent evt;
> 
>-		/*
>-		 * (non-Javadoc)
>-		 * 
>-		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
>-		 */
> 		public void propertyChange(PropertyChangeEvent evt) {
> 			count++;
> 			this.evt = evt;
>@@ -504,17 +504,10 @@
> 		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 = new JavaBeanObservableList(realm, bean,
>-					propertyDescriptor, String.class);
>+			IObservableList list = BeansObservables.observeList(realm, bean,
>+					propertyName, String.class);
> 			for (int i = 0; i < elementCount; i++)
> 				list.add(createElement(list));
> 			return list;
>Index: src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableSetTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableSetTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaBeanObservableSetTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableSetTest.java	20 Mar 2008 21:16:40 -0000	1.2
>+++ src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableSetTest.java	11 Oct 2008 00:47:57 -0000
>@@ -7,12 +7,11 @@
>  *
>  * Contributors:
>  *     Brad Reynolds - initial API and implementation
>- *     Matthew Hall - bugs 221351, 213145
>+ *     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;
>@@ -21,13 +20,17 @@
> 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;
>@@ -39,34 +42,32 @@
>  * @since 3.3
>  */
> public class JavaBeanObservableSetTest extends TestCase {
>-	private JavaBeanObservableSet observableSet;
>+	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 = new PropertyDescriptor(propertyName, Bean.class);
>+		propertyDescriptor = ((IBeanProperty) BeanProperties.setProperty(
>+				Bean.class, propertyName)).getPropertyDescriptor();
> 
>-		observableSet = new JavaBeanObservableSet(SWTObservables
>-				.getRealm(Display.getDefault()), bean, propertyDescriptor,
>-				Bean.class);
>+		observableSet = BeansObservables
>+				.observeSet(SWTObservables.getRealm(Display.getDefault()),
>+						bean, propertyName, Bean.class);
>+		beanObservable = (IBeanObservable) observableSet;
> 		listener = new SetChangeListener();
> 	}
> 
> 	public void testGetObserved() throws Exception {
>-		assertEquals(bean, observableSet.getObserved());
>+		assertEquals(bean, beanObservable.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertEquals(propertyDescriptor, observableSet.getPropertyDescriptor());
>+		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
> 	}
> 	
> 	public void testGetElementType() throws Exception {
>@@ -97,8 +98,8 @@
> 	public void testConstructor_RegisterListeners() throws Exception {
> 		bean = new Bean();
> 
>-		observableSet = new JavaBeanObservableSet(new CurrentRealm(true), bean,
>-				propertyDescriptor, Bean.class);
>+		observableSet = BeansObservables.observeSet(new CurrentRealm(true),
>+				bean, propertyName);
> 		assertFalse(bean.hasListeners(propertyName));
> 		ChangeEventTracker.observe(observableSet);
> 		assertTrue(bean.hasListeners(propertyName));
>@@ -107,8 +108,8 @@
> 	public void testConstructor_SkipsRegisterListeners() throws Exception {
> 		bean = new Bean();
> 
>-		observableSet = new JavaBeanObservableSet(new CurrentRealm(true), bean,
>-				propertyDescriptor, Bean.class, false);
>+		observableSet = PojoObservables.observeSet(new CurrentRealm(true),
>+				bean, propertyName);
> 		assertFalse(bean.hasListeners(propertyName));
> 		ChangeEventTracker.observe(observableSet);
> 		assertFalse(bean.hasListeners(propertyName));
>@@ -134,16 +135,9 @@
> 				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 = new JavaBeanObservableSet(realm,
>-					bean, propertyDescriptor, String.class);
>+			IObservableSet set = BeansObservables.observeSet(realm, bean,
>+					propertyName, String.class);
> 			for (int i = 0; i < elementCount; i++)
> 				set.add(createElement(set));
> 			return set;
>Index: src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableValueDecoratorTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableValueDecoratorTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 BeanObservableValueDecoratorTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableValueDecoratorTest.java	8 Sep 2008 20:23:20 -0000	1.3
>+++ src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableValueDecoratorTest.java	11 Oct 2008 00:47:57 -0000
>@@ -14,8 +14,9 @@
> 
> import java.beans.PropertyDescriptor;
> 
>+import org.eclipse.core.databinding.beans.BeansObservables;
>+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;
>@@ -23,40 +24,33 @@
> /**
>  * @since 3.3
>  */
>-public class BeanObservableValueDecoratorTest extends AbstractDefaultRealmTestCase {
>+public class BeanObservableValueDecoratorTest extends
>+		AbstractDefaultRealmTestCase {
> 	private Bean bean;
>-	private JavaBeanObservableValue observableValue;
>+	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();
>-		propertyDescriptor = new PropertyDescriptor("value",
>-				Bean.class);
>-		observableValue = new JavaBeanObservableValue(
>-				SWTObservables.getRealm(Display.getDefault()), bean,
>+		propertyDescriptor = new PropertyDescriptor("value", Bean.class);
>+		observableValue = BeansObservables.observeValue(SWTObservables
>+				.getRealm(Display.getDefault()), bean, "value");
>+		decorator = new BeanObservableValueDecorator(observableValue,
> 				propertyDescriptor);
>-		decorator = new BeanObservableValueDecorator(
>-				observableValue, observableValue
>-						.getPropertyDescriptor());
> 	}
> 
> 	public void testGetDelegate() throws Exception {
>-		assertEquals(observableValue, decorator.getDecorated());
>+		assertSame(observableValue, decorator.getDecorated());
> 	}
>-	
>+
> 	public void testGetObserved() throws Exception {
>-		assertEquals(bean, decorator.getObserved());
>+		assertSame(bean, decorator.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertEquals(propertyDescriptor, decorator.getPropertyDescriptor());
>+		assertSame(propertyDescriptor, decorator.getPropertyDescriptor());
> 	}
> }
>Index: src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedSetTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedSetTest.java,v
>retrieving revision 1.2
>diff -u -r1.2 JavaBeanObservableArrayBasedSetTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedSetTest.java	20 Mar 2008 21:16:40 -0000	1.2
>+++ src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedSetTest.java	11 Oct 2008 00:47:57 -0000
>@@ -8,12 +8,11 @@
>  * Contributors:
>  *     Matthew Hall - initial API and implementation (bug 221351)
>  *     Brad Reynolds - through JavaBeanObservableArrayBasedListTest.java
>- *     Matthew Hall - bug 213145
>+ *     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;
>@@ -25,12 +24,15 @@
> 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;
>@@ -43,7 +45,8 @@
>  */
> public class JavaBeanObservableArrayBasedSetTest extends
> 		AbstractDefaultRealmTestCase {
>-	private JavaBeanObservableSet set;
>+	private IObservableSet set;
>+	private IBeanObservable beanObservable;
> 
> 	private PropertyDescriptor propertyDescriptor;
> 
>@@ -55,19 +58,21 @@
> 		super.setUp();
> 
> 		propertyName = "array";
>-		propertyDescriptor = new PropertyDescriptor(propertyName, Bean.class);
>+		propertyDescriptor = ((IBeanProperty) BeanProperties.setProperty(
>+				Bean.class, propertyName)).getPropertyDescriptor();
> 		bean = new Bean(new HashSet());
> 
>-		set = new JavaBeanObservableSet(SWTObservables.getRealm(Display
>-				.getDefault()), bean, propertyDescriptor, String.class);
>+		set = BeansObservables.observeSet(SWTObservables.getRealm(Display
>+				.getDefault()), bean, propertyName);
>+		beanObservable = (IBeanObservable) set;
> 	}
> 
> 	public void testGetObserved() throws Exception {
>-		assertEquals(bean, set.getObserved());
>+		assertEquals(bean, beanObservable.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertEquals(propertyDescriptor, set.getPropertyDescriptor());
>+		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
> 	}
> 
> 	public void testRegistersListenerAfterFirstListenerIsAdded()
>@@ -292,7 +297,8 @@
> 		assertEquals("array", event.getPropertyName());
> 		assertTrue("old value", Arrays.equals(old, (Object[]) event
> 				.getOldValue()));
>-		assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event.getNewValue()));
>+		assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event
>+				.getNewValue()));
> 		assertFalse("lists are equal", Arrays.equals(bean.getArray(), old));
> 	}
> 
>@@ -302,11 +308,6 @@
> 
> 		PropertyChangeEvent evt;
> 
>-		/*
>-		 * (non-Javadoc)
>-		 * 
>-		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
>-		 */
> 		public void propertyChange(PropertyChangeEvent evt) {
> 			count++;
> 			this.evt = evt;
>@@ -324,17 +325,10 @@
> 		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 = new JavaBeanObservableSet(realm, bean,
>-					propertyDescriptor, String.class);
>+			IObservableSet list = BeansObservables.observeSet(realm, bean,
>+					propertyName, String.class);
> 			for (int i = 0; i < elementCount; i++)
> 				list.add(createElement(list));
> 			return list;
>Index: src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableSetDecoratorTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableSetDecoratorTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 BeanObservableSetDecoratorTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableSetDecoratorTest.java	8 Sep 2008 20:23:20 -0000	1.3
>+++ src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableSetDecoratorTest.java	11 Oct 2008 00:47:57 -0000
>@@ -16,8 +16,9 @@
> 
> import junit.framework.TestCase;
> 
>+import org.eclipse.core.databinding.beans.BeansObservables;
>+import org.eclipse.core.databinding.observable.set.IObservableSet;
> import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
>-import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
> import org.eclipse.jface.databinding.swt.SWTObservables;
> import org.eclipse.swt.widgets.Display;
> 
>@@ -26,37 +27,30 @@
>  */
> public class BeanObservableSetDecoratorTest extends TestCase {
> 	private PropertyDescriptor propertyDescriptor;
>-	private JavaBeanObservableSet observableSet;
>+	private IObservableSet observableSet;
> 	private BeanObservableSetDecorator decorator;
> 	private Bean bean;
> 
>-	/*
>-	 * (non-Javadoc)
>-	 * 
>-	 * @see junit.framework.TestCase#setUp()
>-	 */
> 	protected void setUp() throws Exception {
> 		super.setUp();
> 
> 		bean = new Bean();
>-		propertyDescriptor = new PropertyDescriptor("set",
>-				Bean.class);
>-		observableSet = new JavaBeanObservableSet(
>-				SWTObservables.getRealm(Display.getDefault()), bean,
>-				propertyDescriptor, String.class);
>-		decorator = new BeanObservableSetDecorator(
>-				observableSet, propertyDescriptor);
>+		propertyDescriptor = new PropertyDescriptor("set", Bean.class);
>+		observableSet = BeansObservables.observeSet(SWTObservables
>+				.getRealm(Display.getDefault()), bean, "set");
>+		decorator = new BeanObservableSetDecorator(observableSet,
>+				propertyDescriptor);
> 	}
> 
>-	public void testGetDelegate() throws Exception {
>-		assertEquals(observableSet, decorator.getDecorated());
>+	public void testGetDecorated() throws Exception {
>+		assertSame(observableSet, decorator.getDecorated());
> 	}
> 
> 	public void testGetObserved() throws Exception {
>-		assertEquals(bean, decorator.getObserved());
>+		assertSame(bean, decorator.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertEquals(propertyDescriptor, decorator.getPropertyDescriptor());
>+		assertSame(propertyDescriptor, decorator.getPropertyDescriptor());
> 	}
> }
>Index: src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableListDecoratorTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableListDecoratorTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 BeanObservableListDecoratorTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableListDecoratorTest.java	8 Sep 2008 20:23:20 -0000	1.3
>+++ src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableListDecoratorTest.java	11 Oct 2008 00:47:57 -0000
>@@ -18,13 +18,13 @@
> import junit.framework.TestCase;
> import junit.framework.TestSuite;
> 
>+import org.eclipse.core.databinding.beans.BeansObservables;
> 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.WritableList;
> import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
>-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.swt.SWTObservables;
>@@ -36,36 +36,30 @@
> public class BeanObservableListDecoratorTest extends TestCase {
> 	private Bean bean;
> 	private PropertyDescriptor propertyDescriptor;
>-	private JavaBeanObservableList observableList;
>+	private IObservableList observableList;
> 	private BeanObservableListDecorator decorator;
> 
>-	/*
>-	 * (non-Javadoc)
>-	 * 
>-	 * @see junit.framework.TestCase#setUp()
>-	 */
> 	protected void setUp() throws Exception {
> 		super.setUp();
> 		
> 		bean = new Bean();
> 		propertyDescriptor = new PropertyDescriptor(
> 				"list", Bean.class,"getList","setList");
>-		observableList = new JavaBeanObservableList(
>-				SWTObservables.getRealm(Display.getDefault()), bean,
>-				propertyDescriptor, Bean.class);
>+		observableList = BeansObservables.observeList(
>+				SWTObservables.getRealm(Display.getDefault()), bean, "list");
> 		decorator = new BeanObservableListDecorator(observableList, propertyDescriptor);
> 	}
> 
> 	public void testGetDelegate() throws Exception {
>-		assertEquals(observableList, decorator.getDecorated());
>+		assertSame(observableList, decorator.getDecorated());
> 	}
> 
> 	public void testGetObserved() throws Exception {
>-		assertEquals(bean, decorator.getObserved());
>+		assertSame(bean, decorator.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertEquals(propertyDescriptor, decorator.getPropertyDescriptor());
>+		assertSame(propertyDescriptor, decorator.getPropertyDescriptor());
> 	}
> 
> 	public static Test suite() {
>Index: src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableListTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableListTest.java,v
>retrieving revision 1.3
>diff -u -r1.3 JavaBeanObservableListTest.java
>--- src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableListTest.java	31 Jul 2008 18:37:44 -0000	1.3
>+++ src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableListTest.java	11 Oct 2008 00:47:57 -0000
>@@ -7,12 +7,11 @@
>  *
>  * Contributors:
>  *     Brad Reynolds - initial API and implementation
>- *     Matthew Hall - bugs 221351, 213145
>+ *     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;
>@@ -24,13 +23,17 @@
> 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;
>@@ -43,7 +46,8 @@
>  * @since 1.1
>  */
> public class JavaBeanObservableListTest extends AbstractDefaultRealmTestCase {
>-	private JavaBeanObservableList list;
>+	private IObservableList list;
>+	private IBeanObservable beanObservable;
> 
> 	private PropertyDescriptor propertyDescriptor;
> 
>@@ -60,19 +64,21 @@
> 		super.setUp();
> 
> 		propertyName = "list";
>-		propertyDescriptor = new PropertyDescriptor(propertyName, Bean.class);
>+		propertyDescriptor = ((IBeanProperty) BeanProperties.listProperty(
>+				Bean.class, propertyName)).getPropertyDescriptor();
> 		bean = new Bean(new ArrayList());
> 
>-		list = new JavaBeanObservableList(SWTObservables.getRealm(Display
>-				.getDefault()), bean, propertyDescriptor, String.class);
>+		list = BeansObservables.observeList(SWTObservables.getRealm(Display
>+				.getDefault()), bean, propertyName);
>+		beanObservable = (IBeanObservable) list;
> 	}
> 
> 	public void testGetObserved() throws Exception {
>-		assertEquals(bean, list.getObserved());
>+		assertEquals(bean, beanObservable.getObserved());
> 	}
> 
> 	public void testGetPropertyDescriptor() throws Exception {
>-		assertEquals(propertyDescriptor, list.getPropertyDescriptor());
>+		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
> 	}
> 
> 	public void testRegistersListenerAfterFirstListenerIsAdded()
>@@ -322,16 +328,14 @@
> 	}
> 
> 	public void testRemoveAll() throws Exception {
>-		List elements = Arrays.asList(new String[] { "1", "2" });
>-		list.addAll(elements);
>-		list.addAll(elements);
>-
>+		list.addAll(Arrays.asList(new String[] { "1", "2", "3", "4" }));
> 		assertEquals(4, bean.getList().size());
>-		list.removeAll(elements);
>+
>+		list.removeAll(Arrays.asList(new String[] { "2", "4" }));
> 
> 		assertEquals(2, bean.getList().size());
>-		assertEquals(elements.get(0), bean.getList().get(0));
>-		assertEquals(elements.get(1), bean.getList().get(1));
>+		assertEquals("1", bean.getList().get(0));
>+		assertEquals("3", bean.getList().get(1));
> 	}
> 
> 	public void testRemoveAllListChangeEvent() throws Exception {
>@@ -467,9 +471,8 @@
> 
> 	public void testConstructor_RegistersListener() throws Exception {
> 		Bean bean = new Bean();
>-		JavaBeanObservableList observable = new JavaBeanObservableList(Realm
>-				.getDefault(), bean,
>-				new PropertyDescriptor("list", Bean.class), Bean.class);
>+		IObservableList observable = BeansObservables.observeList(Realm
>+				.getDefault(), bean, "list");
> 
> 		assertFalse(bean.hasListeners("list"));
> 		ChangeEventTracker.observe(observable);
>@@ -478,9 +481,8 @@
> 
> 	public void testConstructor_SkipsRegisterListener() throws Exception {
> 		Bean bean = new Bean();
>-		JavaBeanObservableList observable = new JavaBeanObservableList(Realm
>-				.getDefault(), bean,
>-				new PropertyDescriptor("list", Bean.class), Bean.class, false);
>+		IObservableList observable = PojoObservables.observeList(Realm
>+				.getDefault(), bean, "list");
> 
> 		assertFalse(bean.hasListeners("list"));
> 		ChangeEventTracker.observe(observable);
>@@ -517,11 +519,6 @@
> 
> 		PropertyChangeEvent evt;
> 
>-		/*
>-		 * (non-Javadoc)
>-		 * 
>-		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
>-		 */
> 		public void propertyChange(PropertyChangeEvent evt) {
> 			count++;
> 			this.evt = evt;
>@@ -539,17 +536,10 @@
> 		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 = new JavaBeanObservableList(realm, bean,
>-					propertyDescriptor, String.class);
>+			IObservableList list = BeansObservables.observeList(realm, bean,
>+					propertyName, String.class);
> 			for (int i = 0; i < elementCount; i++)
> 				list.add(createElement(list));
> 			return list;
>Index: src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java,v
>retrieving revision 1.4
>diff -u -r1.4 PojoObservablesTest.java
>--- src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java	24 Mar 2008 19:13:50 -0000	1.4
>+++ src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java	11 Oct 2008 00:47:57 -0000
>@@ -7,10 +7,12 @@
>  *
>  * 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;
>@@ -19,10 +21,6 @@
> 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;
>@@ -47,12 +45,12 @@
> 		propertyName = "value";
> 	}
> 
>-	public void testObserveValue_ReturnsJavaBeanObservableValue()
>+	public void testObserveValue_ReturnsIBeanObservable()
> 			throws Exception {
> 		IObservableValue value = PojoObservables.observeValue(pojo, propertyName);
> 
> 		assertNotNull(value);
>-		assertTrue(value instanceof JavaBeanObservableValue);
>+		assertTrue(value instanceof IBeanObservable);
> 	}
> 
> 	public void testObserveValue_DoesNotAttachListeners() throws Exception {
>@@ -62,17 +60,17 @@
> 		assertFalse(pojo.hasListeners(propertyName));
> 	}
> 
>-	public void testObservableValueWithRealm_ReturnsJavaBeanObservable()
>+	public void testObservableValueWithRealm_ReturnsIBeanObservable()
> 			throws Exception {
> 		CurrentRealm realm = new CurrentRealm(true);
> 		IObservableValue value = PojoObservables.observeValue(realm, pojo,
> 				propertyName);
> 
> 		assertNotNull(value);
>-		assertTrue(value instanceof JavaBeanObservableValue);
>+		assertTrue(value instanceof IBeanObservable);
> 	}
> 
>-	public void testObservableMap_ReturnsJavaBeanObservableMap()
>+	public void testObservableMap_ReturnsIBeanObservable()
> 			throws Exception {
> 		IObservableSet set = new WritableSet();
> 		set.add(new Bean());
>@@ -80,7 +78,7 @@
> 		IObservableMap map = PojoObservables.observeMap(set, Bean.class,
> 				propertyName);
> 		assertNotNull(map);
>-		assertTrue(map instanceof JavaBeanObservableMap);
>+		assertTrue(map instanceof IBeanObservable);
> 	}
> 	
> 	public void testObservableMap_DoesNotAttachListeners() throws Exception {
>@@ -101,9 +99,9 @@
> 		assertEquals(2, maps.length);
> 	}
> 	
>-	public void testObserveListWithElementType_ReturnsJavaBeanObservableList() throws Exception {
>+	public void testObserveListWithElementType_ReturnsIBeanObservable() throws Exception {
> 		IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);
>-		assertTrue(list instanceof JavaBeanObservableList);
>+		assertTrue(list instanceof IBeanObservable);
> 	}
> 	
> 	public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {
>@@ -113,9 +111,9 @@
> 		assertFalse(pojo.hasListeners("list"));
> 	}
> 	
>-	public void testObserveList_ReturnsJavaBeanObservableList() throws Exception {
>+	public void testObserveList_ReturnsIBeanObservable() throws Exception {
> 		IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");
>-		assertTrue(observable instanceof JavaBeanObservableList);
>+		assertTrue(observable instanceof IBeanObservable);
> 	}
> 	
> 	public void testObserveList_DoesNotAttachListeners() throws Exception {
>@@ -125,9 +123,9 @@
> 		assertFalse(pojo.hasListeners("list"));
> 	}
> 	
>-	public void testObserveSetWithElementType_ReturnsJavaBeanObservableList() throws Exception {
>+	public void testObserveSetWithElementType_ReturnsIBeanObservable() throws Exception {
> 		IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);
>-		assertTrue(list instanceof JavaBeanObservableSet);
>+		assertTrue(list instanceof IBeanObservable);
> 	}
> 	
> 	public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {
>@@ -137,9 +135,9 @@
> 		assertFalse(pojo.hasListeners("set"));
> 	}
> 	
>-	public void testObserveSet_ReturnsJavaBeanObservableList() throws Exception {
>+	public void testObserveSet_ReturnsIBeanObservable() throws Exception {
> 		IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");
>-		assertTrue(list instanceof JavaBeanObservableSet);
>+		assertTrue(list instanceof IBeanObservable);
> 	}
> 	
> 	public void testObserveSet_DoesNotAttachListeners() throws Exception {
>#P org.eclipse.core.databinding.beans
>Index: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java
>diff -N src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java
>--- src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java	21 Jul 2008 22:09:24 -0000	1.4
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,142 +0,0 @@
>-/*******************************************************************************
>- * 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;
>-	}
>-}
>Index: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableList.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableList.java
>diff -N src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableList.java
>--- src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableList.java	1 Oct 2008 20:18:34 -0000	1.3
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,410 +0,0 @@
>-/*******************************************************************************
>- * 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 synchronized 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;
>-		}
>-	}
>-
>-}
>Index: src/org/eclipse/core/internal/databinding/beans/JavaBeanPropertyObservableMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/JavaBeanPropertyObservableMap.java
>diff -N src/org/eclipse/core/internal/databinding/beans/JavaBeanPropertyObservableMap.java
>--- src/org/eclipse/core/internal/databinding/beans/JavaBeanPropertyObservableMap.java	20 Mar 2008 21:16:42 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,241 +0,0 @@
>-/*******************************************************************************
>- * 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;
>-	}
>-}
>Index: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableSet.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableSet.java
>diff -N src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableSet.java
>--- src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableSet.java	20 Mar 2008 21:16:42 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,306 +0,0 @@
>-/*******************************************************************************
>- * 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;
>-	}
>-}
>Index: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableValue.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableValue.java
>diff -N src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableValue.java
>--- src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableValue.java	24 Mar 2008 19:13:25 -0000	1.2
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,190 +0,0 @@
>-/*******************************************************************************
>- * 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();
>-	}
>-}
>Index: src/org/eclipse/core/databinding/beans/BeansObservables.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java,v
>retrieving revision 1.20
>diff -u -r1.20 BeansObservables.java
>--- src/org/eclipse/core/databinding/beans/BeansObservables.java	8 Sep 2008 20:23:22 -0000	1.20
>+++ src/org/eclipse/core/databinding/beans/BeansObservables.java	11 Oct 2008 00:47:59 -0000
>@@ -8,17 +8,13 @@
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>  *     Brad Reynolds - bugs 164268, 171616, 147515
>- *     Matthew Hall - bug 221704, 234686, 246625
>+ *     Matthew Hall - bug 221704, 234686, 246625, 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;
>@@ -27,15 +23,16 @@
> 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.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.internal.databinding.beans.JavaBeanPropertyObservableMap;
>+import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
> import org.eclipse.core.runtime.Assert;
> 
> /**
>@@ -83,9 +80,12 @@
> 	 */
> 	public static IObservableValue observeValue(Realm realm, Object bean,
> 			String propertyName) {
>-		PropertyDescriptor descriptor = getPropertyDescriptor(bean.getClass(),
>+		IValueProperty property = BeanProperties.valueProperty(bean.getClass(),
> 				propertyName);
>-		return new JavaBeanObservableValue(realm, bean, descriptor);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableValueDecorator(PropertyObservables
>+				.observeValue(realm, bean, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -103,9 +103,12 @@
> 	 */
> 	public static IObservableMap observeMap(IObservableSet domain,
> 			Class beanClass, String propertyName) {
>-		PropertyDescriptor descriptor = getPropertyDescriptor(beanClass,
>+		IValueProperty property = BeanProperties.valueProperty(beanClass,
> 				propertyName);
>-		return new JavaBeanObservableMap(domain, descriptor);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableMapDecorator(PropertyObservables.observeDetailValues(
>+				domain, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -124,9 +127,12 @@
> 	 */
> 	public static IObservableMap observeMap(Realm realm, Object bean,
> 			String propertyName) {
>-		PropertyDescriptor descriptor = getPropertyDescriptor(bean.getClass(),
>+		IMapProperty property = BeanProperties.mapProperty(bean.getClass(),
> 				propertyName);
>-		return new JavaBeanPropertyObservableMap(realm, bean, descriptor);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
>+				bean, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -145,27 +151,6 @@
> 		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.
>@@ -251,12 +236,12 @@
> 	 */
> 	public static IObservableList observeList(Realm realm, Object bean,
> 			String propertyName, Class elementType) {
>-		PropertyDescriptor propertyDescriptor = getPropertyDescriptor(bean
>-				.getClass(), propertyName);
>-		elementType = getCollectionElementType(elementType, propertyDescriptor);
>-
>-		return new JavaBeanObservableList(realm, bean, propertyDescriptor,
>-				elementType);
>+		IListProperty property = BeanProperties.listProperty(bean.getClass(),
>+				propertyName, elementType);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableListDecorator(PropertyObservables.observeList(
>+				realm, bean, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -439,10 +424,8 @@
> 
> 		IObservableValue value = MasterDetailObservables.detailValue(master,
> 				valueFactory(realm, propertyName), propertyType);
>-		BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(
>-				value, getValueTypePropertyDescriptor(master, propertyName));
>-
>-		return decorator;
>+		return new BeanObservableValueDecorator(value, BeanPropertyHelper
>+				.getValueTypePropertyDescriptor(master, propertyName));
> 	}
> 
> 	/**
>@@ -495,10 +478,8 @@
> 		Assert.isNotNull(masterType, "masterType cannot be null"); //$NON-NLS-1$
> 		IObservableValue value = MasterDetailObservables.detailValue(master,
> 				valueFactory(realm, propertyName), propertyType);
>-		BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(
>-				value, getPropertyDescriptor(masterType, propertyName));
>-
>-		return decorator;
>+		return new BeanObservableValueDecorator(value, BeanPropertyHelper
>+				.getPropertyDescriptor(masterType, propertyName));
> 	}
> 
> 	/**
>@@ -549,11 +530,9 @@
> 		IObservableList observableList = MasterDetailObservables.detailList(
> 				master, listFactory(realm, propertyName, propertyType),
> 				propertyType);
>-		BeanObservableListDecorator decorator = new BeanObservableListDecorator(
>-				observableList, getValueTypePropertyDescriptor(master,
>+		return new BeanObservableListDecorator(observableList,
>+				BeanPropertyHelper.getValueTypePropertyDescriptor(master,
> 						propertyName));
>-
>-		return decorator;
> 	}
> 
> 	/**
>@@ -597,11 +576,8 @@
> 		IObservableSet observableSet = MasterDetailObservables.detailSet(
> 				master, setFactory(realm, propertyName, propertyType),
> 				propertyType);
>-		BeanObservableSetDecorator decorator = new BeanObservableSetDecorator(
>-				observableSet, getValueTypePropertyDescriptor(master,
>-						propertyName));
>-
>-		return decorator;
>+		return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
>+				.getValueTypePropertyDescriptor(master, propertyName));
> 	}
> 
> 	/**
>@@ -640,10 +616,8 @@
> 			IObservableValue master, String propertyName) {
> 		IObservableMap observableMap = MasterDetailObservables.detailMap(
> 				master, mapPropertyFactory(realm, propertyName));
>-		BeanObservableMapDecorator decorator = new BeanObservableMapDecorator(
>-				observableMap, getValueTypePropertyDescriptor(master,
>-						propertyName));
>-		return decorator;
>+		return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
>+				.getValueTypePropertyDescriptor(master, propertyName));
> 	}
> 
> 	/**
>@@ -686,12 +660,12 @@
> 	 */
> 	public static IObservableSet observeSet(Realm realm, Object bean,
> 			String propertyName, Class elementType) {
>-		PropertyDescriptor propertyDescriptor = getPropertyDescriptor(bean
>-				.getClass(), propertyName);
>-		elementType = getCollectionElementType(elementType, propertyDescriptor);
>-
>-		return new JavaBeanObservableSet(realm, bean, propertyDescriptor,
>-				elementType);
>+		ISetProperty property = BeanProperties.setProperty(bean.getClass(),
>+				propertyName, elementType);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableSetDecorator(PropertyObservables.observeSet(
>+				realm, bean, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -826,32 +800,4 @@
> 	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;
>-	}
> }
>Index: src/org/eclipse/core/databinding/beans/PojoObservables.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java,v
>retrieving revision 1.7
>diff -u -r1.7 PojoObservables.java
>--- src/org/eclipse/core/databinding/beans/PojoObservables.java	8 Sep 2008 20:23:22 -0000	1.7
>+++ src/org/eclipse/core/databinding/beans/PojoObservables.java	11 Oct 2008 00:47:59 -0000
>@@ -7,7 +7,7 @@
>  *
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>- *     Matthew Hall - bugs 221704, 234686, 246625
>+ *     Matthew Hall - bugs 221704, 234686, 246625, 194734
>  *******************************************************************************/
> 
> package org.eclipse.core.databinding.beans;
>@@ -23,15 +23,16 @@
> 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.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.internal.databinding.beans.JavaBeanPropertyObservableMap;
>+import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
> 
> /**
>  * A factory for creating observable objects for POJOs (plain old java objects)
>@@ -73,10 +74,12 @@
> 	 */
> 	public static IObservableValue observeValue(Realm realm, Object pojo,
> 			String propertyName) {
>-
>-		PropertyDescriptor descriptor = BeansObservables.getPropertyDescriptor(
>-				pojo.getClass(), propertyName);
>-		return new JavaBeanObservableValue(realm, pojo, descriptor, false);
>+		IValueProperty property = PojoProperties.valueProperty(pojo.getClass(),
>+				propertyName);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableValueDecorator(PropertyObservables
>+				.observeValue(realm, pojo, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -94,9 +97,12 @@
> 	 */
> 	public static IObservableMap observeMap(IObservableSet domain,
> 			Class pojoClass, String propertyName) {
>-		PropertyDescriptor descriptor = BeansObservables.getPropertyDescriptor(
>-				pojoClass, propertyName);
>-		return new JavaBeanObservableMap(domain, descriptor, false);
>+		IValueProperty property = PojoProperties.valueProperty(pojoClass,
>+				propertyName);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableMapDecorator(PropertyObservables.observeDetailValues(
>+				domain, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -136,9 +142,12 @@
> 	 */
> 	public static IObservableMap observeMap(Realm realm, Object pojo,
> 			String propertyName) {
>-		PropertyDescriptor descriptor = BeansObservables.getPropertyDescriptor(
>-				pojo.getClass(), propertyName);
>-		return new JavaBeanPropertyObservableMap(realm, pojo, descriptor, false);
>+		IMapProperty property = PojoProperties.mapProperty(pojo.getClass(),
>+				propertyName);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
>+				pojo, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -220,13 +229,12 @@
> 	 */
> 	public static IObservableList observeList(Realm realm, Object pojo,
> 			String propertyName, Class elementType) {
>-		PropertyDescriptor propertyDescriptor = BeansObservables
>-				.getPropertyDescriptor(pojo.getClass(), propertyName);
>-		elementType = BeansObservables.getCollectionElementType(elementType,
>-				propertyDescriptor);
>-
>-		return new JavaBeanObservableList(realm, pojo, propertyDescriptor,
>-				elementType, false);
>+		IListProperty property = PojoProperties.listProperty(pojo.getClass(),
>+				propertyName, elementType);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableListDecorator(PropertyObservables.observeList(
>+				realm, pojo, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -310,13 +318,12 @@
> 	 */
> 	public static IObservableSet observeSet(Realm realm, Object pojo,
> 			String propertyName, Class elementType) {
>-		PropertyDescriptor propertyDescriptor = BeansObservables
>-				.getPropertyDescriptor(pojo.getClass(), propertyName);
>-		elementType = BeansObservables.getCollectionElementType(elementType,
>-				propertyDescriptor);
>-
>-		return new JavaBeanObservableSet(realm, pojo, propertyDescriptor,
>-				elementType, false);
>+		ISetProperty property = PojoProperties.setProperty(pojo.getClass(),
>+				propertyName, elementType);
>+		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
>+				.getPropertyDescriptor();
>+		return new BeanObservableSetDecorator(PropertyObservables.observeSet(
>+				realm, pojo, property), propertyDescriptor);
> 	}
> 
> 	/**
>@@ -540,11 +547,8 @@
> 
> 		IObservableValue value = MasterDetailObservables.detailValue(master,
> 				valueFactory(realm, propertyName), propertyType);
>-		BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(
>-				value, BeansObservables.getValueTypePropertyDescriptor(master,
>-						propertyName));
>-
>-		return decorator;
>+		return new BeanObservableValueDecorator(value, BeanPropertyHelper
>+				.getValueTypePropertyDescriptor(master, propertyName));
> 	}
> 
> 	/**
>@@ -587,11 +591,9 @@
> 		IObservableList observableList = MasterDetailObservables.detailList(
> 				master, listFactory(realm, propertyName, propertyType),
> 				propertyType);
>-		BeanObservableListDecorator decorator = new BeanObservableListDecorator(
>-				observableList, BeansObservables
>-						.getValueTypePropertyDescriptor(master, propertyName));
>-
>-		return decorator;
>+		return new BeanObservableListDecorator(observableList,
>+				BeanPropertyHelper.getValueTypePropertyDescriptor(master,
>+						propertyName));
> 	}
> 
> 	/**
>@@ -635,11 +637,8 @@
> 		IObservableSet observableSet = MasterDetailObservables.detailSet(
> 				master, setFactory(realm, propertyName, propertyType),
> 				propertyType);
>-		BeanObservableSetDecorator decorator = new BeanObservableSetDecorator(
>-				observableSet, BeansObservables.getValueTypePropertyDescriptor(
>-						master, propertyName));
>-
>-		return decorator;
>+		return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
>+				.getValueTypePropertyDescriptor(master, propertyName));
> 	}
> 
> 	/**
>@@ -676,10 +675,8 @@
> 			IObservableValue master, String propertyName) {
> 		IObservableMap observableMap = MasterDetailObservables.detailMap(
> 				master, mapPropertyFactory(realm, propertyName));
>-		BeanObservableMapDecorator decorator = new BeanObservableMapDecorator(
>-				observableMap, BeansObservables.getValueTypePropertyDescriptor(
>-						master, propertyName));
>-		return decorator;
>+		return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
>+				.getValueTypePropertyDescriptor(master, propertyName));
> 	}
> 
> 	/**
>Index: src/org/eclipse/core/databinding/beans/IBeanProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/beans/IBeanProperty.java
>diff -N src/org/eclipse/core/databinding/beans/IBeanProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/beans/IBeanProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,30 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Provides access to details of bean properties.
>+ * 
>+ * @since 1.2
>+ */
>+public interface IBeanProperty extends IProperty {
>+	/**
>+	 * Returns the property descriptor of the bean property being observed
>+	 * 
>+	 * @return the property descriptor of the bean property being observed
>+	 */
>+	public PropertyDescriptor getPropertyDescriptor();
>+}
>Index: src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java
>diff -N src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/beans/BeanMapProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,100 @@
>+/*******************************************************************************
>+ * 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.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.BasicMapProperty;
>+import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
>+import org.eclipse.core.databinding.property.IPropertyChangeListener;
>+import org.eclipse.core.databinding.property.MapPropertyChangeEvent;
>+
>+/**
>+ * @since 3.3
>+ * 
>+ */
>+public class BeanMapProperty extends BasicMapProperty implements IBeanProperty {
>+	private final PropertyDescriptor propertyDescriptor;
>+	private final boolean attachListener;
>+
>+	/**
>+	 * @param propertyDescriptor
>+	 * @param attachListener
>+	 */
>+	public BeanMapProperty(PropertyDescriptor propertyDescriptor,
>+			boolean attachListener) {
>+		this.propertyDescriptor = propertyDescriptor;
>+		this.attachListener = attachListener;
>+	}
>+
>+	public PropertyDescriptor getPropertyDescriptor() {
>+		return propertyDescriptor;
>+	}
>+
>+	public Map getMap(Object source) {
>+		return source == null ? Collections.EMPTY_MAP
>+				: asMap(BeanPropertyHelper.getProperty(source,
>+						propertyDescriptor));
>+	}
>+
>+	private static Map asMap(Object propertyValue) {
>+		if (propertyValue == null)
>+			return new HashMap();
>+		return (Map) propertyValue;
>+	}
>+
>+	protected void setMap(Object source, Map map) {
>+		if (source != null) {
>+			BeanPropertyHelper.setProperty(source, propertyDescriptor, map);
>+		}
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IMapPropertyChangeListener listener) {
>+		return attachListener ? new ListenerAdaptor(listener) : null;
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).addListenerTo(source);
>+		}
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).removeListenerFrom(source);
>+		}
>+	}
>+
>+	private class ListenerAdaptor extends BeanPropertyChangeListener {
>+		private final IMapPropertyChangeListener wrapped;
>+
>+		ListenerAdaptor(IMapPropertyChangeListener wrapped) {
>+			super(propertyDescriptor);
>+			this.wrapped = wrapped;
>+		}
>+
>+		protected void handlePropertyChange(Object source, Object oldValue,
>+				Object newValue) {
>+			wrapped.handleMapPropertyChange(new MapPropertyChangeEvent(source,
>+					BeanMapProperty.this, Diffs.computeMapDiff(asMap(oldValue),
>+							asMap(newValue))));
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/beans/BeanPropertyChangeListener.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/BeanPropertyChangeListener.java
>diff -N src/org/eclipse/core/internal/databinding/beans/BeanPropertyChangeListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/beans/BeanPropertyChangeListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,80 @@
>+/*******************************************************************************
>+ * 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.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.property.IPropertyChangeListener;
>+
>+/**
>+ * @since 3.3
>+ * 
>+ */
>+public abstract class BeanPropertyChangeListener implements
>+		IPropertyChangeListener, PropertyChangeListener {
>+	private final PropertyDescriptor propertyDescriptor;
>+
>+	private ListenerSupport listenerSupport;
>+	private Map sourceToCached = Collections.synchronizedMap(new HashMap());
>+
>+	protected BeanPropertyChangeListener(PropertyDescriptor propertyDescriptor) {
>+		this.propertyDescriptor = propertyDescriptor;
>+	}
>+
>+	public final void propertyChange(PropertyChangeEvent evt) {
>+		Object source = evt.getSource();
>+		Object oldValue = evt.getOldValue();
>+		Object newValue = evt.getNewValue();
>+		if (oldValue == null && newValue == null) {
>+			// Obscure condition indicating new and old
>+			// values are unknown
>+			oldValue = sourceToCached.get(source);
>+			newValue = BeanPropertyHelper.getProperty(source,
>+					propertyDescriptor);
>+		}
>+		sourceToCached.put(source, newValue);
>+		handlePropertyChange(source, oldValue, newValue);
>+	}
>+
>+	protected abstract void handlePropertyChange(Object source,
>+			Object oldValue, Object newValue);
>+
>+	private void initListenerSupport() {
>+		if (listenerSupport == null) {
>+			synchronized (this) {
>+				if (listenerSupport == null) {
>+					listenerSupport = new ListenerSupport(this,
>+							propertyDescriptor.getName());
>+				}
>+			}
>+		}
>+	}
>+
>+	protected void addListenerTo(Object source) {
>+		initListenerSupport();
>+		listenerSupport.hookListener(source);
>+		sourceToCached.put(source, BeanPropertyHelper.getProperty(source,
>+				propertyDescriptor));
>+	}
>+
>+	protected void removeListenerFrom(Object source) {
>+		if (listenerSupport != null) {
>+			listenerSupport.unhookListener(source);
>+			sourceToCached.remove(source);
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java
>diff -N src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,98 @@
>+/*******************************************************************************
>+ * 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.PropertyDescriptor;
>+
>+import org.eclipse.core.databinding.beans.IBeanProperty;
>+import org.eclipse.core.databinding.observable.Diffs;
>+import org.eclipse.core.databinding.property.IPropertyChangeListener;
>+import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
>+import org.eclipse.core.databinding.property.ValueProperty;
>+import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
>+
>+/**
>+ * @since 3.3
>+ * 
>+ */
>+public class BeanValueProperty extends ValueProperty implements IBeanProperty {
>+	private final PropertyDescriptor propertyDescriptor;
>+	private final Class valueType;
>+	private final boolean attachListener;
>+
>+	/**
>+	 * @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;
>+	}
>+
>+	public PropertyDescriptor getPropertyDescriptor() {
>+		return propertyDescriptor;
>+	}
>+
>+	public Object getValueType() {
>+		return valueType;
>+	}
>+
>+	public Object getValue(Object source) {
>+		return source == null ? null : BeanPropertyHelper.getProperty(source,
>+				propertyDescriptor);
>+	}
>+
>+	public void setValue(Object source, Object value) {
>+		if (source != null) {
>+			BeanPropertyHelper.setProperty(source, propertyDescriptor, value);
>+		}
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IValuePropertyChangeListener listener) {
>+		return attachListener ? new ListenerAdaptor(listener) : null;
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).addListenerTo(source);
>+		}
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).removeListenerFrom(source);
>+		}
>+	}
>+
>+	private class ListenerAdaptor extends BeanPropertyChangeListener {
>+		private final IValuePropertyChangeListener wrapped;
>+
>+		ListenerAdaptor(IValuePropertyChangeListener listener) {
>+			super(propertyDescriptor);
>+			this.wrapped = listener;
>+		}
>+
>+		protected void handlePropertyChange(Object source, Object oldValue,
>+				Object newValue) {
>+			wrapped.handleValuePropertyChange(new ValuePropertyChangeEvent(
>+					source, BeanValueProperty.this, Diffs.createValueDiff(
>+							oldValue, newValue)));
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/databinding/beans/PojoProperties.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/beans/PojoProperties.java
>diff -N src/org/eclipse/core/databinding/beans/PojoProperties.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/beans/PojoProperties.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,154 @@
>+/*******************************************************************************
>+ * 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.PropertyChangeEvent;
>+
>+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;
>+
>+/**
>+ * A factory for creating properties for POJOs (plain old java objects) that
>+ * conform to idea of an object with getters and setters but does not provide
>+ * {@link PropertyChangeEvent property change events} on change. This factory is
>+ * identical to {@link BeanProperties} except for this fact.
>+ * 
>+ * @since 1.2
>+ */
>+public class PojoProperties {
>+	/**
>+	 * Returns a value property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a value property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @param valueType
>+	 *            the value type of the returned value property
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a set property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @return a set property for the given property name of the given bean
>+	 *         class.
>+	 */
>+	public static ISetProperty setProperty(Class beanClass, String propertyName) {
>+		return setProperty(beanClass, propertyName, null);
>+	}
>+
>+	/**
>+	 * Returns a set property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @param elementType
>+	 *            the element type of the returned set property
>+	 * @return a set 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);
>+	}
>+
>+	/**
>+	 * Returns a list property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a list property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @param elementType
>+	 *            the element type of the returned list property
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a map property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @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);
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java
>diff -N src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/beans/BeanListProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,128 @@
>+/*******************************************************************************
>+ * 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.PropertyDescriptor;
>+import java.lang.reflect.Array;
>+import java.util.ArrayList;
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.List;
>+
>+import org.eclipse.core.databinding.beans.IBeanProperty;
>+import org.eclipse.core.databinding.observable.Diffs;
>+import org.eclipse.core.databinding.property.BasicListProperty;
>+import org.eclipse.core.databinding.property.IListPropertyChangeListener;
>+import org.eclipse.core.databinding.property.IPropertyChangeListener;
>+import org.eclipse.core.databinding.property.ListPropertyChangeEvent;
>+
>+/**
>+ * @since 3.3
>+ * 
>+ */
>+public class BeanListProperty extends BasicListProperty implements
>+		IBeanProperty {
>+	private final PropertyDescriptor propertyDescriptor;
>+	private final Class elementType;
>+	private final boolean attachListener;
>+
>+	/**
>+	 * @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;
>+	}
>+
>+	public PropertyDescriptor getPropertyDescriptor() {
>+		return propertyDescriptor;
>+	}
>+
>+	public Object getElementType() {
>+		return elementType;
>+	}
>+
>+	public List getList(Object source) {
>+		return source == null ? Collections.EMPTY_LIST
>+				: asList(BeanPropertyHelper.getProperty(source,
>+						propertyDescriptor));
>+	}
>+
>+	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) {
>+		if (source != null) {
>+			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 IPropertyChangeListener adaptListener(
>+			IListPropertyChangeListener listener) {
>+		return attachListener ? new ListenerAdaptor(listener) : null;
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).addListenerTo(source);
>+		}
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).removeListenerFrom(source);
>+		}
>+	}
>+
>+	private class ListenerAdaptor extends BeanPropertyChangeListener {
>+		private final IListPropertyChangeListener wrapped;
>+
>+		ListenerAdaptor(IListPropertyChangeListener wrapped) {
>+			super(propertyDescriptor);
>+			this.wrapped = wrapped;
>+		}
>+
>+		protected void handlePropertyChange(Object source, Object oldValue,
>+				Object newValue) {
>+			wrapped.handleListPropertyChange(new ListPropertyChangeEvent(
>+					source, BeanListProperty.this, Diffs.computeListDiff(
>+							asList(oldValue), asList(newValue))));
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java
>diff -N src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/beans/BeanSetProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,126 @@
>+/*******************************************************************************
>+ * 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.PropertyDescriptor;
>+import java.lang.reflect.Array;
>+import java.util.Arrays;
>+import java.util.Collections;
>+import java.util.HashSet;
>+import java.util.Set;
>+
>+import org.eclipse.core.databinding.beans.IBeanProperty;
>+import org.eclipse.core.databinding.observable.Diffs;
>+import org.eclipse.core.databinding.property.BasicSetProperty;
>+import org.eclipse.core.databinding.property.IPropertyChangeListener;
>+import org.eclipse.core.databinding.property.ISetPropertyChangeListener;
>+import org.eclipse.core.databinding.property.SetPropertyChangeEvent;
>+
>+/**
>+ * @since 3.3
>+ * 
>+ */
>+public class BeanSetProperty extends BasicSetProperty implements IBeanProperty {
>+	private final PropertyDescriptor propertyDescriptor;
>+	private final Class elementType;
>+	private final boolean attachListener;
>+
>+	/**
>+	 * @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;
>+	}
>+
>+	public PropertyDescriptor getPropertyDescriptor() {
>+		return propertyDescriptor;
>+	}
>+
>+	public Object getElementType() {
>+		return elementType;
>+	}
>+
>+	public Set getSet(Object source) {
>+		return source == null ? Collections.EMPTY_SET
>+				: asSet(BeanPropertyHelper.getProperty(source,
>+						propertyDescriptor));
>+	}
>+
>+	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) {
>+		if (source != null) {
>+			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());
>+			propertyValue = set.toArray(array);
>+		}
>+		return propertyValue;
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			ISetPropertyChangeListener listener) {
>+		return attachListener ? new ListenerAdaptor(listener) : null;
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).addListenerTo(source);
>+		}
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		if (attachListener && source != null) {
>+			((ListenerAdaptor) listener).removeListenerFrom(source);
>+		}
>+	}
>+
>+	private class ListenerAdaptor extends BeanPropertyChangeListener {
>+		private final ISetPropertyChangeListener wrapped;
>+
>+		ListenerAdaptor(ISetPropertyChangeListener wrapped) {
>+			super(propertyDescriptor);
>+			this.wrapped = wrapped;
>+		}
>+
>+		protected void handlePropertyChange(Object source, Object oldValue,
>+				Object newValue) {
>+			wrapped.handleSetPropertyChange(new SetPropertyChangeEvent(source,
>+					BeanSetProperty.this, Diffs.computeSetDiff(asSet(oldValue),
>+							asSet(newValue))));
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/databinding/beans/BeanProperties.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/beans/BeanProperties.java
>diff -N src/org/eclipse/core/databinding/beans/BeanProperties.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/beans/BeanProperties.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,151 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * A factory for creating properties for Java objects that conform to the <a
>+ * href="http://java.sun.com/products/javabeans/docs/spec.html">JavaBean
>+ * specification</a> for bound properties.
>+ * 
>+ * @since 1.2
>+ */
>+public class BeanProperties {
>+	/**
>+	 * Returns a value property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a value property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @param valueType
>+	 *            the value type of the returned value property
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a set property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @return a set property for the given property name of the given bean
>+	 *         class.
>+	 */
>+	public static ISetProperty setProperty(Class beanClass, String propertyName) {
>+		return setProperty(beanClass, propertyName, null);
>+	}
>+
>+	/**
>+	 * Returns a set property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @param elementType
>+	 *            the element type of the returned set property
>+	 * @return a set 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);
>+	}
>+
>+	/**
>+	 * Returns a list property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a list property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @param elementType
>+	 *            the element type of the returned list property
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a map property for the given property name of the given bean
>+	 * class.
>+	 * 
>+	 * @param beanClass
>+	 *            the bean class
>+	 * @param propertyName
>+	 *            the property name
>+	 * @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);
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java
>diff -N src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/beans/BeanPropertyHelper.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,169 @@
>+/*******************************************************************************
>+ * 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;
>+	}
>+}
>#P org.eclipse.core.databinding
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.core.databinding/META-INF/MANIFEST.MF,v
>retrieving revision 1.15
>diff -u -r1.15 MANIFEST.MF
>--- META-INF/MANIFEST.MF	3 Jul 2008 23:47:30 -0000	1.15
>+++ META-INF/MANIFEST.MF	11 Oct 2008 00:48:00 -0000
>@@ -14,6 +14,7 @@
>  org.eclipse.core.databinding.observable.masterdetail,
>  org.eclipse.core.databinding.observable.set;x-internal:=false,
>  org.eclipse.core.databinding.observable.value;x-internal:=false,
>+ org.eclipse.core.databinding.property,
>  org.eclipse.core.databinding.util,
>  org.eclipse.core.databinding.validation;x-internal:=false,
>  org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",
>@@ -21,6 +22,8 @@
>  org.eclipse.core.internal.databinding.observable;x-internal:=true,
>  org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:="org.eclipse.jface.tests.databinding",
>  org.eclipse.core.internal.databinding.observable.tree;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
>+ org.eclipse.core.internal.databinding.property;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
>+ org.eclipse.core.internal.databinding.property.masterdetail;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
>  org.eclipse.core.internal.databinding.validation;x-friends:="org.eclipse.jface.tests.databinding"
> Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"
> Import-Package-Comment: see http://wiki.eclipse.org/
>Index: src/org/eclipse/core/databinding/property/BasicMapProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/BasicMapProperty.java
>diff -N src/org/eclipse/core/databinding/property/BasicMapProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/BasicMapProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,75 @@
>+/*******************************************************************************
>+ * 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.HashMap;
>+import java.util.Iterator;
>+import java.util.Map;
>+
>+/**
>+ * Abstract map property implementation for properties where the map can be
>+ * completely replaced in a single atomic operation.
>+ * <p>
>+ * For example, a map-typed bean property Customer.phoneNumbers can be modified
>+ * by calling Customer.setPhoneNumbers(Map phoneNumbers).
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class BasicMapProperty extends MapProperty {
>+	/**
>+	 * Sets the map property on the source to the specified map.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param map
>+	 *            the new map
>+	 */
>+	protected abstract void setMap(Object source, Map map);
>+
>+	public void clear(Object source) {
>+		if (!isEmpty(source))
>+			setMap(source, new HashMap());
>+	}
>+
>+	public Object put(Object source, Object key, Object value) {
>+		Map map = new HashMap(getMap(source));
>+		Object result = map.put(key, value);
>+		setMap(source, map);
>+		return result;
>+	}
>+
>+	public void putAll(Object source, Map t) {
>+		if (t.isEmpty())
>+			return;
>+		Map map = new HashMap(getMap(source));
>+		for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
>+			Map.Entry entry = (Map.Entry) it.next();
>+			map.put(entry.getKey(), entry.getValue());
>+		}
>+		setMap(source, map);
>+	}
>+
>+	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);
>+			return result;
>+		}
>+		return null;
>+	}
>+
>+	public int size(Object source) {
>+		return getMap(source).size();
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/IListProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IListProperty.java
>diff -N src/org/eclipse/core/databinding/property/IListProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IListProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,171 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Interface for list-typed properties.
>+ * 
>+ * @since 1.2
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ */
>+public interface IListProperty extends ICollectionProperty {
>+	/**
>+	 * Returns a List with the current contents of the source's list property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return a List with the current contents of the source's list property
>+	 */
>+	List getList(Object source);
>+
>+	/**
>+	 * Inserts all elements in the specified collection into the source's list
>+	 * property at the specified index.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param index
>+	 *            the insertion index
>+	 * @param c
>+	 *            the collection of elements to add
>+	 * @return whether the source's list property was changed
>+	 */
>+	boolean addAll(Object source, int index, Collection c);
>+
>+	/**
>+	 * Returns the element at the specified position in the source's list
>+	 * property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param index
>+	 *            the element position
>+	 * @return the element at the given position in the source's list property
>+	 */
>+	Object get(Object source, int index);
>+
>+	/**
>+	 * Replaces the element at the specified position in the source's list
>+	 * property with the given element.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param index
>+	 *            the element position
>+	 * @param element
>+	 *            the replacement element
>+	 * @return the element previously at the specified position in the source's
>+	 *         list property
>+	 */
>+	Object set(Object source, int index, Object element);
>+
>+	/**
>+	 * Moves the element at the specified old position in the source's list
>+	 * property to the specified new position
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param oldIndex
>+	 *            the old element position
>+	 * @param newIndex
>+	 *            the new element position
>+	 * @return the element that was moved
>+	 */
>+	Object move(Object source, int oldIndex, int newIndex);
>+
>+	/**
>+	 * Inserts the element into the source's list property at the specified
>+	 * position
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param index
>+	 *            the insertion index
>+	 * @param element
>+	 *            the element to insert
>+	 */
>+	void add(Object source, int index, Object element);
>+
>+	/**
>+	 * Removes the element from the source's list property which is located at
>+	 * the specified position
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param index
>+	 *            the index of the element to remove
>+	 * @return the element that was removed from the source's list property
>+	 */
>+	Object remove(Object source, int index);
>+
>+	/**
>+	 * Returns 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.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param o
>+	 *            the element
>+	 * @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);
>+
>+	/**
>+	 * Returns 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 given
>+	 * element.
>+	 * 
>+	 * @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);
>+
>+	/**
>+	 * Constructs and returns a "native" listener for the property. When the
>+	 * native listener receives a change event from the property source, a
>+	 * ListChangeEvent is constructed and sent to the specified listener.
>+	 * 
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)} and
>+	 * {@link #removePropertyChangeListener(Object, IPropertyChangeListener)}.
>+	 * 
>+	 * @param listener
>+	 *            the listener to adapt
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener adaptListener(
>+			IListPropertyChangeListener listener);
>+
>+	 /**
>+	 * Convenience method which
>+	 * {@link #adaptListener(IListPropertyChangeListener) adapts} the specified
>+	 * listener,
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)
>+	 * registers} the adapted listener as a property change listener, and
>+	 * returns the adapted listener
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param listener
>+	 *            the listener
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener addListChangeListener(Object source,
>+			IListPropertyChangeListener listener);
>+}
>Index: src/org/eclipse/core/databinding/property/ISetProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/ISetProperty.java
>diff -N src/org/eclipse/core/databinding/property/ISetProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/ISetProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,62 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Interface for set-typed properties
>+ * 
>+ * @since 1.2
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ */
>+public interface ISetProperty extends ICollectionProperty {
>+	/**
>+	 * Returns a Set with the current contents of the source's set property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return a Set with the current contents of the source's set property
>+	 */
>+	public Set getSet(Object source);
>+
>+	/**
>+	 * Constructs and returns a "native" listener for the property. When the
>+	 * native listener receives a change event from the property source, a
>+	 * SetChangeEvent is constructed and sent to the specified listener.
>+	 * 
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)} and
>+	 * {@link #removePropertyChangeListener(Object, IPropertyChangeListener)}.
>+	 * 
>+	 * @param listener
>+	 *            the listener to adapt
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener adaptListener(ISetPropertyChangeListener listener);
>+
>+	 /**
>+	 * Convenience method which
>+	 * {@link #adaptListener(ISetPropertyChangeListener) adapts} the specified
>+	 * listener,
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)
>+	 * registers} the adapted listener as a property change listener, and
>+	 * returns the adapted listener
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param listener
>+	 *            the listener
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener addSetChangeListener(Object source,
>+			ISetPropertyChangeListener listener);
>+}
>Index: src/org/eclipse/core/databinding/property/ValuePropertyChangeEvent.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/ValuePropertyChangeEvent.java
>diff -N src/org/eclipse/core/databinding/property/ValuePropertyChangeEvent.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/ValuePropertyChangeEvent.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,55 @@
>+/*******************************************************************************
>+ * 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;
>+
>+import org.eclipse.core.databinding.observable.value.ValueDiff;
>+import org.eclipse.core.runtime.Assert;
>+
>+/**
>+ * Value change event describing a change of a value property on a particular
>+ * property source.
>+ * 
>+ * @since 1.2
>+ */
>+public class ValuePropertyChangeEvent extends EventObject {
>+	private static final long serialVersionUID = 1L;
>+
>+	/**
>+	 * The value property that changed
>+	 */
>+	public final IValueProperty property;
>+
>+	/**
>+	 * ValueDiff with the old and new values of the property.
>+	 */
>+	public final ValueDiff diff;
>+
>+	/**
>+	 * Constructs a ValuePropertyChangeEvent with the given attributes
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property that changed on the source
>+	 * @param diff
>+	 *            a ValueDiff describing the changes to the value property
>+	 */
>+	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;
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/MapProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/MapProperty.java
>diff -N src/org/eclipse/core/databinding/property/MapProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/MapProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,54 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Abstract implementation of IMapProperty
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class MapProperty 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 IPropertyChangeListener addMapChangeListener(Object source,
>+			IMapPropertyChangeListener listener) {
>+		IPropertyChangeListener l = adaptListener(listener);
>+		addPropertyChangeListener(source, l);
>+		return l;
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/ListProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/ListProperty.java
>diff -N src/org/eclipse/core/databinding/property/ListProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/ListProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,45 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Abstract implementation of IListProperty.
>+ * 
>+ * @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 IPropertyChangeListener addListChangeListener(Object source,
>+			IListPropertyChangeListener listener) {
>+		IPropertyChangeListener l = adaptListener(listener);
>+		addPropertyChangeListener(source, l);
>+		return l;
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/SetPropertyChangeEvent.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/SetPropertyChangeEvent.java
>diff -N src/org/eclipse/core/databinding/property/SetPropertyChangeEvent.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/SetPropertyChangeEvent.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,55 @@
>+/*******************************************************************************
>+ * 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;
>+
>+import org.eclipse.core.databinding.observable.set.SetDiff;
>+import org.eclipse.core.runtime.Assert;
>+
>+/**
>+ * Set change event describing an incremental change of a set property on a
>+ * particular property source.
>+ * 
>+ * @since 1.2
>+ */
>+public class SetPropertyChangeEvent extends EventObject {
>+	private static final long serialVersionUID = 1L;
>+
>+	/**
>+	 * The set property that changed
>+	 */
>+	public final ISetProperty property;
>+
>+	/**
>+	 * SetDiff enumerating the added and removed elements in the set.
>+	 */
>+	public final SetDiff diff;
>+
>+	/**
>+	 * Constructs a SetPropertyChangeEvent with the given attributes
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property that changed on the source
>+	 * @param diff
>+	 *            a SetDiff describing the changes to the set property
>+	 */
>+	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;
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/PropertyObservableMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/PropertyObservableMap.java
>diff -N src/org/eclipse/core/internal/databinding/property/PropertyObservableMap.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/PropertyObservableMap.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,182 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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 IPropertyChangeListener listener;
>+
>+	/**
>+	 * @param realm
>+	 * @param source
>+	 * @param property
>+	 */
>+	public PropertyObservableMap(Realm realm, Object source,
>+			IMapProperty property) {
>+		super(realm);
>+		this.source = source;
>+		this.property = property;
>+
>+		IMapPropertyChangeListener mapListener = 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);
>+								}
>+							});
>+						}
>+					});
>+				}
>+			}
>+		};
>+		this.listener = property.adaptListener(mapListener);
>+	}
>+
>+	private void getterCalled() {
>+		ObservableTracker.getterCalled(this);
>+	}
>+
>+	protected void firstListenerAdded() {
>+		if (!disposed) {
>+			property.addPropertyChangeListener(source, listener);
>+		}
>+	}
>+
>+	protected void lastListenerRemoved() {
>+		if (!disposed) {
>+			property.removePropertyChangeListener(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.removePropertyChangeListener(source, listener);
>+			property = null;
>+			source = null;
>+		}
>+		super.dispose();
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/Properties.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/Properties.java
>diff -N src/org/eclipse/core/databinding/property/Properties.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/Properties.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,196 @@
>+/*******************************************************************************
>+ * 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.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;
>+
>+/**
>+ * A factory for chaining properties together to create nested properties.
>+ * <p>
>+ * Example: Suppose class <code>A</code> has a property <code>b</code> of type
>+ * <code>B</code>, and that class <code>B</code> has a property <code>c</code>
>+ * of type <code>C</code>:
>+ * 
>+ * <pre>
>+ * A a = new A();
>+ * B b = a.getB();
>+ * IValueProperty ab = BeanProperties.valueProperty(A.class, &quot;b&quot;);
>+ * assertTrue(ab.getValue(a) == b);
>+ * 
>+ * IValueProperty bc = BeanProperties.valueProperty(B.class, &quot;c&quot;);
>+ * C c = b.getC();
>+ * assertTrue(bc.getValue(b) == c);
>+ * </pre>
>+ * 
>+ * Using Properties, the <code>ab</code> and <code>bc</code>
>+ * properties may be combined to form a nested <code>abc</code> property:
>+ * 
>+ * <pre>
>+ * IValueProperty abc = Properties.detailValue(ab, bc)
>+ * assertTrue(abc.getValue(a) == c);
>+ * </pre>
>+ * 
>+ * @since 1.2
>+ */
>+public class Properties {
>+	// Properties of IValueProperty properties
>+
>+	/**
>+	 * Returns the nested combination of the master value and detail value
>+	 * properties. Value modifications made through the returned property are
>+	 * delegated to the detail property, using the value of the master property
>+	 * as the source.
>+	 * 
>+	 * @param masterValue
>+	 *            the master property
>+	 * @param detailValue
>+	 *            the detail property
>+	 * @return the nested combination of the master and detail properties
>+	 */
>+	public static IValueProperty detailValue(IValueProperty masterValue,
>+			IValueProperty detailValue) {
>+		return new ValuePropertyDetailValue(masterValue, detailValue);
>+	}
>+
>+	/**
>+	 * Returns the nested combination of the master value and detail list
>+	 * properties. List modifications made through the returned property are
>+	 * delegated to the detail property, using the value of the master property
>+	 * as the source.
>+	 * 
>+	 * @param masterValue
>+	 *            the master property
>+	 * @param detailList
>+	 *            the detail property
>+	 * @return the nested combination of the master value and detail list
>+	 *         properties
>+	 */
>+	public static IListProperty detailList(IValueProperty masterValue,
>+			IListProperty detailList) {
>+		return new ValuePropertyDetailList(masterValue, detailList);
>+	}
>+
>+	/**
>+	 * Returns the nested combination of the master value and detail set
>+	 * properties. Set modifications made through the returned property are
>+	 * delegated to the detail property, using the value of the master property
>+	 * as the source.
>+	 * 
>+	 * @param masterValue
>+	 *            the master property
>+	 * @param detailSet
>+	 *            the detail property
>+	 * @return the nested combination of the master value and detail set
>+	 *         properties
>+	 */
>+	public static ISetProperty detailSet(IValueProperty masterValue,
>+			ISetProperty detailSet) {
>+		return new ValuePropertyDetailSet(masterValue, detailSet);
>+	}
>+
>+	/**
>+	 * Returns the nested combination of the master value and detail map
>+	 * properties. Map modifications made through the returned property are
>+	 * delegated to the detail property, using the value of the master property
>+	 * as the source.
>+	 * 
>+	 * @param masterValue
>+	 *            the master property
>+	 * @param detailMap
>+	 *            the detail property
>+	 * @return the nested combination of the master value and detial map
>+	 *         properties
>+	 */
>+	public static IMapProperty detailMap(IValueProperty masterValue,
>+			IMapProperty detailMap) {
>+		return new ValuePropertyDetailMap(masterValue, detailMap);
>+	}
>+
>+	// Properties of IListProperty master properties
>+
>+	/**
>+	 * Returns the nested combination of the master list and detail value
>+	 * properties. Note that because this property is a projection of value
>+	 * properties over a list, the only modification supported is through the
>+	 * {@link IValueProperty#setValue(Object, Object)} method. Modifications
>+	 * made through the returned property are delegated to the detail property,
>+	 * using the corresponding list element from the master property as the
>+	 * source.
>+	 * 
>+	 * @param masterList
>+	 *            the master property
>+	 * @param detailValue
>+	 *            the detail property
>+	 * @return the nested combination of the master list and detail value
>+	 *         properties
>+	 */
>+	public static IListProperty detailValues(IListProperty masterList,
>+			IValueProperty detailValue) {
>+		return new ListPropertyDetailValueList(masterList, detailValue);
>+	}
>+
>+	// Properties of ISetProperty master properties
>+
>+	/**
>+	 * Returns the nested combination of the master set and detail value
>+	 * properties. Note that because this property is a projection of value
>+	 * properties over a set, the only modifications supported are through the
>+	 * {@link IMapProperty#put(Object, Object, Object)} and
>+	 * {@link IMapProperty#putAll(Object, java.util.Map)} methods. In the latter
>+	 * case, this property does not put entries for keys not already in the
>+	 * master key set. Modifications made through the returned property are
>+	 * delegated to the detail property, using the corresponding set element
>+	 * from the master property as the source.
>+	 * 
>+	 * @param masterKeySet
>+	 *            the master property
>+	 * @param detailValues
>+	 *            the detail property
>+	 * @return the nested combination of the master set and detail value
>+	 *         properties
>+	 */
>+	public static IMapProperty detailValues(ISetProperty masterKeySet,
>+			IValueProperty detailValues) {
>+		return new SetPropertyDetailValueMap(masterKeySet, detailValues);
>+	}
>+
>+	// Properties of IMapProperty master properties
>+
>+	/**
>+	 * Returns the nested combination of the master map and detail value
>+	 * properties. Note that because this property is a projection of value
>+	 * properties over a values collection, the only modifications supported are
>+	 * through the {@link IMapProperty#put(Object, Object, Object)} and
>+	 * {@link IMapProperty#putAll(Object, java.util.Map)} methods. In the latter
>+	 * case, this property does not entries for keys not already contained in
>+	 * the master map's key set. Modifications made through the returned
>+	 * property are delegated to the detail property, using the corresponding
>+	 * entry value from the master property as the source.
>+	 * 
>+	 * @param masterMap
>+	 *            the master property
>+	 * @param detailValues
>+	 *            the detail property
>+	 * @return the nested combination of the master map and detail value
>+	 *         properties.
>+	 */
>+	public static IMapProperty detailValues(IMapProperty masterMap,
>+			IValueProperty detailValues) {
>+		return new MapPropertyDetailValueMap(masterMap, detailValues);
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/IValueProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IValueProperty.java
>diff -N src/org/eclipse/core/databinding/property/IValueProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IValueProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,78 @@
>+/*******************************************************************************
>+ * 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 value-typed properties
>+ * 
>+ * @since 1.2
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ */
>+public interface IValueProperty extends IProperty {
>+	/**
>+	 * Returns the source's value property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return the current value of the source's value property
>+	 */
>+	public Object getValue(Object source);
>+
>+	/**
>+	 * Sets the source's value property to the specified value
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param value
>+	 *            the new value
>+	 */
>+	public void setValue(Object source, Object value);
>+
>+	/**
>+	 * Returns the value type of the property, or <code>null</code> if untyped.
>+	 * 
>+	 * @return the value type of the property, or <code>null</code> if untyped.
>+	 */
>+	public Object getValueType();
>+
>+	/**
>+	 * Constructs and returns a "native" listener for the property. When the
>+	 * native listener receives a change event from the property source, a
>+	 * ValueChangeEvent is constructed and sent to the specified listener.
>+	 * 
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)} and
>+	 * {@link #removePropertyChangeListener(Object, IPropertyChangeListener)}.
>+	 * 
>+	 * @param listener
>+	 *            the listener to adapt
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener adaptListener(
>+			IValuePropertyChangeListener listener);
>+
>+	/**
>+	 * Convenience method which
>+	 * {@link #adaptListener(IValuePropertyChangeListener) adapts} the specified
>+	 * listener,
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)
>+	 * registers} the adapted listener as a property change listener, and
>+	 * returns the adapted listener.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param listener
>+	 *            the listener to adapt
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener addValueChangeListener(Object source,
>+			IValuePropertyChangeListener listener);
>+}
>Index: src/org/eclipse/core/databinding/property/IMapProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IMapProperty.java
>diff -N src/org/eclipse/core/databinding/property/IMapProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IMapProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,185 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Interface for map-typed properties
>+ * 
>+ * @since 1.2
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ */
>+public interface IMapProperty extends IProperty {
>+	/**
>+	 * Returns a Map with the current contents of the source's map property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return a Map with the current contents of the source's map property
>+	 */
>+	Map getMap(Object source);
>+
>+	/**
>+	 * Returns the size of the source's map property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return the size of the source's map property
>+	 */
>+	int size(Object source);
>+
>+	/**
>+	 * Returns whether the source's map property is empty
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return whether the source's map property is empty
>+	 */
>+	boolean isEmpty(Object source);
>+
>+	/**
>+	 * Returns whether the specified key is contained in the key set of the
>+	 * source's map property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param key
>+	 *            the key
>+	 * @return whether the specified key is contained in the key set of the
>+	 *         source's map property
>+	 */
>+	boolean containsKey(Object source, Object key);
>+
>+	/**
>+	 * Returns whether the specified value is contains in the values collection
>+	 * of the source's map property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param value
>+	 *            the value
>+	 * @return whether the specified value is contains in the values collection
>+	 *         of the source's map property
>+	 */
>+	boolean containsValue(Object source, Object value);
>+
>+	/**
>+	 * Returns the value associated with the specified key in the source's map
>+	 * property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param key
>+	 *            the key
>+	 * @return the value associated with the specified key in the source's map
>+	 *         property
>+	 */
>+	Object get(Object source, Object key);
>+
>+	/**
>+	 * Associates the specified value with the specified key in the source's map
>+	 * property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param key
>+	 *            the key
>+	 * @param value
>+	 *            the 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);
>+
>+	/**
>+	 * Removes the mapping for the specified key from the source's map property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param key
>+	 *            the key
>+	 * @return the value that was previously associated with the specified key
>+	 *         in the source's map property, or null if no such mapping exists
>+	 */
>+	Object remove(Object source, Object key);
>+
>+	/**
>+	 * Adds all mappings in the specified map to the source's map property.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param t
>+	 *            the map
>+	 */
>+	void putAll(Object source, Map t);
>+
>+	/**
>+	 * Removes all mapping from the source's map property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 */
>+	void clear(Object source);
>+
>+	/**
>+	 * Returns whether the source's map property is equal to the argument
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param o
>+	 *            the object to test for equality
>+	 * @return whether the source's map property is equal to the argument
>+	 */
>+	boolean equals(Object source, Object o);
>+
>+	/**
>+	 * Returns the hash code of the source's map property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return the hash code of the source's map property
>+	 */
>+	int hashCode(Object source);
>+
>+	/**
>+	 * Constructs and returns a "native" listener for the property. When the
>+	 * native listener receives a change event from the property source, a
>+	 * MapChangeEvent is constructed and sent to the specified listener.
>+	 * 
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)} and
>+	 * {@link #removePropertyChangeListener(Object, IPropertyChangeListener)}.
>+	 * 
>+	 * @param listener
>+	 *            the listener to adapt
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener adaptListener(
>+			IMapPropertyChangeListener listener);
>+
>+	 /**
>+	 * Convenience method which
>+	 * {@link #adaptListener(IMapPropertyChangeListener) adapts} the specified
>+	 * listener,
>+	 * {@link #addPropertyChangeListener(Object, IPropertyChangeListener)
>+	 * registers} the adapted listener as a property change listener, and
>+	 * returns the adapted listener
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param listener
>+	 *            the listener
>+	 * @return the adapted listener
>+	 */
>+	public IPropertyChangeListener addMapChangeListener(Object source,
>+			IMapPropertyChangeListener listener);
>+}
>Index: src/org/eclipse/core/databinding/property/IMapPropertyChangeListener.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IMapPropertyChangeListener.java
>diff -N src/org/eclipse/core/databinding/property/IMapPropertyChangeListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IMapPropertyChangeListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Listener for changes to map properties on a property source
>+ * 
>+ * @since 1.2
>+ */
>+public interface IMapPropertyChangeListener {
>+	/**
>+	 * Handle a change to a map property on a specific property source.
>+	 * 
>+	 * @param event
>+	 *            an event describing the map change that occured.
>+	 */
>+	public void handleMapPropertyChange(MapPropertyChangeEvent event);
>+}
>Index: src/org/eclipse/core/databinding/property/ValueProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/ValueProperty.java
>diff -N src/org/eclipse/core/databinding/property/ValueProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/ValueProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,26 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Abstract implementation of IValueProperty.
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class ValueProperty implements IValueProperty {
>+	 public final IPropertyChangeListener addValueChangeListener(Object source,
>+			IValuePropertyChangeListener listener) {
>+		IPropertyChangeListener l = adaptListener(listener);
>+		addPropertyChangeListener(source, l);
>+		return l;
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/IValuePropertyChangeListener.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IValuePropertyChangeListener.java
>diff -N src/org/eclipse/core/databinding/property/IValuePropertyChangeListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IValuePropertyChangeListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Listener for changes to value properties on a property source
>+ * 
>+ * @since 1.2
>+ */
>+public interface IValuePropertyChangeListener {
>+	/**
>+	 * Handle a change to a value property on a specific property source.
>+	 * 
>+	 * @param event
>+	 *            an event describing the value change that occured.
>+	 */
>+	public void handleValuePropertyChange(ValuePropertyChangeEvent event);
>+}
>Index: src/org/eclipse/core/databinding/property/BasicListProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/BasicListProperty.java
>diff -N src/org/eclipse/core/databinding/property/BasicListProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/BasicListProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,159 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Abstract IListProperty implementation for properties where the list can be
>+ * completely replaced in a single atomic operation.
>+ * <p>
>+ * For example, a list-typed bean property Customer.invoices can be modified by
>+ * calling Customer.setInvoices(List invoices).
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class BasicListProperty extends ListProperty {
>+	/**
>+	 * Sets the list property on the source to the specified list.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param list
>+	 *            the new list
>+	 */
>+	protected abstract void setList(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);
>+	}
>+
>+	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));
>+		boolean changed = false;
>+		int i = index;
>+		for (Iterator it = c.iterator(); it.hasNext(); i++) {
>+			Object o = it.next();
>+			list.add(i, o);
>+			changed = true;
>+		}
>+		if (changed) {
>+			setList(source, list);
>+		}
>+		return changed;
>+	}
>+
>+	public void clear(Object source) {
>+		if (isEmpty(source))
>+			return;
>+		setList(source, new ArrayList());
>+	}
>+
>+	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);
>+		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);
>+		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));
>+		boolean changed = false;
>+		for (ListIterator it = list.listIterator(); it.hasNext();) {
>+			Object o = it.next();
>+			if (c.contains(o)) {
>+				it.remove();
>+				changed = true;
>+			}
>+		}
>+		if (changed) {
>+			setList(source, list);
>+		}
>+		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));
>+		boolean changed = false;
>+		for (ListIterator it = list.listIterator(); it.hasNext();) {
>+			Object o = it.next();
>+			if (!c.contains(o)) {
>+				it.remove();
>+				changed = true;
>+			}
>+		}
>+		if (changed) {
>+			setList(source, list);
>+		}
>+		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);
>+		return result;
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailValue.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailValue.java
>diff -N src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailValue.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailValue.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,156 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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;
>+
>+	/**
>+	 * @param masterProperty
>+	 * @param detailProperty
>+	 */
>+	public ValuePropertyDetailValue(IValueProperty masterProperty,
>+			IValueProperty detailProperty) {
>+		this.masterProperty = masterProperty;
>+		this.detailProperty = detailProperty;
>+	}
>+
>+	public Object getValueType() {
>+		return detailProperty.getValueType();
>+	}
>+
>+	public Object getValue(Object source) {
>+		Object masterValue = masterProperty.getValue(source);
>+		return detailProperty.getValue(masterValue);
>+	}
>+
>+	public void setValue(Object source, Object value) {
>+		Object masterValue = masterProperty.getValue(source);
>+		detailProperty.setValue(masterValue, value);
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IValuePropertyChangeListener listener) {
>+		return new ListenerAdaptor(listener);
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).addListenerTo(source);
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).removeListenerFrom(source);
>+	}
>+
>+	private class ListenerAdaptor implements IPropertyChangeListener {
>+		private final IValuePropertyChangeListener wrapped;
>+
>+		private IPropertyChangeListener masterListener;
>+		private Map sourceToDetailListener = new HashMap();
>+
>+		ListenerAdaptor(IValuePropertyChangeListener wrapped) {
>+			this.wrapped = wrapped;
>+
>+			IValuePropertyChangeListener masterValueListener = new MasterValuePropertyListener();
>+			masterListener = masterProperty.adaptListener(masterValueListener);
>+		}
>+
>+		private void fireValueChange(Object source, ValueDiff diff) {
>+			wrapped.handleValuePropertyChange(new ValuePropertyChangeEvent(
>+					source, ValuePropertyDetailValue.this, diff));
>+		}
>+
>+		protected void addListenerTo(Object source) {
>+			masterProperty.addPropertyChangeListener(source, masterListener);
>+			addDetailPropertyListener(source);
>+		}
>+
>+		protected void removeListenerFrom(Object source) {
>+			masterProperty.removePropertyChangeListener(source, masterListener);
>+			removeDetailPropertyListener(source);
>+		}
>+
>+		private void addDetailPropertyListener(Object source) {
>+			Object masterValue = masterProperty.getValue(source);
>+			DetailValuePropertyListener detailListener = new DetailValuePropertyListener(
>+					source, masterValue);
>+			IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+					.adaptListener(detailListener);
>+			detailProperty.addPropertyChangeListener(masterValue, listener);
>+			sourceToDetailListener.put(source, detailListener);
>+		}
>+
>+		private void removeDetailPropertyListener(Object source) {
>+			DetailValuePropertyListener detailListener = (DetailValuePropertyListener) sourceToDetailListener
>+					.remove(source);
>+			if (detailListener != null) {
>+				detailProperty.removePropertyChangeListener(
>+						detailListener.masterValue, detailListener.wrapper);
>+			}
>+		}
>+
>+		private class MasterValuePropertyListener 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 DetailValuePropertyListener implements
>+				IValuePropertyChangeListener {
>+			private Object source;
>+			private Object masterValue;
>+			private IPropertyChangeListener wrapper;
>+
>+			DetailValuePropertyListener(Object source, Object masterValue) {
>+				this.source = source;
>+				this.masterValue = masterValue;
>+			}
>+
>+			public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
>+				fireValueChange(source, event.diff);
>+			}
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/MapValuePropertyObservableMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/MapValuePropertyObservableMap.java
>diff -N src/org/eclipse/core/internal/databinding/property/MapValuePropertyObservableMap.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/MapValuePropertyObservableMap.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,326 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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;
>+		private IPropertyChangeListener adaptor;
>+
>+		public ValuePropertySourceChangeListener(Object key) {
>+			this.key = key;
>+		}
>+
>+		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
>+			Object oldSource = event.diff.getOldValue();
>+			Object oldValue = property.getValue(oldSource);
>+			property.removePropertyChangeListener(oldSource, adaptor);
>+
>+			Object newSource = event.diff.getNewValue();
>+			Object newValue = property.getValue(newSource);
>+			property.addPropertyChangeListener(newSource, adaptor);
>+
>+			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) {
>+		ValuePropertySourceChangeListener valueListener = new ValuePropertySourceChangeListener(
>+				key);
>+		IPropertyChangeListener listener = valueListener.adaptor = property
>+				.adaptListener(valueListener);
>+		property.addPropertyChangeListener(propertySource, listener);
>+		keyToMasterValueListener.put(key, listener);
>+	}
>+
>+	private void removePropertySourceListener(Object key, Object propertySource) {
>+		IPropertyChangeListener listener = (IPropertyChangeListener) keyToMasterValueListener
>+				.remove(key);
>+		if (listener != null) {
>+			property.removePropertyChangeListener(propertySource, listener);
>+		}
>+	}
>+
>+	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();
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/masterdetail/SetPropertyDetailValueMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/masterdetail/SetPropertyDetailValueMap.java
>diff -N src/org/eclipse/core/internal/databinding/property/masterdetail/SetPropertyDetailValueMap.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/masterdetail/SetPropertyDetailValueMap.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,263 @@
>+/*******************************************************************************
>+ * 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.IMapPropertyChangeListener;
>+import org.eclipse.core.databinding.property.IPropertyChangeListener;
>+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.MapPropertyChangeEvent;
>+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;
>+
>+	/**
>+	 * @param masterProperty
>+	 * @param detailProperty
>+	 */
>+	public SetPropertyDetailValueMap(ISetProperty masterProperty,
>+			IValueProperty detailProperty) {
>+		this.masterProperty = masterProperty;
>+		this.detailProperty = detailProperty;
>+	}
>+
>+	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();
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IMapPropertyChangeListener listener) {
>+		return new ListenerAdaptor(listener);
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).addListenerTo(source);
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).removeListenerFrom(source);
>+	}
>+
>+	private class ListenerAdaptor implements IPropertyChangeListener {
>+		private final IMapPropertyChangeListener wrapped;
>+
>+		private IPropertyChangeListener masterListener;
>+		private Map sourceToMasterElementToDetailListener = new HashMap();
>+
>+		ListenerAdaptor(IMapPropertyChangeListener wrapped) {
>+			this.wrapped = wrapped;
>+
>+			ISetPropertyChangeListener masterSetListener = new MasterSetPropertyListener();
>+			masterListener = masterProperty.adaptListener(masterSetListener);
>+		}
>+
>+		private void fireMapChange(Object source, MapDiff diff) {
>+			wrapped.handleMapPropertyChange(new MapPropertyChangeEvent(source,
>+					SetPropertyDetailValueMap.this, diff));
>+		}
>+
>+		protected void addListenerTo(Object source) {
>+			masterProperty.addPropertyChangeListener(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);
>+				IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+						.adaptListener(detailListener);
>+				detailProperty.addPropertyChangeListener(masterElement,
>+						listener);
>+				masterElementToDetailListener
>+						.put(masterElement, detailListener);
>+			}
>+
>+			sourceToMasterElementToDetailListener.put(source,
>+					masterElementToDetailListener);
>+		}
>+
>+		protected void removeListenerFrom(Object source) {
>+			masterProperty.removePropertyChangeListener(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
>+							.removePropertyChangeListener(
>+									entry.getKey(),
>+									((DetailPropertyListener) entry.getValue()).wrapper);
>+				}
>+			}
>+		}
>+
>+		private class MasterSetPropertyListener 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);
>+					IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+							.adaptListener(detailListener);
>+					detailProperty.addPropertyChangeListener(element, listener);
>+					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.removePropertyChangeListener(element,
>+							detailListener.wrapper);
>+				}
>+			}
>+		}
>+
>+		private class DetailPropertyListener implements
>+				IValuePropertyChangeListener {
>+			private Object source;
>+			private Object masterValue;
>+			private IPropertyChangeListener wrapper;
>+
>+			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);
>+			}
>+		}
>+
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/SetProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/SetProperty.java
>diff -N src/org/eclipse/core/databinding/property/SetProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/SetProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,33 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Abstract implementation of ISetProperty
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class SetProperty extends CollectionProperty implements
>+		ISetProperty {
>+	Collection getCollection(Object source) {
>+		return getSet(source);
>+	}
>+
>+	 public final IPropertyChangeListener addSetChangeListener(Object source,
>+			ISetPropertyChangeListener listener) {
>+		IPropertyChangeListener l = adaptListener(listener);
>+		addPropertyChangeListener(source, l);
>+		return l;
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailList.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailList.java
>diff -N src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailList.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailList.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,209 @@
>+/*******************************************************************************
>+ * 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.observable.list.ListDiff;
>+import org.eclipse.core.databinding.property.IListProperty;
>+import org.eclipse.core.databinding.property.IListPropertyChangeListener;
>+import org.eclipse.core.databinding.property.IPropertyChangeListener;
>+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;
>+
>+	/**
>+	 * @param masterProperty
>+	 * @param detailProperty
>+	 */
>+	public ValuePropertyDetailList(IValueProperty masterProperty,
>+			IListProperty detailProperty) {
>+		this.masterProperty = masterProperty;
>+		this.detailProperty = detailProperty;
>+	}
>+
>+	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);
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IListPropertyChangeListener listener) {
>+		return new ListenerAdaptor(listener);
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).addListenerTo(source);
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).removeListenerFrom(source);
>+	}
>+
>+	private class ListenerAdaptor implements IPropertyChangeListener {
>+		private final IListPropertyChangeListener wrapped;
>+
>+		private IPropertyChangeListener masterListener;
>+		private Map sourceToDetailListener = new HashMap();
>+
>+		ListenerAdaptor(IListPropertyChangeListener wrapped) {
>+			this.wrapped = wrapped;
>+
>+			IValuePropertyChangeListener masterValueListener = new MasterPropertyListener();
>+			masterListener = masterProperty.adaptListener(masterValueListener);
>+		}
>+
>+		private void fireListChange(Object source, ListDiff diff) {
>+			wrapped.handleListPropertyChange(new ListPropertyChangeEvent(
>+					source, ValuePropertyDetailList.this, diff));
>+		}
>+
>+		protected void addListenerTo(Object source) {
>+			masterProperty.addPropertyChangeListener(source, masterListener);
>+			addDetailPropertyListener(source);
>+		}
>+
>+		protected void removeListenerFrom(Object source) {
>+			masterProperty.removePropertyChangeListener(source, masterListener);
>+			removeDetailPropertyListener(source);
>+		}
>+
>+		private void addDetailPropertyListener(Object source) {
>+			Object masterValue = masterProperty.getValue(source);
>+			DetailPropertyListener detailListener = new DetailPropertyListener(
>+					source, masterValue);
>+			IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+					.adaptListener(detailListener);
>+			detailProperty.addPropertyChangeListener(masterValue, listener);
>+			sourceToDetailListener.put(source, detailListener);
>+		}
>+
>+		private void removeDetailPropertyListener(Object source) {
>+			DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
>+					.remove(source);
>+			if (detailListener != null) {
>+				detailProperty.removePropertyChangeListener(
>+						detailListener.masterValue, detailListener.wrapper);
>+			}
>+			sourceToDetailListener.remove(source);
>+		}
>+
>+		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;
>+			private IPropertyChangeListener wrapper;
>+
>+			DetailPropertyListener(Object source, Object masterValue) {
>+				this.source = source;
>+				this.masterValue = masterValue;
>+			}
>+
>+			public void handleListPropertyChange(ListPropertyChangeEvent event) {
>+				fireListChange(source, event.diff);
>+			}
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/IProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IProperty.java
>diff -N src/org/eclipse/core/databinding/property/IProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,44 @@
>+/*******************************************************************************
>+ * 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.
>+ * 
>+ * @since 1.2
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ */
>+public interface IProperty {
>+	/**
>+	 * Adds the given property change listener to the list of listeners for the
>+	 * given source.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param listener
>+	 *            the listener
>+	 */
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener);
>+
>+	/**
>+	 * Removes the given property change listener from the list of listeners for
>+	 * the given source.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param listener
>+	 *            the listener
>+	 */
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener);
>+}
>Index: src/org/eclipse/core/internal/databinding/property/masterdetail/ListPropertyDetailValueList.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/masterdetail/ListPropertyDetailValueList.java
>diff -N src/org/eclipse/core/internal/databinding/property/masterdetail/ListPropertyDetailValueList.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/masterdetail/ListPropertyDetailValueList.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,303 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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;
>+
>+	/**
>+	 * @param masterProperty
>+	 * @param detailProperty
>+	 */
>+	public ListPropertyDetailValueList(IListProperty masterProperty,
>+			IValueProperty detailProperty) {
>+		this.masterProperty = masterProperty;
>+		this.detailProperty = detailProperty;
>+	}
>+
>+	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;
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IListPropertyChangeListener listener) {
>+		return new ListenerAdaptor(listener);
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).addListenerTo(source);
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).removeListenerFrom(source);
>+	}
>+
>+	private class ListenerAdaptor implements IPropertyChangeListener {
>+		private final IListPropertyChangeListener wrapped;
>+
>+		private IPropertyChangeListener masterListener;
>+		private Map sourceToMasterElementToDetailListener = new HashMap();
>+
>+		ListenerAdaptor(IListPropertyChangeListener wrapped) {
>+			this.wrapped = wrapped;
>+
>+			IListPropertyChangeListener masterListListener = new MasterListPropertyListener();
>+			masterListener = masterProperty.adaptListener(masterListListener);
>+		}
>+
>+		private void fireListChange(Object source, ListDiff diff) {
>+			wrapped.handleListPropertyChange(new ListPropertyChangeEvent(
>+					source, ListPropertyDetailValueList.this, diff));
>+		}
>+
>+		protected void addListenerTo(Object source) {
>+			masterProperty.addPropertyChangeListener(source, masterListener);
>+
>+			Map masterElementToDetailListener = new HashMap();
>+			for (Iterator it = masterProperty.getList(source).iterator(); it
>+					.hasNext();) {
>+				Object masterElement = it.next();
>+				DetailValuePropertyListener detailListener = new DetailValuePropertyListener(
>+						source, masterElement);
>+				IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+						.adaptListener(detailListener);
>+				detailProperty.addPropertyChangeListener(masterElement,
>+						listener);
>+				masterElementToDetailListener
>+						.put(masterElement, detailListener);
>+			}
>+
>+			sourceToMasterElementToDetailListener.put(source,
>+					masterElementToDetailListener);
>+		}
>+
>+		protected void removeListenerFrom(Object source) {
>+			masterProperty.removePropertyChangeListener(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
>+							.removePropertyChangeListener(entry.getKey(),
>+									((DetailValuePropertyListener) entry
>+											.getValue()).wrapper);
>+				}
>+			}
>+		}
>+
>+		private class MasterListPropertyListener 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)) {
>+					DetailValuePropertyListener detailListener = new DetailValuePropertyListener(
>+							source, element);
>+					IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+							.adaptListener(detailListener);
>+					detailProperty.addPropertyChangeListener(element, listener);
>+					elementToDetailListener.put(element, detailListener);
>+				}
>+			}
>+
>+			private void removeElementPropertyListener(Object source,
>+					Object element) {
>+				Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
>+						.get(source);
>+				if (elementToDetailListener != null
>+						&& elementToDetailListener.containsKey(element)) {
>+					DetailValuePropertyListener detailListener = (DetailValuePropertyListener) elementToDetailListener
>+							.remove(element);
>+					detailProperty.removePropertyChangeListener(element,
>+							detailListener.wrapper);
>+				}
>+			}
>+		}
>+
>+		private class DetailValuePropertyListener implements
>+				IValuePropertyChangeListener {
>+			private Object source;
>+			private Object masterElement;
>+			private IPropertyChangeListener wrapper;
>+
>+			DetailValuePropertyListener(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(new Integer(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);
>+			}
>+		}
>+
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/IPropertyObservable.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IPropertyObservable.java
>diff -N src/org/eclipse/core/databinding/property/IPropertyObservable.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IPropertyObservable.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,28 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Provides access to the details of property observables
>+ * 
>+ * @since 1.2
>+ */
>+public interface IPropertyObservable extends IObserving {
>+	/**
>+	 * Returns the property being observed
>+	 * 
>+	 * @return the property being observed
>+	 */
>+	IProperty getProperty();
>+}
>Index: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailMap.java
>diff -N src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailMap.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailMap.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,170 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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;
>+
>+	/**
>+	 * @param masterProperty
>+	 * @param detailProperty
>+	 */
>+	public ValuePropertyDetailMap(IValueProperty masterProperty,
>+			IMapProperty detailProperty) {
>+		this.masterProperty = masterProperty;
>+		this.detailProperty = detailProperty;
>+	}
>+
>+	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);
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IMapPropertyChangeListener listener) {
>+		return new ListenerAdaptor(listener);
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).addListenerTo(source);
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).removeListenerFrom(source);
>+	}
>+
>+	private class ListenerAdaptor implements IPropertyChangeListener {
>+		private final IMapPropertyChangeListener wrapped;
>+
>+		private IPropertyChangeListener masterListener;
>+		private Map sourceToDetailListener = new HashMap();
>+
>+		ListenerAdaptor(IMapPropertyChangeListener wrapped) {
>+			this.wrapped = wrapped;
>+
>+			IValuePropertyChangeListener masterValueListener = new MasterValueListener();
>+			masterListener = masterProperty.adaptListener(masterValueListener);
>+		}
>+
>+		private void fireMapChange(Object source, MapDiff diff) {
>+			wrapped.handleMapPropertyChange(new MapPropertyChangeEvent(source,
>+					ValuePropertyDetailMap.this, diff));
>+		}
>+
>+		protected void addListenerTo(Object source) {
>+			masterProperty.addPropertyChangeListener(source, masterListener);
>+			addDetailPropertyListener(source);
>+		}
>+
>+		protected void removeListenerFrom(Object source) {
>+			masterProperty.removePropertyChangeListener(source, masterListener);
>+			removeDetailPropertyListener(source);
>+		}
>+
>+		private void addDetailPropertyListener(Object source) {
>+			Object masterValue = masterProperty.getValue(source);
>+			DetailPropertyListener detailListener = new DetailPropertyListener(
>+					source, masterValue);
>+			IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+					.adaptListener(detailListener);
>+			detailProperty.addPropertyChangeListener(masterValue, listener);
>+			sourceToDetailListener.put(source, detailListener);
>+		}
>+
>+		private void removeDetailPropertyListener(Object source) {
>+			DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
>+					.remove(source);
>+			if (detailListener != null) {
>+				detailProperty.removePropertyChangeListener(
>+						detailListener.masterValue, detailListener.wrapper);
>+			}
>+			sourceToDetailListener.remove(source);
>+		}
>+
>+		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;
>+			private IPropertyChangeListener wrapper;
>+
>+			DetailPropertyListener(Object source, Object masterValue) {
>+				this.source = source;
>+				this.masterValue = masterValue;
>+			}
>+
>+			public void handleMapPropertyChange(MapPropertyChangeEvent event) {
>+				fireMapChange(source, event.diff);
>+			}
>+		}
>+
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/ISetPropertyChangeListener.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/ISetPropertyChangeListener.java
>diff -N src/org/eclipse/core/databinding/property/ISetPropertyChangeListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/ISetPropertyChangeListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Listener for changes to set properties on a property source
>+ * 
>+ * @since 1.2
>+ */
>+public interface ISetPropertyChangeListener {
>+	/**
>+	 * Handle a change to a set property on a specific property source.
>+	 * 
>+	 * @param event
>+	 *            an event describing the set change that occured.
>+	 */
>+	public void handleSetPropertyChange(SetPropertyChangeEvent event);
>+}
>Index: src/org/eclipse/core/databinding/property/BasicSetProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/BasicSetProperty.java
>diff -N src/org/eclipse/core/databinding/property/BasicSetProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/BasicSetProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,130 @@
>+/*******************************************************************************
>+ * 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.HashSet;
>+import java.util.Iterator;
>+import java.util.Set;
>+
>+/**
>+ * Abstract set property implementation for properties where the set can be
>+ * completely replaced in a single atomic operation.
>+ * <p>
>+ * For example, a set-typed bean property Customer.addresses can be modified by
>+ * calling Customer.setAddresses(List addresses).
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class BasicSetProperty extends SetProperty {
>+	/**
>+	 * Sets the set property on the source to the specified set.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param set
>+	 *            the new set
>+	 */
>+	protected abstract void setSet(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);
>+			return added;
>+		}
>+		return false;
>+	}
>+
>+	public boolean addAll(Object source, Collection c) {
>+		if (c.isEmpty())
>+			return false;
>+
>+		Set set = new HashSet(getSet(source));
>+		boolean changed = false;
>+		for (Iterator it = c.iterator(); it.hasNext();) {
>+			if (set.add(it.next())) {
>+				changed = true;
>+			}
>+		}
>+		if (changed) {
>+			setSet(source, set);
>+		}
>+		return changed;
>+	}
>+
>+	public void clear(Object source) {
>+		if (!isEmpty(source))
>+			setSet(source, new HashSet());
>+	}
>+
>+	public boolean remove(Object source, Object o) {
>+		Set set = getSet(source);
>+		if (!set.contains(o))
>+			return false;
>+
>+		set = new HashSet(set);
>+		boolean removed = set.remove(o);
>+		if (removed) {
>+			setSet(source, set);
>+		}
>+		return removed;
>+	}
>+
>+	public boolean removeAll(Object source, Collection c) {
>+		if (c.isEmpty())
>+			return false;
>+
>+		Set set = new HashSet(getSet(source));
>+		boolean changed = false;
>+		for (Iterator it = set.iterator(); it.hasNext();) {
>+			Object o = it.next();
>+			if (c.contains(o)) {
>+				it.remove();
>+				changed = true;
>+			}
>+		}
>+		if (changed) {
>+			setSet(source, set);
>+		}
>+		return changed;
>+	}
>+
>+	public boolean retainAll(Object source, Collection c) {
>+		Set set = getSet(source);
>+
>+		if (set.isEmpty())
>+			return false;
>+
>+		if (c.isEmpty()) {
>+			clear(source);
>+			return true;
>+		}
>+
>+		set = new HashSet(set);
>+		boolean changed = false;
>+		for (Iterator it = set.iterator(); it.hasNext();) {
>+			Object o = it.next();
>+			if (!c.contains(o)) {
>+				it.remove();
>+				changed = true;
>+			}
>+		}
>+		if (changed) {
>+			setSet(source, set);
>+		}
>+		return changed;
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/MapPropertyChangeEvent.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/MapPropertyChangeEvent.java
>diff -N src/org/eclipse/core/databinding/property/MapPropertyChangeEvent.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/MapPropertyChangeEvent.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,55 @@
>+/*******************************************************************************
>+ * 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;
>+
>+import org.eclipse.core.databinding.observable.map.MapDiff;
>+import org.eclipse.core.runtime.Assert;
>+
>+/**
>+ * Map change event describing an incremental change of a map property on a
>+ * particular property source.
>+ * 
>+ * @since 1.2
>+ */
>+public class MapPropertyChangeEvent extends EventObject {
>+	private static final long serialVersionUID = 1L;
>+
>+	/**
>+	 * The map property that changed
>+	 */
>+	public final IMapProperty property;
>+
>+	/**
>+	 * MapDiff enumerating the added, changed, and removed entries in the map.
>+	 */
>+	public final MapDiff diff;
>+
>+	/**
>+	 * Constructs a MapPropertyChangeEvent with the given attributes
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property that changed on the source
>+	 * @param diff
>+	 *            a MapDiff describing the changes to the map property
>+	 */
>+	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;
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/ListPropertyChangeEvent.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/ListPropertyChangeEvent.java
>diff -N src/org/eclipse/core/databinding/property/ListPropertyChangeEvent.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/ListPropertyChangeEvent.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,55 @@
>+/*******************************************************************************
>+ * 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;
>+
>+import org.eclipse.core.databinding.observable.list.ListDiff;
>+import org.eclipse.core.runtime.Assert;
>+
>+/**
>+ * List change event describing an incremental change of a list property on a
>+ * particular property source.
>+ * 
>+ * @since 1.2
>+ */
>+public class ListPropertyChangeEvent extends EventObject {
>+	private static final long serialVersionUID = 1L;
>+
>+	/**
>+	 * The list property that changed
>+	 */
>+	public final IListProperty property;
>+
>+	/**
>+	 * ListDiff enumerating the added and removed elements in the list.
>+	 */
>+	public final ListDiff diff;
>+
>+	/**
>+	 * Constructs a ListPropertyChangeEvent with the given attributes
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property that changed on the source
>+	 * @param diff
>+	 *            a ListDiff describing the changes to the list property
>+	 */
>+	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;
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/masterdetail/MapPropertyDetailValueMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/masterdetail/MapPropertyDetailValueMap.java
>diff -N src/org/eclipse/core/internal/databinding/property/masterdetail/MapPropertyDetailValueMap.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/masterdetail/MapPropertyDetailValueMap.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,268 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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;
>+
>+	/**
>+	 * @param masterProperty
>+	 * @param detailProperty
>+	 */
>+	public MapPropertyDetailValueMap(IMapProperty masterProperty,
>+			IValueProperty detailProperty) {
>+		this.masterProperty = masterProperty;
>+		this.detailProperty = detailProperty;
>+	}
>+
>+	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();
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			IMapPropertyChangeListener listener) {
>+		return new ListenerAdaptor(listener);
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).addListenerTo(source);
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).removeListenerFrom(source);
>+	}
>+
>+	private class ListenerAdaptor implements IPropertyChangeListener {
>+		private final IMapPropertyChangeListener wrapped;
>+
>+		private IPropertyChangeListener masterListener;
>+		private Map sourceToKeyToDetailListener = new HashMap();
>+
>+		ListenerAdaptor(IMapPropertyChangeListener wrapped) {
>+			this.wrapped = wrapped;
>+
>+			IMapPropertyChangeListener masterMapListener = new MasterMapPropertyListener();
>+			masterListener = masterProperty.adaptListener(masterMapListener);
>+		}
>+
>+		private void fireMapChange(Object source, MapDiff diff) {
>+			wrapped.handleMapPropertyChange(new MapPropertyChangeEvent(source,
>+					MapPropertyDetailValueMap.this, diff));
>+		}
>+
>+		protected void addListenerTo(Object source) {
>+			masterProperty.addPropertyChangeListener(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();
>+				DetailValuePropertyListener detailListener = new DetailValuePropertyListener(
>+						source, key);
>+				IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+						.adaptListener(detailListener);
>+				detailProperty.addPropertyChangeListener(masterValue, listener);
>+				keyToDetailListener.put(masterValue, detailListener);
>+			}
>+
>+			sourceToKeyToDetailListener.put(source, keyToDetailListener);
>+		}
>+
>+		protected void removeListenerFrom(Object source) {
>+			masterProperty.removePropertyChangeListener(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
>+							.removePropertyChangeListener(entry.getKey(),
>+									((DetailValuePropertyListener) entry
>+											.getValue()).wrapper);
>+				}
>+			}
>+		}
>+
>+		private class MasterMapPropertyListener 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)) {
>+					DetailValuePropertyListener detailListener = new DetailValuePropertyListener(
>+							source, key);
>+					IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+							.adaptListener(detailListener);
>+					detailProperty.addPropertyChangeListener(masterValue,
>+							listener);
>+					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)) {
>+					DetailValuePropertyListener detailListener = (DetailValuePropertyListener) keyToDetailListener
>+							.remove(key);
>+					detailProperty.removePropertyChangeListener(masterValue,
>+							detailListener.wrapper);
>+				}
>+			}
>+		}
>+
>+		private class DetailValuePropertyListener implements
>+				IValuePropertyChangeListener {
>+			private Object source;
>+			private Object key;
>+			private IPropertyChangeListener wrapper;
>+
>+			DetailValuePropertyListener(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()));
>+			}
>+		}
>+
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/ICollectionProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/ICollectionProperty.java
>diff -N src/org/eclipse/core/databinding/property/ICollectionProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/ICollectionProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,186 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Interface for collection-typed properties.
>+ * 
>+ * @since 1.2
>+ * @noimplement This interface is not intended to be implemented by clients.
>+ */
>+public interface ICollectionProperty extends IProperty {
>+	/**
>+	 * Returns the size of the source's collection property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return the size of the source's collection property
>+	 */
>+	int size(Object source);
>+
>+	/**
>+	 * Returns whether the source's collection property is empty
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return whether the source's collection property is empty
>+	 */
>+	boolean isEmpty(Object source);
>+
>+	/**
>+	 * Returns whether the source's collection property contains the given
>+	 * element.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param o
>+	 *            the element
>+	 * @return whether the source's collection property contains the given
>+	 *         element.
>+	 */
>+	boolean contains(Object source, Object o);
>+
>+	/**
>+	 * Returns an array of all elements in the source's collection property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return an array of all elements in the source's collection property
>+	 */
>+	Object[] toArray(Object source);
>+
>+	/**
>+	 * Returns an array of all elements in the source's collection property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param array
>+	 *            the array into which the elements will be copied. If the array
>+	 *            is not large enough to hold all elements, the elements will be
>+	 *            returned in a new array of the same runtime type.
>+	 * @return an array of all elements in the source's collection property
>+	 */
>+	Object[] toArray(Object source, Object[] array);
>+
>+	/**
>+	 * Adds the element to the source's collection property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param o
>+	 *            the element to add
>+	 * @return whether the element was added to the source's collection property
>+	 */
>+	boolean add(Object source, Object o);
>+
>+	/**
>+	 * Removes the element from the source's collection property
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param o
>+	 *            the element to remove
>+	 * @return whether the element was removed from the source's collection
>+	 *         property
>+	 */
>+	boolean remove(Object source, Object o);
>+
>+	/**
>+	 * Returns whether the source's collection property contains all elements in
>+	 * the given collection
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param c
>+	 *            the collection of elements to test for
>+	 * @return whether the source's collection property contains all elements in
>+	 *         the given collection
>+	 */
>+	boolean containsAll(Object source, Collection c);
>+
>+	/**
>+	 * Adds all elements in the specified collection to the source's collection
>+	 * property.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param c
>+	 *            the collection of elements to add.
>+	 * @return whether the source's collection property was changed
>+	 */
>+	boolean addAll(Object source, Collection c);
>+
>+	/**
>+	 * Removes all elements from the source's collection property which are
>+	 * contained in the specified collection.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param c
>+	 *            the collection of elements to be removed
>+	 * @return whether the source's collection property was changed
>+	 */
>+	boolean removeAll(Object source, Collection c);
>+
>+	/**
>+	 * Removes all elements from the source's collection property which are not
>+	 * contained in the specified collection.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param c
>+	 *            the collection of elements to retain
>+	 * @return whether the source's collection property was changed
>+	 */
>+	boolean retainAll(Object source, Collection c);
>+
>+	/**
>+	 * Removes all elements from the source's collection property.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 */
>+	void clear(Object source);
>+
>+	/**
>+	 * Returns whether the source's collection property is equal to the
>+	 * argument.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param o
>+	 *            the object to test for equality to the source's collection
>+	 *            property
>+	 * @return whether the source's collection property is equal to the argument
>+	 */
>+	boolean equals(Object source, Object o);
>+
>+	/**
>+	 * Returns the hash code of the source's collection property.
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @return the hash code of the source's collection property
>+	 */
>+	int hashCode(Object source);
>+
>+	/**
>+	 * Returns the type of the elements in the collection or <code>null</code>
>+	 * if untyped
>+	 * 
>+	 * @return the type of the elements in the collection or <code>null</code>
>+	 *         if untyped
>+	 */
>+	Object getElementType();
>+}
>Index: src/org/eclipse/core/databinding/property/PropertyObservables.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/PropertyObservables.java
>diff -N src/org/eclipse/core/databinding/property/PropertyObservables.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/PropertyObservables.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,371 @@
>+/*******************************************************************************
>+ * 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.masterdetail.MasterDetailObservables;
>+import org.eclipse.core.databinding.observable.set.IObservableSet;
>+import org.eclipse.core.databinding.observable.value.IObservableValue;
>+import org.eclipse.core.internal.databinding.property.ListValuePropertyObservableList;
>+import org.eclipse.core.internal.databinding.property.MapValuePropertyObservableMap;
>+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;
>+
>+/**
>+ * A factory for creating observables observing properties of source objects
>+ * 
>+ * @since 1.2
>+ */
>+public class PropertyObservables {
>+	/**
>+	 * Returns an observable value on the default realm that tracks the given
>+	 * property of the source object.
>+	 * 
>+	 * @param source
>+	 *            the property value
>+	 * @param property
>+	 *            the value property to observe
>+	 * @return an observable value on the default realm 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);
>+	}
>+
>+	/**
>+	 * Returns an observable value on the given realm that tracks the given
>+	 * property of the source object
>+	 * 
>+	 * @param realm
>+	 *            the realm
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the value property observe
>+	 * @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);
>+	}
>+
>+	/**
>+	 * Returns a factory for creating observable values on the default realm
>+	 * tracking the given property of a particular source object
>+	 * 
>+	 * @param property
>+	 *            the property to observe
>+	 * @return a factory for creating observable values on the default realm
>+	 *         tracking the given property of a particular source object
>+	 */
>+	public static IObservableFactory valueFactory(IValueProperty property) {
>+		return valueFactory(Realm.getDefault(), property);
>+	}
>+
>+	/**
>+	 * Returns a factory for creating observable values on the given realm
>+	 * tracking the given property of a particular source object
>+	 * 
>+	 * @param realm
>+	 *            the realm
>+	 * @param property
>+	 *            the property to observe
>+	 * @return a factory for creating observable values on the given realm
>+	 *         tracking the given property of a particular source object
>+	 */
>+	public static IObservableFactory valueFactory(final Realm realm,
>+			final IValueProperty property) {
>+		return new IObservableFactory() {
>+			public IObservable createObservable(Object target) {
>+				return observeValue(realm, target, property);
>+			}
>+		};
>+	}
>+
>+	/**
>+	 * Returns an observable value on the master observable's realm which tracks
>+	 * the given property of the current value of <code>master</code>.
>+	 * 
>+	 * @param master
>+	 *            the master observable
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable value which tracks the given property of the
>+	 *         current value of <code>master</code>.
>+	 */
>+	public static IObservableValue observeDetailValue(IObservableValue master,
>+			IValueProperty property) {
>+		return MasterDetailObservables.detailValue(master, valueFactory(master
>+				.getRealm(), property), property.getValueType());
>+	}
>+
>+	/**
>+	 * Returns an observable set on the default realm that tracks the given
>+	 * property of the source object
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable set on the default realm that tracks the given
>+	 *         property of the source object
>+	 */
>+	public static IObservableSet observeSet(Object source, ISetProperty property) {
>+		return observeSet(Realm.getDefault(), source, property);
>+	}
>+
>+	/**
>+	 * Returns an observable set on the given realm that tracks the given
>+	 * property of the source object
>+	 * 
>+	 * @param realm
>+	 *            the realm
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable set on the given realm 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);
>+	}
>+
>+	/**
>+	 * Returns a factory for creating observable sets on the default realm
>+	 * tracking the given property of a particular source object
>+	 * 
>+	 * @param property
>+	 *            the property to be observed
>+	 * @return a factory for creating observable sets on the default realm
>+	 *         tracking the given property of a particular source object
>+	 */
>+	public static IObservableFactory setFactory(ISetProperty property) {
>+		return setFactory(Realm.getDefault(), property);
>+	}
>+
>+	/**
>+	 * Returns a factory for creating obervable sets on the given realm tracking
>+	 * the given property of a particular source object
>+	 * 
>+	 * @param realm
>+	 *            the realm
>+	 * @param property
>+	 *            the property to be observed
>+	 * @return a factory for creating obervable sets on the given realm tracking
>+	 *         the given property of a particular source object
>+	 */
>+	public static IObservableFactory setFactory(final Realm realm,
>+			final ISetProperty property) {
>+		return new IObservableFactory() {
>+			public IObservable createObservable(Object target) {
>+				return observeSet(realm, target, property);
>+			}
>+		};
>+	}
>+
>+	/**
>+	 * Returns an observable set on the master observable's realm which tracks
>+	 * the given property of the current value of <code>master</code>.
>+	 * 
>+	 * @param master
>+	 *            the master observable
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable set on the given realm which tracks the given
>+	 *         property of the current value of <code>master</code>.
>+	 */
>+	public static IObservableSet observeDetailSet(IObservableValue master,
>+			ISetProperty property) {
>+		return MasterDetailObservables.detailSet(master, setFactory(master
>+				.getRealm(), property), property.getElementType());
>+	}
>+
>+	/**
>+	 * Returns an observable list on the default realm that tracks the given
>+	 * property of the source object
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable list on the default realm that tracks the given
>+	 *         property of the source object
>+	 */
>+	public static IObservableList observeList(Object source,
>+			IListProperty property) {
>+		return observeList(Realm.getDefault(), source, property);
>+	}
>+
>+	/**
>+	 * Returns an observable list on the given realm that tracks the given
>+	 * property of the source object
>+	 * 
>+	 * @param realm
>+	 *            the realm
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable list on the given realm 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);
>+	}
>+
>+	/**
>+	 * Returns a factory for creating observable lists on the default realm
>+	 * 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 on the given realm
>+	 * tracking the given property of a particular source object
>+	 * 
>+	 * @param realm
>+	 *            the realm
>+	 * @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);
>+			}
>+		};
>+	}
>+
>+	/**
>+	 * Returns an observable list on the master observable's realm which tracks
>+	 * the given property of the current value of <code>master</code>.
>+	 * 
>+	 * @param master
>+	 *            the master observable
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable list on the given realm which tracks the given
>+	 *         property of the current value of <code>master</code>.
>+	 */
>+	public static IObservableList observeDetailList(IObservableValue master,
>+			IListProperty property) {
>+		return MasterDetailObservables.detailList(master, listFactory(master
>+				.getRealm(), property), property.getElementType());
>+	}
>+
>+	/**
>+	 * Returns an observable list on the master observable's realm which tracks
>+	 * the given property of each element of <code>master</code>.
>+	 * 
>+	 * @param master
>+	 *            the master observable
>+	 * @param property
>+	 *            the property to observe on each element in the master
>+	 *            observable
>+	 * @return an observable
>+	 */
>+	public static IObservableList observeDetailValues(IObservableList master,
>+			IValueProperty property) {
>+		return new ListValuePropertyObservableList(master, property);
>+	}
>+
>+	/**
>+	 * Returns an observable map on the default realm which tracks the given
>+	 * property of the source object
>+	 * 
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable map on the default realm which tracks the given
>+	 *         property of the source object
>+	 */
>+	public static IObservableMap observeMap(Object source, IMapProperty property) {
>+		return observeMap(Realm.getDefault(), source, property);
>+	}
>+
>+	/**
>+	 * Returns an observable map on the given realm which tracks the given
>+	 * property of the source object
>+	 * 
>+	 * @param realm
>+	 *            the realm
>+	 * @param source
>+	 *            the property source
>+	 * @param property
>+	 *            the property to observe
>+	 * @return an observable map on the given realm which 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 on the master observable's realm tracking the
>+	 * current values of the given property for the elements in the given set.
>+	 * 
>+	 * @param keySet
>+	 *            the master observable
>+	 * @param valueProperty
>+	 *            the property to observe on each element of the master
>+	 *            observable
>+	 * @return an observable map that tracks the current value of the given
>+	 *         property for the elements in the given set.
>+	 */
>+	public static IObservableMap observeDetailValues(IObservableSet keySet,
>+			IValueProperty valueProperty) {
>+		return new SetValuePropertyObservableMap(keySet, valueProperty);
>+	}
>+
>+	/**
>+	 * Returns an observable map on the master observable's realm which tracks
>+	 * the current values of the given property for the entry values in the
>+	 * given map.
>+	 * 
>+	 * @param map
>+	 *            the master observable
>+	 * @param valueProperty
>+	 *            the property to observe on each entry value in the master
>+	 *            observable
>+	 * @return an observable map on the master observable's realm which tracks
>+	 *         the current value of the given property for the elements in the
>+	 *         given map's values collection
>+	 */
>+	public static IObservableMap observeDetailValues(IObservableMap map,
>+			IValueProperty valueProperty) {
>+		return new MapValuePropertyObservableMap(map, valueProperty);
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailSet.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailSet.java
>diff -N src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailSet.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/masterdetail/ValuePropertyDetailSet.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,185 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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;
>+
>+	/**
>+	 * @param masterProperty
>+	 * @param detailProperty
>+	 */
>+	public ValuePropertyDetailSet(IValueProperty masterProperty,
>+			ISetProperty detailProperty) {
>+		this.masterProperty = masterProperty;
>+		this.detailProperty = detailProperty;
>+	}
>+
>+	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);
>+	}
>+
>+	public IPropertyChangeListener adaptListener(
>+			ISetPropertyChangeListener listener) {
>+		return new ListenerAdaptor(listener);
>+	}
>+
>+	public void addPropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).addListenerTo(source);
>+	}
>+
>+	public void removePropertyChangeListener(Object source,
>+			IPropertyChangeListener listener) {
>+		((ListenerAdaptor) listener).removeListenerFrom(source);
>+	}
>+
>+	private class ListenerAdaptor implements IPropertyChangeListener {
>+		private final ISetPropertyChangeListener wrapped;
>+
>+		private IPropertyChangeListener masterListener;
>+		private Map sourceToDetailListener = new HashMap();
>+
>+		ListenerAdaptor(ISetPropertyChangeListener wrapped) {
>+			this.wrapped = wrapped;
>+
>+			IValuePropertyChangeListener masterValueListener = new MasterPropertyListener();
>+			masterListener = masterProperty.adaptListener(masterValueListener);
>+		}
>+
>+		private void fireSetChange(Object source, SetDiff diff) {
>+			wrapped.handleSetPropertyChange(new SetPropertyChangeEvent(source,
>+					ValuePropertyDetailSet.this, diff));
>+		}
>+
>+		protected void addListenerTo(Object source) {
>+			masterProperty.addPropertyChangeListener(source, masterListener);
>+			addDetailPropertyListener(source);
>+		}
>+
>+		protected void removeListenerFrom(Object source) {
>+			masterProperty.removePropertyChangeListener(source, masterListener);
>+			removeDetailPropertyListener(source);
>+		}
>+
>+		private void addDetailPropertyListener(Object source) {
>+			Object masterValue = masterProperty.getValue(source);
>+			DetailSetPropertyListener detailListener = new DetailSetPropertyListener(
>+					source, masterValue);
>+			IPropertyChangeListener listener = detailListener.wrapper = detailProperty
>+					.adaptListener(detailListener);
>+			detailProperty.addPropertyChangeListener(masterValue, listener);
>+			sourceToDetailListener.put(source, detailListener);
>+		}
>+
>+		private void removeDetailPropertyListener(Object source) {
>+			DetailSetPropertyListener detailListener = (DetailSetPropertyListener) sourceToDetailListener
>+					.remove(source);
>+			if (detailListener != null) {
>+				detailProperty.removePropertyChangeListener(
>+						detailListener.masterValue, detailListener.wrapper);
>+			}
>+			sourceToDetailListener.remove(source);
>+		}
>+
>+		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 DetailSetPropertyListener implements
>+				ISetPropertyChangeListener {
>+			private Object source;
>+			private Object masterValue;
>+			private IPropertyChangeListener wrapper;
>+
>+			DetailSetPropertyListener(Object source, Object masterValue) {
>+				this.source = source;
>+				this.masterValue = masterValue;
>+			}
>+
>+			public void handleSetPropertyChange(SetPropertyChangeEvent event) {
>+				fireSetChange(source, event.diff);
>+			}
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/PropertyObservableList.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/PropertyObservableList.java
>diff -N src/org/eclipse/core/internal/databinding/property/PropertyObservableList.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/PropertyObservableList.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,378 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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 IPropertyChangeListener listener;
>+
>+	/**
>+	 * @param realm
>+	 * @param source
>+	 * @param property
>+	 */
>+	public PropertyObservableList(Realm realm, Object source,
>+			IListProperty property) {
>+		super(realm);
>+		this.source = source;
>+		this.property = property;
>+		
>+		IListPropertyChangeListener listListener = 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);
>+								}
>+							});
>+						}
>+					});
>+				}
>+			}
>+		};
>+		this.listener = property.adaptListener(listListener);
>+	}
>+
>+	protected void firstListenerAdded() {
>+		if (!disposed) {
>+			property.addPropertyChangeListener(source, listener);
>+		}
>+	}
>+
>+	protected void lastListenerRemoved() {
>+		if (!disposed) {
>+			property.removePropertyChangeListener(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.removePropertyChangeListener(source, listener);
>+			property = null;
>+			source = null;
>+		}
>+		super.dispose();
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/ListValuePropertyObservableList.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/ListValuePropertyObservableList.java
>diff -N src/org/eclipse/core/internal/databinding/property/ListValuePropertyObservableList.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/ListValuePropertyObservableList.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,386 @@
>+/*******************************************************************************
>+ * 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.lang.reflect.Array;
>+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.IObserving;
>+import org.eclipse.core.databinding.observable.ObservableTracker;
>+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.databinding.observable.list.ListDiff;
>+import org.eclipse.core.databinding.observable.list.ListDiffEntry;
>+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.databinding.observable.set.WritableSet;
>+import org.eclipse.core.databinding.property.IPropertyChangeListener;
>+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 ListValuePropertyObservableList extends AbstractObservableList
>+		implements IObserving {
>+	private IObservableList masterList;
>+	private IValueProperty detailProperty;
>+
>+	private IObservableSet knownMasterElements;
>+
>+	private boolean disposed = false;
>+
>+	private IListChangeListener masterListener = new IListChangeListener() {
>+		public void handleListChange(ListChangeEvent event) {
>+			ListDiffEntry[] masterEntries = event.diff.getDifferences();
>+			ListDiffEntry[] detailEntries = new ListDiffEntry[masterEntries.length];
>+			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);
>+			}
>+
>+			// Removes listeners from elements removed from list
>+			knownMasterElements.retainAll(masterList);
>+
>+			// Adds listeners to elements added to list
>+			knownMasterElements.addAll(masterList);
>+
>+			fireListChange(Diffs.createListDiff(detailEntries));
>+		}
>+	};
>+
>+	private final class DetailValuePropertyChangeListener implements
>+			IValuePropertyChangeListener {
>+		public void handleValuePropertyChange(
>+				final ValuePropertyChangeEvent event) {
>+			if (!disposed) {
>+				Object source = event.getSource();
>+				int[] indices = findIndices(source);
>+				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(diff);
>+			}
>+		}
>+
>+		private int[] findIndices(Object masterElement) {
>+			List indices = new ArrayList();
>+
>+			for (ListIterator it = masterList.listIterator(); it.hasNext();) {
>+				if (Util.equals(masterElement, it.next()))
>+					indices.add(new Integer(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;
>+		}
>+	}
>+
>+	private IPropertyChangeListener detailListener;
>+
>+	/**
>+	 * @param masterList
>+	 * @param valueProperty
>+	 */
>+	public ListValuePropertyObservableList(IObservableList masterList,
>+			IValueProperty valueProperty) {
>+		super(masterList.getRealm());
>+		this.masterList = masterList;
>+		this.detailProperty = valueProperty;
>+
>+		IValuePropertyChangeListener detailValueListener = new DetailValuePropertyChangeListener();
>+		this.detailListener = detailProperty.adaptListener(detailValueListener);
>+	}
>+
>+	protected void firstListenerAdded() {
>+		knownMasterElements = new WritableSet(getRealm());
>+		knownMasterElements.addSetChangeListener(new ISetChangeListener() {
>+			public void handleSetChange(SetChangeEvent event) {
>+				for (Iterator it = event.diff.getRemovals().iterator(); it
>+						.hasNext();) {
>+					detailProperty.addPropertyChangeListener(it.next(),
>+							detailListener);
>+				}
>+				for (Iterator it = event.diff.getAdditions().iterator(); it
>+						.hasNext();) {
>+					detailProperty.removePropertyChangeListener(it.next(),
>+							detailListener);
>+				}
>+			}
>+		});
>+		knownMasterElements.addAll(masterList);
>+		masterList.addListChangeListener(masterListener);
>+	}
>+
>+	protected void lastListenerRemoved() {
>+		masterList.removeListChangeListener(masterListener);
>+		if (knownMasterElements != null) {
>+			knownMasterElements.clear();
>+			knownMasterElements.dispose();
>+			knownMasterElements = null;
>+		}
>+	}
>+
>+	protected int doGetSize() {
>+		getterCalled();
>+		return masterList.size();
>+	}
>+
>+	private void getterCalled() {
>+		ObservableTracker.getterCalled(this);
>+	}
>+
>+	public Object getElementType() {
>+		return detailProperty.getValueType();
>+	}
>+
>+	public Object get(int index) {
>+		getterCalled();
>+		Object masterElement = masterList.get(index);
>+		return detailProperty.getValue(masterElement);
>+	}
>+
>+	public boolean add(Object o) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public boolean addAll(Collection c) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public boolean addAll(int index, Collection c) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public boolean contains(Object o) {
>+		getterCalled();
>+
>+		Iterator it;
>+		if (knownMasterElements != null)
>+			it = knownMasterElements.iterator();
>+		else
>+			it = masterList.iterator();
>+		for (; it.hasNext();) {
>+			if (Util.equals(detailProperty.getValue(it.next()), o))
>+				return true;
>+		}
>+		return false;
>+	}
>+
>+	public boolean isEmpty() {
>+		getterCalled();
>+		return masterList.isEmpty();
>+	}
>+
>+	public boolean isStale() {
>+		getterCalled();
>+		return masterList.isStale();
>+	}
>+
>+	public Iterator iterator() {
>+		getterCalled();
>+		return new Iterator() {
>+			Iterator it = masterList.iterator();
>+
>+			public boolean hasNext() {
>+				getterCalled();
>+				return it.hasNext();
>+			}
>+
>+			public Object next() {
>+				getterCalled();
>+				Object masterElement = it.next();
>+				return detailProperty.getValue(masterElement);
>+			}
>+
>+			public void remove() {
>+				throw new UnsupportedOperationException();
>+			}
>+		};
>+	}
>+
>+	public Object move(int oldIndex, int newIndex) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public boolean remove(Object o) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public boolean removeAll(Collection c) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public boolean retainAll(Collection c) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public Object[] toArray() {
>+		getterCalled();
>+		Object[] masterElements = masterList.toArray();
>+		Object[] result = new Object[masterElements.length];
>+		for (int i = 0; i < result.length; i++) {
>+			result[i] = detailProperty.getValue(masterElements[i]);
>+		}
>+		return result;
>+	}
>+
>+	public Object[] toArray(Object[] a) {
>+		getterCalled();
>+		Object[] masterElements = masterList.toArray();
>+		if (a.length < masterElements.length)
>+			a = (Object[]) Array.newInstance(a.getClass().getComponentType(),
>+					masterElements.length);
>+		for (int i = 0; i < masterElements.length; i++) {
>+			a[i] = detailProperty.getValue(masterElements[i]);
>+		}
>+		return a;
>+	}
>+
>+	public void add(int index, Object o) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public void clear() {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public ListIterator listIterator() {
>+		return listIterator(0);
>+	}
>+
>+	public ListIterator listIterator(final int index) {
>+		getterCalled();
>+		return new ListIterator() {
>+			ListIterator it = masterList.listIterator(index);
>+			Object lastReturned;
>+			boolean haveIterated = false;
>+
>+			public void add(Object arg0) {
>+				throw new UnsupportedOperationException();
>+			}
>+
>+			public boolean hasNext() {
>+				getterCalled();
>+				return it.hasNext();
>+			}
>+
>+			public boolean hasPrevious() {
>+				getterCalled();
>+				return it.hasPrevious();
>+			}
>+
>+			public Object next() {
>+				getterCalled();
>+				Object result = lastReturned = detailProperty.getValue(it
>+						.next());
>+				haveIterated = true;
>+				return result;
>+			}
>+
>+			public int nextIndex() {
>+				getterCalled();
>+				return it.nextIndex();
>+			}
>+
>+			public Object previous() {
>+				getterCalled();
>+				Object result = lastReturned = detailProperty.getValue(it
>+						.previous());
>+				haveIterated = true;
>+				return result;
>+			}
>+
>+			public int previousIndex() {
>+				getterCalled();
>+				return it.previousIndex();
>+			}
>+
>+			public void remove() {
>+				throw new UnsupportedOperationException();
>+			}
>+
>+			public void set(Object o) {
>+				checkRealm();
>+				if (!haveIterated)
>+					throw new IllegalStateException();
>+				// if listeners are registered, the value property listener will
>+				// cause the list change event to fire. otherwise it doesn't
>+				// matter because noone is listening
>+				detailProperty.setValue(lastReturned, o);
>+			}
>+		};
>+	}
>+
>+	public Object remove(int index) {
>+		throw new UnsupportedOperationException();
>+	}
>+
>+	public Object set(int index, Object o) {
>+		checkRealm();
>+		Object masterElement = masterList.get(index);
>+		Object oldValue = detailProperty.getValue(masterElement);
>+		detailProperty.setValue(masterElement, o);
>+		return oldValue;
>+	}
>+
>+	public Object getObserved() {
>+		return masterList;
>+	}
>+
>+	public synchronized void dispose() {
>+		if (masterList != null) {
>+			masterList.removeListChangeListener(masterListener);
>+			masterList = null;
>+			masterListener = null;
>+		}
>+		if (knownMasterElements != null) {
>+			knownMasterElements.clear();
>+			knownMasterElements.dispose();
>+			knownMasterElements = null;
>+			detailListener = null;
>+		}
>+		detailProperty = null;
>+		disposed = true;
>+
>+		super.dispose();
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/PropertyObservableSet.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/PropertyObservableSet.java
>diff -N src/org/eclipse/core/internal/databinding/property/PropertyObservableSet.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/PropertyObservableSet.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,202 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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 IPropertyChangeListener listener;
>+
>+	/**
>+	 * @param realm
>+	 * @param source
>+	 * @param property
>+	 */
>+	public PropertyObservableSet(Realm realm, Object source,
>+			ISetProperty property) {
>+		super(realm);
>+		this.source = source;
>+		this.property = property;
>+
>+		ISetPropertyChangeListener setListener = 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);
>+								}
>+							});
>+						}
>+					});
>+				}
>+			}
>+		};
>+		listener = property.adaptListener(setListener);
>+	}
>+
>+	protected void firstListenerAdded() {
>+		if (!disposed) {
>+			property.addPropertyChangeListener(source, listener);
>+		}
>+	}
>+
>+	protected void lastListenerRemoved() {
>+		if (!disposed) {
>+			property.removePropertyChangeListener(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.removePropertyChangeListener(source, listener);
>+			property = null;
>+			source = null;
>+		}
>+		super.dispose();
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/IPropertyChangeListener.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IPropertyChangeListener.java
>diff -N src/org/eclipse/core/databinding/property/IPropertyChangeListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IPropertyChangeListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,25 @@
>+/*******************************************************************************
>+ * 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
>+ ******************************************************************************/
>+
>+package org.eclipse.core.databinding.property;
>+
>+/**
>+ * Marker interface for "native" property change listeners which wrap a
>+ * particular property change listener.
>+ * 
>+ * @see IValuePropertyChangeListener
>+ * @see ISetPropertyChangeListener
>+ * @see IListPropertyChangeListener
>+ * @see IMapPropertyChangeListener
>+ * @since 1.2
>+ */
>+public interface IPropertyChangeListener {
>+}
>Index: src/org/eclipse/core/databinding/property/CollectionProperty.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/CollectionProperty.java
>diff -N src/org/eclipse/core/databinding/property/CollectionProperty.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/CollectionProperty.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,55 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Abstract implementation of ICollectionProperty.
>+ * 
>+ * @since 1.2
>+ */
>+public abstract class CollectionProperty 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();
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/SetValuePropertyObservableMap.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/SetValuePropertyObservableMap.java
>diff -N src/org/eclipse/core/internal/databinding/property/SetValuePropertyObservableMap.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/SetValuePropertyObservableMap.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,96 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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 IPropertyChangeListener listener;
>+
>+	/**
>+	 * @param keySet
>+	 * @param valueProperty
>+	 */
>+	public SetValuePropertyObservableMap(IObservableSet keySet,
>+			IValueProperty valueProperty) {
>+		super(keySet);
>+		this.property = valueProperty;
>+
>+		IValuePropertyChangeListener valueListener = 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));
>+						}
>+					});
>+				}
>+			}
>+		};
>+		this.listener = property.adaptListener(valueListener);
>+	}
>+
>+	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.addPropertyChangeListener(addedKey, listener);
>+	}
>+
>+	protected void unhookListener(Object removedKey) {
>+		if (!disposed)
>+			property.removePropertyChangeListener(removedKey, listener);
>+	}
>+
>+	public Object getObserved() {
>+		return keySet();
>+	}
>+
>+	public synchronized void dispose() {
>+		super.dispose();
>+
>+		if (!disposed) {
>+			disposed = true;
>+			property = null;
>+			listener = null;
>+		}
>+	}
>+}
>Index: src/org/eclipse/core/internal/databinding/property/PropertyObservableValue.java
>===================================================================
>RCS file: src/org/eclipse/core/internal/databinding/property/PropertyObservableValue.java
>diff -N src/org/eclipse/core/internal/databinding/property/PropertyObservableValue.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/internal/databinding/property/PropertyObservableValue.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,120 @@
>+/*******************************************************************************
>+ * 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.IPropertyChangeListener;
>+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 IPropertyChangeListener listener;
>+
>+	/**
>+	 * @param realm
>+	 * @param source
>+	 * @param property
>+	 */
>+	public PropertyObservableValue(Realm realm, Object source,
>+			IValueProperty property) {
>+		super(realm);
>+		this.source = source;
>+		this.property = property;
>+
>+		IValuePropertyChangeListener valueListener = new IValuePropertyChangeListener() {
>+			public void handleValuePropertyChange(
>+					final ValuePropertyChangeEvent event) {
>+				if (!disposed && !updating) {
>+					getRealm().exec(new Runnable() {
>+						public void run() {
>+							fireValueChange(event.diff);
>+						}
>+					});
>+				}
>+			}
>+		};
>+		this.listener = property.adaptListener(valueListener);
>+	}
>+
>+	protected void firstListenerAdded() {
>+		if (!disposed) {
>+			property.addPropertyChangeListener(source, listener);
>+		}
>+	}
>+
>+	protected void lastListenerRemoved() {
>+		if (!disposed) {
>+			property.removePropertyChangeListener(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.removePropertyChangeListener(source, listener);
>+			property = null;
>+			listener = null;
>+			source = null;
>+		}
>+		super.dispose();
>+	}
>+}
>Index: src/org/eclipse/core/databinding/property/IListPropertyChangeListener.java
>===================================================================
>RCS file: src/org/eclipse/core/databinding/property/IListPropertyChangeListener.java
>diff -N src/org/eclipse/core/databinding/property/IListPropertyChangeListener.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/core/databinding/property/IListPropertyChangeListener.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,27 @@
>+/*******************************************************************************
>+ * 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;
>+
>+/**
>+ * Listener for changes to list properties on a property source
>+ * 
>+ * @since 1.2
>+ */
>+public interface IListPropertyChangeListener {
>+	/**
>+	 * Handle a change to a list property on a specific property source.
>+	 * 
>+	 * @param event
>+	 *            an event describing the list change that occured.
>+	 */
>+	public void handleListPropertyChange(ListPropertyChangeEvent event);
>+}

Actions: View | Diff

Attachments on bug 194734: 106529 | 107000 | 107001 | 107041 | 107042 | 111164 | 111165 | 111335 | 111336 | 111448 | 111449 | 111640 | 111641 | 111717 | 111719 | 111845 | 111846 | 111897 | 111898 | 111993 | 111994 | 112161 | 112162 | 112268 | 112269 | 112360 | 112361 | 112370 | 112371 | 112471 | 112472 | 112606 | 112607 | 112629 | 112630 | 113149 | 113150 | 113165 | 113166 | 114858 | 114859 | 115196 | 115197 | 115284 | 115458 | 115459 | 117500 | 117501 | 117990 | 117991 | 119231 | 119232 | 119274 | 120541 | 120542 | 120651 | 120652 | 120653 | 120654 | 120914 | 120915 | 120989 | 120990 | 121020 | 121021 | 121141 | 121142 | 122228 | 122229 | 122234 | 122235 | 122288 | 122289 | 122609 | 122610 | 122613 | 122614 | 122775 | 122776 | 122813 | 122814 | 122852 | 122853 | 122864 | 122865 | 123137 | 123138