### Eclipse Workspace Patch 1.0
#P org.eclipse.jface.tests.databinding
Index: src/org/eclipse/jface/tests/databinding/BindingTestSuite.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java,v
retrieving revision 1.53
diff -u -r1.53 BindingTestSuite.java
--- src/org/eclipse/jface/tests/databinding/BindingTestSuite.java	4 Jul 2007 20:08:44 -0000	1.53
+++ src/org/eclipse/jface/tests/databinding/BindingTestSuite.java	4 Aug 2007 23:14:20 -0000
@@ -21,6 +21,7 @@
 import org.eclipse.core.tests.databinding.AggregateValidationStatusTest;
 import org.eclipse.core.tests.databinding.DatabindingContextTest;
 import org.eclipse.core.tests.databinding.ListBindingTest;
+import org.eclipse.core.tests.databinding.ObservablesManagerTest;
 import org.eclipse.core.tests.databinding.UpdateStrategyTest;
 import org.eclipse.core.tests.databinding.UpdateValueStrategyTest;
 import org.eclipse.core.tests.databinding.ValueBindingTest;
@@ -138,6 +139,7 @@
 		addTestSuite(UpdateStrategyTest.class);
 		addTestSuite(UpdateValueStrategyTest.class);
 		addTestSuite(ValueBindingTest.class);
+		addTestSuite(ObservablesManagerTest.class);
 
 		// org.eclipse.core.tests.databinding.beans
 		addTestSuite(BeansObservablesTest.class);
@@ -169,16 +171,16 @@
 		addTestSuite(UnionSetRealmTest.class);
 		addTestSuite(WritableSetRealmTest.class);
 		addTestSuite(WritableSetTest.class);
-		
+
 		//org.eclipse.core.tests.databinding.observable.value
 		addTestSuite(AbstractObservableValueTest.class);
 		addTestSuite(AbstractVetoableValueTest.class);
 		addTestSuite(ComputedValueTest.class);
 		addTestSuite(WritableValueTest.class);
-		
+
 		//org.eclipse.core.tests.databinding.validation
 		addTestSuite(ValidationStatusTest.class);
-		
+
 		// org.eclipse.core.tests.internal.databinding
 		addTestSuite(BindingMessagesTest.class);
 		addTestSuite(BindingStatusTest.class);
@@ -220,10 +222,10 @@
 		addTestSuite(JavaBeanObservableSetTest.class);
 		addTestSuite(JavaBeanObservableValueTest.class);
 		addTestSuite(ListenerSupportTest.class);
-		
+
 		//org.eclipse.core.tests.internal.databinding.observable
 		addTestSuite(UnmodifiableObservableListTest.class);
-		
+
 		// org.eclipse.core.tests.internal.databinding.observable.masterdetail
 		addTestSuite(DetailObservableListTest.class);
 		addTestSuite(DetailObservableSetTest.class);
@@ -251,11 +253,11 @@
 
 		//org.eclipse.jface.tests.databinding.swt
 		addTestSuite(SWTObservablesTest.class);
-		
+
 		// org.eclipse.jface.tests.databinding.viewers
 		addTestSuite(ObservableMapLabelProviderTest.class);
 		addTestSuite(ObservableSetContentProviderTest.class);
-		
+
 		//org.eclipse.jface.tests.example.databinding.mask.internal
 		addTestSuite(EditMaskLexerAndTokenTest.class);
 		addTestSuite(EditMaskParserTest.class);
@@ -272,7 +274,7 @@
 		addTestSuite(TableObservableValueTest.class);
 		addTestSuite(TextEditableObservableValueTest.class);
 		addTestSuite(TextObservableValueTest.class);
-		
+
 		//org.eclipse.jface.tests.internal.databinding.internal.viewers
 		addTestSuite(SelectionProviderSingleSelectionObservableValueTest.class);
 	}
