Attachment #107780 for bug #241318

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

View | Details | Raw Unified | Return to bug 241318
Collapse All | Expand All

Lines 8-13 Link Here

(-)src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableSet.java (-1 / +3 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Matthew Hall - bug 221351	10	* Matthew Hall - bug 221351
		11	* Ovidio Mallo - bug 241318
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.core.internal.databinding.observable.masterdetail;	13	package org.eclipse.core.internal.databinding.observable.masterdetail;
13		14
Lines 136-147 Link Here
136		137
137	if (outerObservableValue != null) {	138	if (outerObservableValue != null) {
138	outerObservableValue.removeValueChangeListener(outerChangeListener);	139	outerObservableValue.removeValueChangeListener(outerChangeListener);
139	outerObservableValue.dispose();
140	}	140	}
141	if (innerObservableSet != null) {	141	if (innerObservableSet != null) {
142	innerObservableSet.removeSetChangeListener(innerChangeListener);	142	innerObservableSet.removeSetChangeListener(innerChangeListener);
143	innerObservableSet.dispose();	143	innerObservableSet.dispose();
144	}	144	}
		145	outerObservableValue = null;
		146	outerChangeListener = null;
145	currentOuterValue = null;	147	currentOuterValue = null;
146	factory = null;	148	factory = null;
147	innerObservableSet = null;	149	innerObservableSet = null;

Lines 9-14 Link Here

(-)src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableValue.java (-1 / +3 lines)
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bug 164653
11	* Brad Reynolds - bug 147515	11	* Brad Reynolds - bug 147515
		12	* Ovidio Mallo - bug 241318
12	*******************************************************************************/	13	*******************************************************************************/
13	package org.eclipse.core.internal.databinding.observable.masterdetail;	14	package org.eclipse.core.internal.databinding.observable.masterdetail;
14		15
Lines 114-125 Link Here
114		115
115	if (outerObservableValue != null) {	116	if (outerObservableValue != null) {
116	outerObservableValue.removeValueChangeListener(outerChangeListener);	117	outerObservableValue.removeValueChangeListener(outerChangeListener);
117	outerObservableValue.dispose();
118	}	118	}
119	if (innerObservableValue != null) {	119	if (innerObservableValue != null) {
120	innerObservableValue.removeValueChangeListener(innerChangeListener);	120	innerObservableValue.removeValueChangeListener(innerChangeListener);
121	innerObservableValue.dispose();	121	innerObservableValue.dispose();
122	}	122	}
		123	outerObservableValue = null;
		124	outerChangeListener = null;
123	currentOuterValue = null;	125	currentOuterValue = null;
124	factory = null;	126	factory = null;
125	innerObservableValue = null;	127	innerObservableValue = null;

Lines 9-14 Link Here

(-)src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.java (-1 / +3 lines)
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 147515	10	* Brad Reynolds - bug 147515
11	* Matthew Hall - bug 221351	11	* Matthew Hall - bug 221351
		12	* Ovidio Mallo - bug 241318
12	*******************************************************************************/	13	*******************************************************************************/
13	package org.eclipse.core.internal.databinding.observable.masterdetail;	14	package org.eclipse.core.internal.databinding.observable.masterdetail;
14		15
Lines 154-165 Link Here
154		155
155	if (outerObservableValue != null) {	156	if (outerObservableValue != null) {
156	outerObservableValue.removeValueChangeListener(outerChangeListener);	157	outerObservableValue.removeValueChangeListener(outerChangeListener);
157	outerObservableValue.dispose();
158	}	158	}
159	if (innerObservableList != null) {	159	if (innerObservableList != null) {
160	innerObservableList.removeListChangeListener(innerChangeListener);	160	innerObservableList.removeListChangeListener(innerChangeListener);
161	innerObservableList.dispose();	161	innerObservableList.dispose();
162	}	162	}
		163	outerObservableValue = null;
		164	outerChangeListener = null;
163	currentOuterValue = null;	165	currentOuterValue = null;
164	factory = null;	166	factory = null;
165	innerObservableList = null;	167	innerObservableList = null;




 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 208858, 221351, 213145
 *     Ovidio Mallo - bug 241318
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.observable.masterdetail;

	public void testElementTypeNull() throws Exception {
		WritableValue observableValue = new WritableValue(new WritableList(new ArrayList(), Object.class), null);

		WritableListFactory factory = new WritableListFactory();
			Object type = Object.class;

			public IObservable createObservable(Object target) {
				return new WritableList(new ArrayList(), type);
			}
		}

		Factory factory = new Factory();
		DetailObservableList detailObservable = new DetailObservableList(
				factory, observableValue, null);
		assertNull(detailObservable.getElementType());

		WritableValue observableValue = new WritableValue(new WritableList(new ArrayList(), Object.class),
				null);

		WritableListFactory factory = new WritableListFactory();
			Object type = Object.class;

			public IObservable createObservable(Object target) {
				return new WritableList(new ArrayList(), type);
			}
		}

		Factory factory = new Factory();
		DetailObservableList detailObservable = new DetailObservableList(factory,
				observableValue, Object.class);
		assertEquals(factory.type, detailObservable.getElementType());

		}
	}

	/**
	 * Asserts that the master observable value is not disposed upon disposing
	 * its detail observable value (bug 241318).
	 */
	public void testMasterNotDisposedWhenDetailDisposed() {
		class OuterObservable extends WritableValue {
			boolean disposed = false;

			public synchronized void dispose() {
				disposed = true;
				super.dispose();
			}
		}

		OuterObservable outerObservable = new OuterObservable();
		WritableListFactory factory = new WritableListFactory();
		DetailObservableList detailObservable = new DetailObservableList(
				factory, outerObservable, null);

		assertFalse(outerObservable.disposed);

		detailObservable.dispose();
		assertFalse(outerObservable.disposed);
	}

	private static class WritableListFactory implements IObservableFactory {
		Object type = Object.class;

		public IObservable createObservable(Object target) {
			return new WritableList(new ArrayList(), type);
		}
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(DetailObservableListTest.class.getName());
		suite.addTestSuite(DetailObservableListTest.class);




 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 221351, 213145
 *     Ovidio Mallo - bug 241318
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.observable.masterdetail;

		WritableValue observableValue = new WritableValue(new WritableSet(new HashSet(), Object.class),
				null);

		WritableSetFactory factory = new WritableSetFactory();
			Object type;

			public IObservable createObservable(Object target) {
				return new WritableSet(new HashSet(), type);
			}
		}

		Factory factory = new Factory();
		DetailObservableSet detailObservable = new DetailObservableSet(factory,
				observableValue, null);
		assertNull(detailObservable.getElementType());

		WritableValue observableValue = new WritableValue(new WritableSet(new HashSet(), Object.class),
				null);

		WritableSetFactory factory = new WritableSetFactory();
			Object type = Object.class;

			public IObservable createObservable(Object target) {
				return new WritableSet(new HashSet(), type);
			}
		}

		Factory factory = new Factory();
		DetailObservableSet detailObservable = new DetailObservableSet(factory,
				observableValue, Object.class);
		assertEquals(factory.type, detailObservable.getElementType());

		}
	}

	/**
	 * Asserts that the master observable value is not disposed upon disposing
	 * its detail observable value (bug 241318).
	 */
	public void testMasterNotDisposedWhenDetailDisposed() {
		class OuterObservable extends WritableValue {
			boolean disposed = false;

			public synchronized void dispose() {
				disposed = true;
				super.dispose();
			}
		}

		OuterObservable outerObservable = new OuterObservable();
		WritableSetFactory factory = new WritableSetFactory();
		DetailObservableSet detailObservable = new DetailObservableSet(factory,
				outerObservable, null);

		assertFalse(outerObservable.disposed);

		detailObservable.dispose();
		assertFalse(outerObservable.disposed);
	}

	private static class WritableSetFactory implements IObservableFactory {
		Object type = Object.class;

		public IObservable createObservable(Object target) {
			return new WritableSet(new HashSet(), type);
		}
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(DetailObservableSetTest.class.getName());
		suite.addTestSuite(DetailObservableSetTest.class);




 *     Brad Reynolds - initial API and implementation
 *     Brad Reynolds - bug 147515
 *     Matthew Hall - bugs 221351, 213145
 *     Ovidio Mallo - bug 241318
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.observable.masterdetail;

		outerObservable.setValue("2");
		assertNull("value type should be ignored", detailObservable.getValueType());
	}

	/**
	 * Asserts that the master observable value is not disposed upon disposing
	 * its detail observable value (bug 241318).
	 */
	public void testMasterNotDisposedWhenDetailDisposed() {
		class OuterObservable extends WritableValue {
			boolean disposed = false;

			public synchronized void dispose() {
				disposed = true;
				super.dispose();
			}
		}

		OuterObservable outerObservable = new OuterObservable();
		WritableValueFactory factory = new WritableValueFactory();
		DetailObservableValue detailObservable = new DetailObservableValue(
				outerObservable, factory, null);

		assertFalse(outerObservable.disposed);

		detailObservable.dispose();
		assertFalse(outerObservable.disposed);
	}

	/**
	 * Factory that creates WritableValues with the target as the value.
	 */

