--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/masterdetail/DetailObservableList.d	Tue Apr 21 10:55:51 2009 +0200
@@ -0,0 +1,175 @@
+/*******************************************************************************
+ * 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 147515
+ *     Matthew Hall - bug 221351
+ *******************************************************************************/
+package org.eclipse.core.internal.databinding.observable.masterdetail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.IObserving;
+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.ObservableList;
+import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.observable.value.IValueChangeListener;
+import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
+import org.eclipse.core.runtime.Assert;
+
+/**
+ * @since 3.2
+ * 
+ */
+
+public class DetailObservableList : ObservableList , IObserving {
+
+    private bool updating = false;
+
+    private IListChangeListener innerChangeListener = new class() IListChangeListener {
+        public void handleListChange(ListChangeEvent event) {
+            if (!updating) {
+                fireListChange(event.diff);
+            }
+        }
+    };
+
+    private Object currentOuterValue;
+
+    private IObservableList innerObservableList;
+
+    private IObservableFactory factory;
+
+    private IObservableValue outerObservableValue;
+
+    private Object detailType;
+
+    /**
+     * @param factory
+     * @param outerObservableValue
+     * @param detailType
+     */
+    public this(IObservableFactory factory,
+            IObservableValue outerObservableValue, Object detailType) {
+        super(outerObservableValue.getRealm(), Collections.EMPTY_LIST, detailType);
+        this.factory = factory;
+        this.outerObservableValue = outerObservableValue;
+        this.detailType = detailType;
+        updateInnerObservableList(outerObservableValue);
+
+        outerObservableValue.addValueChangeListener(outerChangeListener);
+    }
+
+    IValueChangeListener outerChangeListener = new class() IValueChangeListener {
+        public void handleValueChange(ValueChangeEvent event) {
+            List oldList = new ArrayList(wrappedList);
+            updateInnerObservableList(outerObservableValue);
+            fireListChange(Diffs.computeListDiff(oldList, wrappedList));
+        }
+    };
+
+    private void updateInnerObservableList(IObservableValue outerObservableValue) {
+        if (innerObservableList !is null) {
+            innerObservableList.removeListChangeListener(innerChangeListener);
+            innerObservableList.dispose();
+        }
+        currentOuterValue = outerObservableValue.getValue();
+        if (currentOuterValue is null) {
+            innerObservableList = null;
+            wrappedList = Collections.EMPTY_LIST;
+        } else {
+            this.innerObservableList = cast(IObservableList) factory
+                    .createObservable(currentOuterValue);
+            wrappedList = innerObservableList;
+
+            if (detailType !is null) {
+                Object innerValueType = innerObservableList.getElementType();
+                Assert.isTrue(getElementType().equals(innerValueType),
+                        "Cannot change value type in a nested observable list"); //$NON-NLS-1$
+            }
+            innerObservableList.addListChangeListener(innerChangeListener);
+        }
+    }
+
+    public bool add(Object o) {
+        return wrappedList.add(o);
+    }
+
+    public void add(int index, Object element) {
+        wrappedList.add(index, element);
+    }
+
+    public bool remove(Object o) {
+        return wrappedList.remove(o);
+    }
+
+    public Object set(int index, Object element) {
+        return wrappedList.set(index, element);
+    }
+
+    public Object move(int oldIndex, int newIndex) {
+        if (innerObservableList !is null)
+            return innerObservableList.move(oldIndex, newIndex);
+        return super.move(oldIndex, newIndex);
+    }
+
+    public Object remove(int index) {
+        return wrappedList.remove(index);
+    }
+
+    public bool addAll(Collection c) {
+        return wrappedList.addAll(c);
+    }
+
+    public bool addAll(int index, Collection c) {
+        return wrappedList.addAll(index, c);
+    }
+
+    public bool removeAll(Collection c) {
+        return wrappedList.removeAll(c);
+    }
+
+    public bool retainAll(Collection c) {
+        return wrappedList.retainAll(c);
+    }
+
+    public void clear() {
+        wrappedList.clear();
+    }
+    
+    public void dispose() {
+        super.dispose();
+
+        if (outerObservableValue !is null) {
+            outerObservableValue.removeValueChangeListener(outerChangeListener);
+            outerObservableValue.dispose();
+        }
+        if (innerObservableList !is null) {
+            innerObservableList.removeListChangeListener(innerChangeListener);
+            innerObservableList.dispose();
+        }
+        currentOuterValue = null;
+        factory = null;
+        innerObservableList = null;
+        innerChangeListener = null;
+    }
+
+    public Object getObserved() {
+        if ( null !is cast(IObserving)innerObservableList ) {
+            return (cast(IObserving) innerObservableList).getObserved();
+        }
+        return null;
+    }
+}