Index: src/org/eclipse/core/tests/databinding/ObservablesManagerTest.java
===================================================================
RCS file: src/org/eclipse/core/tests/databinding/ObservablesManagerTest.java
diff -N src/org/eclipse/core/tests/databinding/ObservablesManagerTest.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/core/tests/databinding/ObservablesManagerTest.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,222 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.core.tests.databinding;
+
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.ObservablesManager;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IStaleListener;
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
+
+/**
+ * @since 3.2
+ *
+ */
+public class ObservablesManagerTest extends AbstractDefaultRealmTestCase {
+	private DataBindingContext dbc;
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase#setUp()
+	 */
+	protected void setUp() throws Exception {
+		super.setUp();
+
+		dbc = new DataBindingContext();
+
+	}
+
+	/*
+	 * (non-Javadoc)
+	 *
+	 * @see org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase#tearDown()
+	 */
+	protected void tearDown() throws Exception {
+		if (dbc != null) {
+			dbc.dispose();
+		}
+		super.tearDown();
+	}
+
+	public void testOnlyModelIsDisposed() throws Exception {
+
+		FlagOnDisposeObservableValue targetOv = new FlagOnDisposeObservableValue();
+		FlagOnDisposeObservableValue modelOv = new FlagOnDisposeObservableValue();
+		dbc.bindValue(targetOv, modelOv, null, null);
+
+		ObservablesManager observablesManager = new ObservablesManager();
+
+		observablesManager.addObservablesFromContext(dbc, false, true);
+		observablesManager.dispose();
+
+		assertFalse(targetOv.disposeCalled);
+		assertTrue(modelOv.disposeCalled);
+	}
+
+	public void testOnlyTargetIsDisposed() throws Exception {
+
+		FlagOnDisposeObservableValue targetOv = new FlagOnDisposeObservableValue();
+		FlagOnDisposeObservableValue modelOv = new FlagOnDisposeObservableValue();
+		dbc.bindValue(targetOv, modelOv, null, null);
+
+		ObservablesManager observablesManager = new ObservablesManager();
+
+		observablesManager.addObservablesFromContext(dbc, true, false);
+		observablesManager.dispose();
+
+		assertTrue(targetOv.disposeCalled);
+		assertFalse(modelOv.disposeCalled);
+	}
+
+	public void testTargetAndModelIsDisposed() throws Exception {
+
+		FlagOnDisposeObservableValue targetOv = new FlagOnDisposeObservableValue();
+		FlagOnDisposeObservableValue modelOv = new FlagOnDisposeObservableValue();
+		dbc.bindValue(targetOv, modelOv, null, null);
+
+		ObservablesManager observablesManager = new ObservablesManager();
+
+		observablesManager.addObservablesFromContext(dbc, true, true);
+		observablesManager.dispose();
+
+		assertTrue(targetOv.disposeCalled);
+		assertTrue(modelOv.disposeCalled);
+	}
+
+	private static class FlagOnDisposeObservableValue implements
+			IObservableValue {
+
+		private boolean disposeCalled = false;
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.IObservableValue#addValueChangeListener(org.eclipse.core.databinding.observable.value.IValueChangeListener)
+		 */
+		public void addValueChangeListener(IValueChangeListener listener) {
+			// dummy
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValue()
+		 */
+		public Object getValue() {
+			// dummy
+			return null;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
+		 */
+		public Object getValueType() {
+			// dummy
+			return null;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.IObservableValue#removeValueChangeListener(org.eclipse.core.databinding.observable.value.IValueChangeListener)
+		 */
+		public void removeValueChangeListener(IValueChangeListener listener) {
+			// dummy
+
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.value.IObservableValue#setValue(java.lang.Object)
+		 */
+		public void setValue(Object value) {
+			// dummy
+
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.IObservable#addChangeListener(org.eclipse.core.databinding.observable.IChangeListener)
+		 */
+		public void addChangeListener(IChangeListener listener) {
+			// dummy
+
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.IObservable#addStaleListener(org.eclipse.core.databinding.observable.IStaleListener)
+		 */
+		public void addStaleListener(IStaleListener listener) {
+			// dummy
+
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.IObservable#dispose()
+		 */
+		public void dispose() {
+			disposeCalled = true;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.IObservable#getRealm()
+		 */
+		public Realm getRealm() {
+			return Realm.getDefault();
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.IObservable#isStale()
+		 */
+		public boolean isStale() {
+			// dummy
+			return false;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.IObservable#removeChangeListener(org.eclipse.core.databinding.observable.IChangeListener)
+		 */
+		public void removeChangeListener(IChangeListener listener) {
+			// dummy
+
+		}
+
+		/*
+		 * (non-Javadoc)
+		 *
+		 * @see org.eclipse.core.databinding.observable.IObservable#removeStaleListener(org.eclipse.core.databinding.observable.IStaleListener)
+		 */
+		public void removeStaleListener(IStaleListener listener) {
+			// dummy
+
+		}
+
+	}
+}