Return to bug 241318

Lines 8-13 Link Here

(-)src/org/eclipse/core/tests/internal/databinding/observable/masterdetail/DetailObservableListTest.java (-18 / +36 lines)
8	* Contributors:	8	* Contributors:
9	* Brad Reynolds - initial API and implementation	9	* Brad Reynolds - initial API and implementation
10	* Matthew Hall - bugs 208858, 221351, 213145	10	* Matthew Hall - bugs 208858, 221351, 213145
		11	* Ovidio Mallo - bug 241318
11	******************************************************************************/	12	******************************************************************************/
12		13
13	package org.eclipse.core.tests.internal.databinding.observable.masterdetail;	14	package org.eclipse.core.tests.internal.databinding.observable.masterdetail;
Lines 44-58 Link Here
44	public void testElementTypeNull() throws Exception {	45	public void testElementTypeNull() throws Exception {
45	WritableValue observableValue = new WritableValue(new WritableList(new ArrayList(), Object.class), null);	46	WritableValue observableValue = new WritableValue(new WritableList(new ArrayList(), Object.class), null);
46		47
47	class Factory implements IObservableFactory {	48	WritableListFactory factory = new WritableListFactory();
48	Object type = Object.class;
49
50	public IObservable createObservable(Object target) {
51	return new WritableList(new ArrayList(), type);
52	}
53	}
54
55	Factory factory = new Factory();
56	DetailObservableList detailObservable = new DetailObservableList(	49	DetailObservableList detailObservable = new DetailObservableList(
57	factory, observableValue, null);	50	factory, observableValue, null);
58	assertNull(detailObservable.getElementType());	51	assertNull(detailObservable.getElementType());
Lines 72-86 Link Here
72	WritableValue observableValue = new WritableValue(new WritableList(new ArrayList(), Object.class),	65	WritableValue observableValue = new WritableValue(new WritableList(new ArrayList(), Object.class),
73	null);	66	null);
74		67
75	class Factory implements IObservableFactory {	68	WritableListFactory factory = new WritableListFactory();
76	Object type = Object.class;
77
78	public IObservable createObservable(Object target) {
79	return new WritableList(new ArrayList(), type);
80	}
81	}
82
83	Factory factory = new Factory();
84	DetailObservableList detailObservable = new DetailObservableList(factory,	69	DetailObservableList detailObservable = new DetailObservableList(factory,
85	observableValue, Object.class);	70	observableValue, Object.class);
86	assertEquals(factory.type, detailObservable.getElementType());	71	assertEquals(factory.type, detailObservable.getElementType());
Lines 94-99 Link Here
94	}	79	}
95	}	80	}
96		81
		82	/**
		83	* Asserts that the master observable value is not disposed upon disposing
		84	* its detail observable value (bug 241318).
		85	*/
		86	public void testMasterNotDisposedWhenDetailDisposed() {
		87	class OuterObservable extends WritableValue {
		88	boolean disposed = false;
		89
		90	public synchronized void dispose() {
		91	disposed = true;
		92	super.dispose();
		93	}
		94	}
		95
		96	OuterObservable outerObservable = new OuterObservable();
		97	WritableListFactory factory = new WritableListFactory();
		98	DetailObservableList detailObservable = new DetailObservableList(
		99	factory, outerObservable, null);
		100
		101	assertFalse(outerObservable.disposed);
		102
		103	detailObservable.dispose();
		104	assertFalse(outerObservable.disposed);
		105	}
		106
		107	private static class WritableListFactory implements IObservableFactory {
		108	Object type = Object.class;
		109
		110	public IObservable createObservable(Object target) {
		111	return new WritableList(new ArrayList(), type);
		112	}
		113	}
		114
97	public static Test suite() {	115	public static Test suite() {
98	TestSuite suite = new TestSuite(DetailObservableListTest.class.getName());	116	TestSuite suite = new TestSuite(DetailObservableListTest.class.getName());
99	suite.addTestSuite(DetailObservableListTest.class);	117	suite.addTestSuite(DetailObservableListTest.class);