Attachment #132579 for bug #262160

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

Lines 8-16 Link Here

(-)META-INF/MANIFEST.MF (-2 / +4 lines)
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName
9	Bundle-Localization: plugin	9	Bundle-Localization: plugin
10	Bundle-RequiredExecutionEnvironment: J2SE-1.5	10	Bundle-RequiredExecutionEnvironment: J2SE-1.5
11	Export-Package: org.eclipse.emf.databinding	11	Export-Package: org.eclipse.emf.databinding,
		12	org.eclipse.emf.databinding.internal;x-friends:="org.eclipse.emf.databinding.edit"
12	Require-Bundle: org.eclipse.core.runtime,	13	Require-Bundle: org.eclipse.core.runtime,
13	org.eclipse.emf.ecore;visibility:=reexport,	14	org.eclipse.emf.ecore;visibility:=reexport,
14	org.eclipse.core.databinding;visibility:=reexport	15	org.eclipse.core.databinding;visibility:=reexport,
		16	org.eclipse.core.databinding.property;bundle-version="1.2.0"
15	Eclipse-LazyStart: true	17	Eclipse-LazyStart: true
16	Bundle-ActivationPolicy: lazy	18	Bundle-ActivationPolicy: lazy




 */
package org.eclipse.emf.databinding;


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

import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emf.common.notify.NotifyingList;
import org.eclipse.emf.databinding.internal.EWritableList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;

/**
 * PROVISIONAL This API is subject to arbitrary change, including renaming or
 * removal.
 */
public class EMFObservables {
	/**
	 * Returns an observable value for the given feature of the object.
	 * 
	 * @param eObject
	 *            the object to observe.
	 * @param eStructuralFeature
	 *            the feature of the object to observe.
	 * @return an observable value for the given feature of the object.
	 */
	public static IObservableValue observeValue(EObject eObject,
			EStructuralFeature eStructuralFeature) {
		return new EObjectObservableValue(eObject, eStructuralFeature);
	}

	/**
	 * Returns an observable value for the given feature of the object.
	 * 
	 * @param realm
	 *            the realm in which to observe.
	 * @param eObject
	 *            the object to observe.
	 * @param eStructuralFeature
	 *            the feature of the object to observe.
	 * @return an observable value for the given feature of the object.
	 */
	public static IObservableValue observeValue(Realm realm, EObject eObject,
			EStructuralFeature eStructuralFeature) {
		return new EObjectObservableValue(realm, eObject, eStructuralFeature);
	}

	/**
	 * Returns an observable list for the given multi-valued feature of the
	 * object.
	 * 
	 * @param eObject
	 *            the object to observe.
	 * @param eStructuralFeature
	 *            the feature of the object to observe.
	 * @return an observable list for the given multi-valued feature of the
	 *         object.
	 */
	public static IObservableList observeList(EObject eObject,
			EStructuralFeature eStructuralFeature) {
		return new EObjectObservableList(eObject, eStructuralFeature);
	}

	/**
	 * Returns an observable list for the given multi-valued feature of the
	 * object.
	 * 
	 * @param realm
	 *            the realm in which to observe.
	 * @param eObject
	 *            the object to observe.
	 * @param eStructuralFeature
	 *            the feature of the object to observe.
	 * @return an observable list for the given multi-valued feature of the
	 *         object.
	 */
	public static IObservableList observeList(Realm realm, EObject eObject,
			EStructuralFeature eStructuralFeature) {
		return new EObjectObservableList(realm, eObject, eStructuralFeature);
	}

	/**
	 * Returns an observable map in the default realm tracking the current value
	 * of the given feature for each object in the given set.
	 * 
	 * @param objects
	 *            the objects to track.
	 * @param eStructuralFeature
	 *            the feature for which to track the value.
	 * @return an observable map tracking the current value of the given feature
	 *         for each object in the given set.
	 */
	public static IObservableMap observeMap(IObservableSet objects,
			EStructuralFeature eStructuralFeature) {
		return new EObjectObservableMap(objects, eStructuralFeature);
	}

	/**
	 * Returns an array of observable maps in the default realm tracking the
	 * current value of the given features for each object in the given set.
	 * 
	 * @param objects
	 *            the objects to track.
	 * @param eStructuralFeatures
	 *            the features for which to track the value.
	 * @return an array of observable maps tracking the current value of the
	 *         given features for each object in the given set.
	 */
	public static IObservableMap[] observeMaps(IObservableSet objects,
			EStructuralFeature[] eStructuralFeatures) {
		IObservableMap[] result = new IObservableMap[eStructuralFeatures.length];
		for (int i = 0; i < eStructuralFeatures.length; i++) {
			result[i] = observeMap(objects, eStructuralFeatures[i]);
		}
		return result;
	}

	/**
	 * Returns an observable value that tracks the current value of the feature
	 * of the current value of the master observable value.
	 * 
	 * @param realm
	 *            the realm in which to observe.
	 * @param value
	 *            the master observable value.
	 * @param eStructuralFeature
	 *            the feature for which to track the value.
	 * @return an observable value that tracks the current value of the named
	 *         property for the current value of the master observable value
	 * @see MasterDetailObservables#detailValue(IObservableValue,
	 *      IObservableFactory, Object)
	 */
	public static IObservableValue observeDetailValue(Realm realm,
			IObservableValue value, EStructuralFeature eStructuralFeature) {
		return MasterDetailObservables.detailValue(value, valueFactory(realm,
				eStructuralFeature), eStructuralFeature);
	}

	/**
	 * Returns a factory for creating observable values tracking the value of
	 * the given feature of a particular {@link EObject object}.
	 * 
	 * @param realm
	 *            the realm in which to observe.
	 * @param eStructuralFeature
	 *            the feature for which to track the value.
	 * @return an observable factory.
	 */
	public static IObservableFactory valueFactory(final Realm realm,
			final EStructuralFeature eStructuralFeature) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeValue(realm, (EObject) target, eStructuralFeature);
			}
		};
	}

	/**
	 * Returns an observable list that tracks the current value of the feature
	 * of the current value of the master observable value.
	 * 
	 * @param realm
	 *            the realm in which to observe.
	 * @param value
	 *            the master observable value.
	 * @param eStructuralFeature
	 *            the feature for which to track the value.
	 * @return an observable value that tracks the current value of the named
	 *         property for the current value of the master observable value
	 * @see MasterDetailObservables#detailList(IObservableValue,
	 *      IObservableFactory, Object)
	 */
	public static IObservableList observeDetailList(Realm realm,
			IObservableValue value, EStructuralFeature eStructuralFeature) {
		return MasterDetailObservables.detailList(value, listFactory(realm,
				eStructuralFeature), eStructuralFeature);
	}

	/**
	 * Returns a factory for creating observable lists tracking the value of the
	 * given feature of a particular {@link EObject object}.
	 * 
	 * @param realm
	 *            the realm in which to observe.
	 * @param eStructuralFeature
	 *            the feature for which to track the value.
	 * @return an observable factory.
	 */
	public static IObservableFactory listFactory(final Realm realm,
			final EStructuralFeature eStructuralFeature) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeList(realm, (EObject) target, eStructuralFeature);
			}
		};
	}

	/**
	 * Returns a factory for creating observable maps tracking the value of the
	 * given feature of a particular {@link EObject object}.
	 * 
	 * @param eStructuralFeature
	 *            the feature for which to track the value.
	 * @return an observable factory.
	 */
	public static IObservableFactory mapFactory(
			final EStructuralFeature eStructuralFeature) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeMap((IObservableSet) target, eStructuralFeature);
			}
		};
	}

	/**
	 * Returns an observable for the resource contents (
	 * {@link Resource#getContents()})
	 * 
	 * @param resource
	 *            the resources the content should be observed
	 * @return an observable list
	 */
	public static IObservableList observeResourceContents(Resource resource) {
		return new EWritableList<EObject>((NotifyingList<EObject>) resource.getContents());
	}
}




/*******************************************************************************
 * 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)
 *     Martin Frey <martin.frey@logica.com> - bug 256150
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 1.2
 * 
 */
public class EMFPropertyHelper {

	/**
	 * 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(
			EStructuralFeature eStructuralFeature) {
		return Object.class;
	}


	/**
	 * @param propertyDescriptor
	 * @return String description of property descriptor
	 */
	public static String propertyName(EStructuralFeature eStructuralFeature) {
		return eStructuralFeature.getEContainingClass().getName()
				+ "." + eStructuralFeature.getName() + ""; //$NON-NLS-1$ //$NON-NLS-2$
	}

	/**
	 * @param beanClass
	 * @return class name excluding package
	 */
	public static String shortClassName(EStructuralFeature eStructuralFeature) {
		return eStructuralFeature.getEType().getName();
	}
	
	/**
	 * @param beanClass
	 * @return class name excluding package
	 */
	public static String shortClassName(Class<?> beanClass) {
		if (beanClass == null)
			return "?"; //$NON-NLS-1$
		String className = beanClass.getName();
		int lastDot = className.lastIndexOf('.');
		if (lastDot != -1)
			className = className.substring(lastDot + 1);
		return className;
	}
}




/**
 * <copyright>
 *
 * Copyright (c) 2007 BestSolution.at 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:
 * Tom Schindl<tom.schindl@bestsolution.at> - Initial API and implementation
 *
 * </copyright>
 *
 * $Id: $
 */
package org.eclipse.emf.databinding.internal;

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.ObservableTracker;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.AbstractObservableList;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.NotifyingList;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.resource.Resource;

/**
 * Writable list which can be used to observe an {@link NotifyingList}
 * 
 * @param <Type>
 */
public class EWritableList<Type> extends AbstractObservableList implements
		IObservableList {
	private NotifyingList<Type> wrappedList;
	private Object elementType;
	private boolean stale = false;

	private class Listener extends AdapterImpl {
		private Object feature;

		public Listener(Object feature) {
			this.feature = feature;
		}

		@Override
		public void notifyChanged(Notification msg) {

			if (feature == null
					&& msg.getFeature() == null
					&& msg.getFeatureID(Resource.class) != Resource.RESOURCE__CONTENTS) {
				return;
			}

			if (feature == msg.getFeature() && !msg.isTouch()) {
				final ListDiff diff;
				switch (msg.getEventType()) {
				case Notification.ADD: {
					diff = Diffs.createListDiff(Diffs.createListDiffEntry(msg
							.getPosition(), true, msg.getNewValue()));
					// fireListChange(diff);
					break;
				}
				case Notification.ADD_MANY: {
					Collection<?> newValues = (Collection<?>) msg.getNewValue();
					ListDiffEntry[] listDiffEntries = new ListDiffEntry[newValues
							.size()];
					int position = msg.getPosition();
					int index = 0;
					for (Object newValue : newValues) {
						listDiffEntries[index++] = Diffs.createListDiffEntry(
								position++, true, newValue);
					}
					diff = Diffs.createListDiff(listDiffEntries);
					// fireListChange(diff);
					break;
				}
				case Notification.REMOVE: {
					diff = Diffs.createListDiff(Diffs.createListDiffEntry(msg
							.getPosition(), false, msg.getOldValue()));
					// fireListChange(diff);
					break;
				}
				case Notification.REMOVE_MANY: {
					Collection<?> oldValues = (Collection<?>) msg.getOldValue();
					ListDiffEntry[] listDiffEntries = new ListDiffEntry[oldValues
							.size()];
					int position = msg.getPosition();
					int index = 0;
					for (Object oldValue : oldValues) {
						listDiffEntries[index++] = Diffs.createListDiffEntry(
								position++, false, oldValue);
					}
					diff = Diffs.createListDiff(listDiffEntries);
					// fireListChange(diff);
					break;
				}
				case Notification.MOVE: {
					Object movedValue = msg.getNewValue();
					ListDiffEntry[] listDiffEntries = new ListDiffEntry[2];
					listDiffEntries[0] = Diffs.createListDiffEntry(
							(Integer) msg.getOldValue(), false, movedValue);
					listDiffEntries[1] = Diffs.createListDiffEntry(msg
							.getPosition(), true, movedValue);
					diff = Diffs.createListDiff(listDiffEntries);
					// fireListChange(diff);
					break;
				}
				case Notification.UNSET: {
					// This just represents going back to the unset state, but
					// that doesn't affect the contents of the list.
					//
					return;
				}
				default: {
					throw new RuntimeException("unhandled case");
				}
				}

				getRealm().exec(new Runnable() {
					public void run() {
						fireListChange(diff);
					}
				});

				// System.err.println("CHANGE: " +
				// diff.getDifferences()[0].getElement());

				// fireListChange(diff);
				// listener.handlePropertyChange(new SimplePropertyEvent(msg
				// .getNotifier(), EMFListProperty.this, diff));
			}
		}

	}

	private Adapter listener;

	/**
	 * New writable list wrapping the {@link NotifyingList}
	 * 
	 * @param wrappedList
	 *            the wrapped list
	 */
	public EWritableList(NotifyingList<Type> wrappedList) {
		this(Realm.getDefault(), wrappedList);
	}

	/**
	 * New writable list wrapping the {@link NotifyingList} and using the
	 * {@link Realm}
	 * 
	 * @param realm
	 *            the realm
	 * @param wrappedList
	 *            the wrapped list
	 */
	public EWritableList(Realm realm, NotifyingList<Type> wrappedList) {
		this(realm, wrappedList, null);
	}

	/**
	 * New writable list wrapping the {@link NotifyingList}
	 * 
	 * @param realm
	 *            the realm
	 * @param wrappedList
	 *            the wrapped list
	 * @param elementType
	 *            the element type
	 */
	public EWritableList(Realm realm, NotifyingList<Type> wrappedList,
			Class<Type> elementType) {
		super(realm);
		this.wrappedList = wrappedList;
		this.elementType = elementType;
		if (wrappedList.getNotifier() instanceof Notifier) {
			Notifier notifier = (Notifier) wrappedList.getNotifier();
			listener = new Listener(wrappedList.getFeature());
			notifier.eAdapters().add(listener);
		} else {
			throw new IllegalArgumentException(
					"Wrapped list must have a notifier attached!");
		}
	}

	@Override
	public synchronized void dispose() {
		((Notifier) wrappedList.getNotifier()).eAdapters().remove(listener);
		super.dispose();
	}

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

	@SuppressWarnings("unchecked")
	public boolean add(Object o) {
		checkRealm();
		return wrappedList.add((Type) o);
	}

	@SuppressWarnings("unchecked")
	public boolean addAll(Collection c) {
		checkRealm();
		return wrappedList.addAll(c);
	}

	@SuppressWarnings("unchecked")
	public boolean addAll(int index, Collection c) {
		checkRealm();
		return wrappedList.addAll(index, c);
	}

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

	@SuppressWarnings("unchecked")
	public boolean containsAll(Collection c) {
		getterCalled();
		return wrappedList.containsAll(c);
	}

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

	public Object getElementType() {
		checkRealm();
		return elementType;
	}

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

	public boolean isEmpty() {
		getterCalled();
		return wrappedList.isEmpty();
	}

	public Iterator<Type> iterator() {
		getterCalled();
		return wrappedList.iterator();
	}

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

	public ListIterator<Type> listIterator() {
		getterCalled();
		return wrappedList.listIterator();
	}

	public ListIterator<Type> listIterator(int index) {
		getterCalled();
		return wrappedList.listIterator(index);
	}

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

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

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

	@SuppressWarnings("unchecked")
	public boolean removeAll(Collection c) {
		checkRealm();
		return wrappedList.removeAll(c);
	}

	@SuppressWarnings("unchecked")
	public boolean retainAll(Collection c) {
		checkRealm();
		return wrappedList.retainAll(c);
	}

	@SuppressWarnings("unchecked")
	public Object set(int index, Object element) {
		checkRealm();
		return wrappedList.set(index, (Type) element);
	}

	public int doGetSize() {
		getterCalled();
		return wrappedList.size();
	}

	public List<Type> subList(int fromIndex, int toIndex) {
		getterCalled();
		return wrappedList.subList(fromIndex, toIndex);
	}

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

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

	@SuppressWarnings("unchecked")
	public void add(int index, Object element) {
		checkRealm();
		wrappedList.add(index, (Type) element);
	}

	public void clear() {
		checkRealm();
		wrappedList.clear();
	}

	public boolean isStale() {
		getterCalled();
		return stale;
	}

	// public void setStale(boolean stale) {
	// checkRealm();
	//
	// boolean wasStale = this.stale;
	// this.stale = stale;
	// if (!wasStale && stale) {
	// fireStale();
	// }
	// }
}




package org.eclipse.emf.databinding;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

public interface IEMFListValueProperty extends IEMFProperty, IValueProperty {
	public interface Condition {
		public boolean match(int index, Object object);
	}
	
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 * @see #value(IEMFValueProperty)
	 */
	public IEMFValueProperty value(FeaturePath featurePath);

	public IEMFValueProperty value(EStructuralFeature feature);
	
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified detail
	 * value property for the value of the master value property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the string-typed &quot;name&quot; property of a Node object
	 * IBeanValueProperty name = BeanProperties.value(Node.class, &quot;name&quot;);
	 * // Observes the name of the parent of a Node object.
	 * IBeanValueProperty parentName = parent.value(name);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFValueProperty value(IEMFValueProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * list property.
	 * 
	 * @param propertyName
	 *            the list property to observe
	 * @return a master-detail combination of this property and the specified
	 *         list property.
	 * @see #list(IEMFListProperty)
	 */
	public IEMFListProperty list(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * list property. The returned property will observe the specified list
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object.
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the List-typed &quot;children&quot; property of a Node object
	 * // where the elements are Node objects
	 * IBeanListProperty children = BeanProperties.list(Node.class, &quot;children&quot;,
	 * 		Node.class);
	 * // Observes the children of the parent (siblings) of a Node object.
	 * IBeanListProperty siblings = parent.list(children);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         list property.
	 */
	public IEMFListProperty list(IEMFListProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property.
	 * 
	 * @param propertyName
	 *            the set property to observe
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 * @see #set(IEMFSetProperty)
	 */
	public IEMFSetProperty set(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property.
	 * 
	 * @param propertyName
	 *            the set property to observe
	 * @param elementType
	 *            the element type of the named property
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 * @see #set(IEMFSetProperty)
	 */
	public IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property. The returned property will observe the specified set
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object.
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the Set-typed &quot;children&quot; property of a Node object
	 * // where the elements are Node objects
	 * IBeanSetProperty children = BeanProperties.set(Node.class, &quot;children&quot;,
	 * 		Node.class);
	 * // Observes the children of the parent (siblings) of a Node object.
	 * IBeanSetProperty siblings = parent.set(children);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 */
	public IEMFSetProperty set(IEMFSetProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property.
	 * 
	 * @param propertyName
	 *            the map property to observe
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 * @see #map(IEMFMapProperty)
	 */
	public IEMFMapProperty map(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property.
	 * 
	 * @param propertyName
	 *            the map property to observe
	 * @param keyType
	 *            the key type of the named property
	 * @param valueType
	 *            the value type of the named property
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 * @see #map(IEMFMapProperty)
	 */
	public IEMFMapProperty map(EStructuralFeature feature, Class<?> keyType,
			Class<?> valueType);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property. The returned property will observe the specified map
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Contact-typed &quot;supervisor&quot; property of a
	 * // Contact class 
	 * IBeanValueProperty supervisor = BeanProperties.value(Contact.class,
	 * 		&quot;supervisor&quot;);
	 * // Observes the property &quot;phoneNumbers&quot; of a Contact object--a property mapping
	 * // from PhoneNumberType to PhoneNumber &quot;set-typed &quot;children&quot;,
	 * IBeanMapProperty phoneNumbers = BeanProperties.map(Contact.class,
	 * 		&quot;phoneNumbers&quot;, PhoneNumberType.class, PhoneNumber.class);
	 * // Observes the phone numbers of a contact's supervisor:
	 * IBeanMapProperty supervisorPhoneNumbers = supervisor.map(phoneNumbers);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 */
	public IEMFMapProperty map(IEMFMapProperty property);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.core.databinding.property.value.ValueProperty;
import org.eclipse.emf.databinding.EMFProperties;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFListProperty;
import org.eclipse.emf.databinding.IEMFListValueProperty;
import org.eclipse.emf.databinding.IEMFMapProperty;
import org.eclipse.emf.databinding.IEMFSetProperty;
import org.eclipse.emf.databinding.IEMFValueProperty;
import org.eclipse.emf.databinding.IEMFListValueProperty.Condition;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 3.3
 * 
 */
public class EMFValuePropertyDecorator extends ValueProperty implements
		IEMFValueProperty {
	private final IValueProperty delegate;
	private final EStructuralFeature eStructuralFeature;

	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFValuePropertyDecorator(IValueProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

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

	public IEMFValueProperty value(EStructuralFeature feature) {
		return value(FeaturePath.fromList(feature));
	}
	
	public IEMFValueProperty value(FeaturePath featurePath) {
		return value(EMFProperties.value(featurePath));
	}
	
	public IEMFValueProperty value(IEMFValueProperty property) {
		return new EMFValuePropertyDecorator(super.value(property), property
				.getStructuralFeature());
	}
	
	public IEMFListValueProperty listValue(EStructuralFeature feature, Condition condition) {
		return listValue(FeaturePath.fromList(feature),condition);
	}
	
	public IEMFListValueProperty listValue(FeaturePath featurePath, Condition condition) {
//		return listValue(EMFProperties.listValue(featurePath,condition));
		return null;
	}
	
//	public IEMFValueProperty listValue(IEMFListValueProperty property) {
//		return new EMFListValuePropertyDecorator(super.value(property), property
//				.getStructuralFeature());
//	}

	public IEMFListProperty list(EStructuralFeature feature) {
		return list(EMFProperties.list(feature));
	}

	public IEMFListProperty list(IEMFListProperty property) {
		return new EMFListPropertyDecorator(super.list(property), property
				.getStructuralFeature());
	}

	public IEMFSetProperty set(EStructuralFeature feature) {
		return set(feature, null);
	}

	public IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType) {
		return set(EMFProperties.set(feature, elementType));
	}

	public IEMFSetProperty set(IEMFSetProperty property) {
		return new EMFSetPropertyDecorator(super.set(property), property
				.getStructuralFeature());
	}

	public IEMFMapProperty map(EStructuralFeature feature) {
		return map(feature, null, null);
	}

	public IEMFMapProperty map(EStructuralFeature feature, Class<?> keyType,
			Class<?> valueType) {
		return map(EMFProperties.map(feature, keyType,
				valueType));
	}

	public IEMFMapProperty map(IEMFMapProperty property) {
		return new EMFMapPropertyDecorator(super.map(property), property
				.getStructuralFeature());
	}

	public IObservableValue observe(Object source) {
		return new EMFObservableValueDecorator(delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableValue observe(Realm realm, Object source) {
		return new EMFObservableValueDecorator(delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory valueFactory() {
		return delegate.valueFactory();
	}

	public IObservableFactory valueFactory(Realm realm) {
		return delegate.valueFactory(realm);
	}

	public IObservableValue observeDetail(IObservableValue master) {
		return new EMFObservableValueDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableList observeDetail(IObservableList master) {
		return new EMFObservableListDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableMap observeDetail(IObservableSet master) {
		return new EMFObservableMapDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableMap observeDetail(IObservableMap master) {
		return new EMFObservableMapDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




/*******************************************************************************
 * 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 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.map.DecoratingObservableMap;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.emf.databinding.IEMFObservable;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableMap}.
 * 
 * @since 3.3
 */
public class EMFObservableMapDecorator extends DecoratingObservableMap
		implements IEMFObservable {
	private EStructuralFeature eStructuralFeature;

	/**
	 * @param decorated
	 * @param propertyDescriptor
	 */
	public EMFObservableMapDecorator(IObservableMap decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, true);
		this.eStructuralFeature = eStructuralFeature;
	}

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

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

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}
}




/*******************************************************************************
 * 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)
 *     Matthew Hall - bugs 195222, 264307, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import java.util.List;

import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.ISimplePropertyListener;
import org.eclipse.core.databinding.property.list.SimpleListProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 3.3
 * 
 */
public class EMFListProperty extends SimpleListProperty {
	private EStructuralFeature eStructuralFeature;

	/**
	 * @param propertyDescriptor
	 * @param elementType
	 */
	public EMFListProperty(EStructuralFeature eStructuralFeature) {
		this.eStructuralFeature = eStructuralFeature;
	}
	
	protected EStructuralFeature getFeature() {
		return eStructuralFeature;
	}

	public Object getElementType() {
		return eStructuralFeature;
	}

	protected List<?> doGetList(Object source) {
		EObject eObj = (EObject) source;
		return (List<?>) eObj.eGet(eStructuralFeature);
	}

	@SuppressWarnings("unchecked")
	protected void doSetList(Object source, List list, ListDiff diff) {
		List<?> currentList = doGetList(source);
		diff.applyTo(currentList);
	}

	public INativePropertyListener adaptListener(
			final ISimplePropertyListener listener) {
		return new EMFPropertyListener.EMFListPropertyListener() {

			@Override
			protected EStructuralFeature getFeature() {
				return eStructuralFeature;
			}

			@Override
			protected ISimplePropertyListener getListener() {
				return listener;
			}

			@Override
			protected IProperty getOwner() {
				return EMFListProperty.this;
			}
		};
	}

	public String toString() {
		String s = EMFPropertyHelper.propertyName(eStructuralFeature) + "[]"; //$NON-NLS-1$
		s += "<" + EMFPropertyHelper.shortClassName(eStructuralFeature) + ">"; //$NON-NLS-1$//$NON-NLS-2$
		return s;
	}

}




/*******************************************************************************
 * 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
 *     Matthew Hall - bug 118516
 *******************************************************************************/
package org.eclipse.emf.databinding.internal;

import org.eclipse.core.runtime.Assert;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.ecore.EObject;

/**
 * This is a helper that will hook up and listen for
 * <code>PropertyChangeEvent</code> events for a set of target JavaBeans
 * 
 * @since 1.0
 */
public class EMFPropertyListenerSupport {
	/**
	 * Start listen to target (if it supports the JavaBean property change
	 * listener pattern)
	 * 
	 * @param bean
	 * @param propertyName
	 * @param listener
	 */
	public static void hookListener(EObject bean, Adapter listener) {
		Assert.isNotNull(bean, "Bean cannot be null"); //$NON-NLS-1$
		Assert.isNotNull(listener, "Listener cannot be null"); //$NON-NLS-1$
		bean.eAdapters().add(listener);
	}

	/**
	 * Stop listen to target
	 * 
	 * @param bean
	 * @param propertyName
	 * @param listener
	 */
	public static void unhookListener(EObject bean, Adapter listener) {
		Assert.isNotNull(bean, "Bean cannot be null"); //$NON-NLS-1$
		Assert.isNotNull(listener, "Listener cannot be null"); //$NON-NLS-1$
		bean.eAdapters().remove(listener);
	}
}




package org.eclipse.emf.databinding.internal;

import java.util.Collection;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.ISimplePropertyListener;
import org.eclipse.core.databinding.property.SimplePropertyEvent;
import org.eclipse.core.databinding.property.value.SimpleValueProperty;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.databinding.IEMFListValueProperty.Condition;
import org.eclipse.emf.ecore.EStructuralFeature;

public class EMFListValueProperty extends SimpleValueProperty {
	private EStructuralFeature eStructuralFeature;
	private Condition condition;

	public EMFListValueProperty(EStructuralFeature eStructuralFeature,
			Condition condition) {
		this.eStructuralFeature = eStructuralFeature;
		this.condition = condition;
	}

	@Override
	public INativePropertyListener adaptListener(
			final ISimplePropertyListener listener) {
		return new EMFPropertyListenerImpl() {

			@Override
			protected ISimplePropertyListener getListener() {
				return listener;
			}

			@Override
			protected EStructuralFeature getFeature() {
				return eStructuralFeature;
			}

			@Override
			protected IProperty getOwner() {
				return EMFListValueProperty.this;
			}

			protected Condition getCondition() {
				return condition;
			}
		};
	}

	@Override
	protected Object doGetValue(Object source) {
		// TODO Auto-generated method stub
		return null;
	}

	@Override
	protected void doSetValue(Object source, Object value) {
		// TODO Auto-generated method stub

	}

	public Object getValueType() {
		return eStructuralFeature;
	}

	private abstract class EMFPropertyListenerImpl extends EMFPropertyListener {

		@Override
		public void notifyChanged(Notification msg) {
			if (getFeature() == msg.getFeature() && !msg.isTouch()) {
				Condition condition = getCondition();
				ValueDiff diff = null;

				switch (msg.getEventType()) {
				case Notification.ADD: {
					if (condition.match(msg.getPosition(), msg.getNewValue())) {
						diff = Diffs.createValueDiff(null, msg.getNewValue());
					}
					break;
				}
				case Notification.ADD_MANY: {
					for (Object o : (Collection<?>) msg.getNewValue()) {
						if (condition.match(msg.getPosition(), o)) {
							diff = Diffs.createValueDiff(null, o);
							break;
						}
					}
					break;
				}
				case Notification.REMOVE: {
					if (condition.match(msg.getPosition(), msg.getNewValue())) {
						diff = Diffs.createValueDiff(msg.getOldValue(), null);
					}
					break;
				}
				case Notification.REMOVE_MANY: {
					for (Object o : (Collection<?>) msg.getOldValue()) {
						if (condition.match(msg.getPosition(), o)) {
							diff = Diffs.createValueDiff(null, o);
							break;
						}
					}
					break;
				}
					// case Notification.SET:
					// case Notification.RESOLVE: {
					// ListDiffEntry[] listDiffEntries = new ListDiffEntry[2];
					// listDiffEntries[0] = Diffs.createListDiffEntry(msg
					// .getPosition(), false, msg.getOldValue());
					// listDiffEntries[1] = Diffs.createListDiffEntry(msg
					// .getPosition(), true, msg.getNewValue());
					// diff = Diffs.createListDiff(listDiffEntries);
					// break;
					// }
				case Notification.MOVE: {
					if (condition.match(msg.getPosition(), msg.getNewValue())) {
						diff = Diffs.createValueDiff(msg.getOldValue(), null);
					}
					break;
				}
				case Notification.UNSET: {
					// This just represents going back to the unset state, but
					// that doesn't affect the contents of the list.
					//
					return;
				}
				default: {
					throw new RuntimeException("unhandled case");
				}
				}

				if (diff != null) {
					getListener().handleEvent(
							(new SimplePropertyEvent(
									SimplePropertyEvent.CHANGE, msg
											.getNotifier(), getOwner(), diff)));
				}
			}

		}

		protected abstract Condition getCondition();

	}
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Brad Reynolds - bug 147515
 ******************************************************************************/

package org.eclipse.emf.databinding;

import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * Provides access to details of bean observables.
 * <p>
 * This interface is not meant to be implemented by clients.
 * </p>
 * 
 * @since 3.3
 */
public interface IEMFObservable extends IObserving {
	/**
	 * @return property descriptor of the property being observed,
	 *         <code>null</code> if the runtime time information was not
	 *         provided on construction of the observable
	 */
	public EStructuralFeature getStructuralFeature();
}




/*******************************************************************************
 * 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)
 *     Matthew Hall - bug 195222, 264307, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.property.INativePropertyListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.ISimplePropertyListener;
import org.eclipse.core.databinding.property.value.SimpleValueProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.util.ExtendedMetaData;

/**
 * @since 3.3
 * 
 */
public class EMFValueProperty extends SimpleValueProperty {
	private final EStructuralFeature eStructuralFeature;

	/**
	 * @param propertyDescriptor
	 * @param valueType
	 */
	public EMFValueProperty(EStructuralFeature eStructuralFeature) {
		this.eStructuralFeature = eStructuralFeature;
	}

	public Object getValueType() {
		return eStructuralFeature;
	}
	
	protected EStructuralFeature getFeature() {
		return eStructuralFeature;
	}

	protected Object doGetValue(Object source) {
		EObject eObj = (EObject) source;
		return ExtendedMetaData.INSTANCE.getAffiliation(eObj.eClass(), eStructuralFeature) == null ?
				        null : eObj.eGet(eStructuralFeature);
	}

	protected void doSetValue(Object source, Object value) {
		EObject eObject = (EObject) source;
		eObject.eSet(eStructuralFeature, value);
	}

	public INativePropertyListener adaptListener(
			final ISimplePropertyListener listener) {
		return new EMFPropertyListener.EMFValuePropertyListener(){
		
			@Override
			protected IProperty getOwner() {
				return EMFValueProperty.this;
			}
		
			@Override
			protected ISimplePropertyListener getListener() {
				return listener;
			}
		
			@Override
			protected EStructuralFeature getFeature() {
				return eStructuralFeature;
			}
		};
	}

	public String toString() {
		String s = EMFPropertyHelper.propertyName(eStructuralFeature);
		s += "<" + EMFPropertyHelper.shortClassName(eStructuralFeature) + ">"; //$NON-NLS-1$//$NON-NLS-2$
		return s;
	}
}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.emf.databinding.IEMFListValueProperty.Condition;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link IValueProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFValueProperty extends IEMFProperty, IValueProperty {
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 * @see #value(IEMFValueProperty)
	 */
	public IEMFValueProperty value(FeaturePath featurePath);

	public IEMFValueProperty value(EStructuralFeature feature);
	
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified detail
	 * value property for the value of the master value property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the string-typed &quot;name&quot; property of a Node object
	 * IBeanValueProperty name = BeanProperties.value(Node.class, &quot;name&quot;);
	 * // Observes the name of the parent of a Node object.
	 * IBeanValueProperty parentName = parent.value(name);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFValueProperty value(IEMFValueProperty property);
	
	public IEMFListValueProperty listValue(FeaturePath featurePath, Condition condition);

	public IEMFListValueProperty listValue(EStructuralFeature feature, Condition condition);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * list property.
	 * 
	 * @param propertyName
	 *            the list property to observe
	 * @return a master-detail combination of this property and the specified
	 *         list property.
	 * @see #list(IEMFListProperty)
	 */
	public IEMFListProperty list(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * list property. The returned property will observe the specified list
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object.
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the List-typed &quot;children&quot; property of a Node object
	 * // where the elements are Node objects
	 * IBeanListProperty children = BeanProperties.list(Node.class, &quot;children&quot;,
	 * 		Node.class);
	 * // Observes the children of the parent (siblings) of a Node object.
	 * IBeanListProperty siblings = parent.list(children);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         list property.
	 */
	public IEMFListProperty list(IEMFListProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property.
	 * 
	 * @param propertyName
	 *            the set property to observe
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 * @see #set(IEMFSetProperty)
	 */
	public IEMFSetProperty set(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property.
	 * 
	 * @param propertyName
	 *            the set property to observe
	 * @param elementType
	 *            the element type of the named property
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 * @see #set(IEMFSetProperty)
	 */
	public IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property. The returned property will observe the specified set
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object.
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the Set-typed &quot;children&quot; property of a Node object
	 * // where the elements are Node objects
	 * IBeanSetProperty children = BeanProperties.set(Node.class, &quot;children&quot;,
	 * 		Node.class);
	 * // Observes the children of the parent (siblings) of a Node object.
	 * IBeanSetProperty siblings = parent.set(children);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 */
	public IEMFSetProperty set(IEMFSetProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property.
	 * 
	 * @param propertyName
	 *            the map property to observe
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 * @see #map(IEMFMapProperty)
	 */
	public IEMFMapProperty map(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property.
	 * 
	 * @param propertyName
	 *            the map property to observe
	 * @param keyType
	 *            the key type of the named property
	 * @param valueType
	 *            the value type of the named property
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 * @see #map(IEMFMapProperty)
	 */
	public IEMFMapProperty map(EStructuralFeature feature, Class<?> keyType,
			Class<?> valueType);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property. The returned property will observe the specified map
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Contact-typed &quot;supervisor&quot; property of a
	 * // Contact class 
	 * IBeanValueProperty supervisor = BeanProperties.value(Contact.class,
	 * 		&quot;supervisor&quot;);
	 * // Observes the property &quot;phoneNumbers&quot; of a Contact object--a property mapping
	 * // from PhoneNumberType to PhoneNumber &quot;set-typed &quot;children&quot;,
	 * IBeanMapProperty phoneNumbers = BeanProperties.map(Contact.class,
	 * 		&quot;phoneNumbers&quot;, PhoneNumberType.class, PhoneNumber.class);
	 * // Observes the phone numbers of a contact's supervisor:
	 * IBeanMapProperty supervisorPhoneNumbers = supervisor.map(phoneNumbers);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 */
	public IEMFMapProperty map(IEMFMapProperty property);
}




package org.eclipse.emf.databinding.internal;

import java.util.Collection;
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.INativePropertyListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.ISimplePropertyListener;
import org.eclipse.core.databinding.property.SimplePropertyEvent;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

public abstract class EMFPropertyListener extends AdapterImpl implements
		INativePropertyListener {

	public void addTo(Object source) {
		EMFPropertyListenerSupport.hookListener((EObject) source, this);
	}

	public void removeFrom(Object source) {
		EMFPropertyListenerSupport.unhookListener((EObject) source, this);
	}

	@Override
	public abstract void notifyChanged(Notification msg);

	protected abstract ISimplePropertyListener getListener();

	protected abstract EStructuralFeature getFeature();

	protected abstract IProperty getOwner();

	public abstract static class EMFListPropertyListener extends
			EMFPropertyListener {
		@Override
		public void notifyChanged(Notification msg) {
			if (getFeature() == msg.getFeature() && !msg.isTouch()) {
				final ListDiff diff;
				switch (msg.getEventType()) {
				case Notification.ADD: {
					diff = Diffs.createListDiff(Diffs.createListDiffEntry(msg
							.getPosition(), true, msg.getNewValue()));
					break;
				}
				case Notification.ADD_MANY: {
					Collection<?> newValues = (Collection<?>) msg.getNewValue();
					ListDiffEntry[] listDiffEntries = new ListDiffEntry[newValues
							.size()];
					int position = msg.getPosition();
					int index = 0;
					for (Object newValue : newValues) {
						listDiffEntries[index++] = Diffs.createListDiffEntry(
								position++, true, newValue);
					}
					diff = Diffs.createListDiff(listDiffEntries);
					break;
				}
				case Notification.REMOVE: {
					diff = Diffs.createListDiff(Diffs.createListDiffEntry(msg
							.getPosition(), false, msg.getOldValue()));
					break;
				}
				case Notification.REMOVE_MANY: {
					Collection<?> oldValues = (Collection<?>) msg.getOldValue();
					ListDiffEntry[] listDiffEntries = new ListDiffEntry[oldValues
							.size()];
					int position = msg.getPosition();
					int index = 0;
					for (Object oldValue : oldValues) {
						listDiffEntries[index++] = Diffs.createListDiffEntry(
								position++, false, oldValue);
					}
					diff = Diffs.createListDiff(listDiffEntries);
					break;
				}
				case Notification.SET:
				case Notification.RESOLVE: {
					ListDiffEntry[] listDiffEntries = new ListDiffEntry[2];
					listDiffEntries[0] = Diffs.createListDiffEntry(msg
							.getPosition(), false, msg.getOldValue());
					listDiffEntries[1] = Diffs.createListDiffEntry(msg
							.getPosition(), true, msg.getNewValue());
					diff = Diffs.createListDiff(listDiffEntries);
					break;
				}
				case Notification.MOVE: {
					Object movedValue = msg.getNewValue();
					ListDiffEntry[] listDiffEntries = new ListDiffEntry[2];
					listDiffEntries[0] = Diffs.createListDiffEntry(
							(Integer) msg.getOldValue(), false, movedValue);
					listDiffEntries[1] = Diffs.createListDiffEntry(msg
							.getPosition(), true, movedValue);
					diff = Diffs.createListDiff(listDiffEntries);
					break;
				}
				case Notification.UNSET: {
					// This just represents going back to the unset state, but
					// that doesn't affect the contents of the list.
					//
					return;
				}
				default: {
					throw new RuntimeException("unhandled case");
				}
				}
				getListener().handleEvent(
						(new SimplePropertyEvent(SimplePropertyEvent.CHANGE,
								msg.getNotifier(), getOwner(), diff)));
			}
		}
	}

	public abstract static class EMFMapPropertyListener extends
			EMFPropertyListener {
		@Override
		public void notifyChanged(Notification msg) {
			if (getFeature() == msg.getFeature() && !msg.isTouch()) {
				getListener().handleEvent(
						new SimplePropertyEvent(SimplePropertyEvent.CHANGE, msg
								.getNotifier(), getOwner(), Diffs
								.computeMapDiff((Map<?, ?>) msg.getOldValue(),
										(Map<?, ?>) msg.getNewValue())));
			}
		}
	}

	public abstract static class EMFSetPropertyListener extends
			EMFPropertyListener {
		@Override
		public void notifyChanged(Notification msg) {
			if (getFeature() == msg.getFeature() && !msg.isTouch()) {
				getListener().handleEvent(
						new SimplePropertyEvent(SimplePropertyEvent.CHANGE, msg
								.getNotifier(), getOwner(), Diffs
								.computeSetDiff((Set<?>) msg.getOldValue(),
										(Set<?>) msg.getNewValue())));
			}
		}
	}

	public abstract static class EMFValuePropertyListener extends
			EMFPropertyListener {
		@Override
		public void notifyChanged(Notification msg) {
			if (getFeature() == msg.getFeature() && !msg.isTouch()) {
				getListener().handleEvent(
						new SimplePropertyEvent(SimplePropertyEvent.CHANGE, msg
								.getNotifier(), getOwner(), Diffs
								.createValueDiff(msg.getOldValue(), msg
										.getNewValue())));
			}
		}
	}
}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link IListProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 */
public interface IEMFListProperty extends IEMFProperty, IListProperty {
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a nested combination of this property and the specified value
	 *         property.
	 * @see #values(IEMFValueProperty)
	 */
	public IEMFListProperty values(FeaturePath featurePath);
	
	public IEMFListProperty values(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified value
	 * property for all elements observed by this list property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the list-typed &quot;children&quot; property of a Person object,
	 * // where the elements are Person objects
	 * IBeanListProperty children = BeanProperties.list(Person.class, &quot;children&quot;,
	 * 		Person.class);
	 * // Observes the string-typed &quot;name&quot; property of a Person object
	 * IBeanValueProperty name = BeanProperties.value(Person.class, &quot;name&quot;);
	 * // Observes the names of children of a Person object.
	 * IBeanListProperty childrenNames = children.values(name);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFListProperty values(IEMFValueProperty property);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 194734)
 ******************************************************************************/

package org.eclipse.emf.databinding;

import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An IProperty extension interface providing access to details of bean
 * properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFProperty extends IProperty {
	/**
	 * Returns the property descriptor of the bean property being observed. This
	 * method returns null in the case of anonymous properties.
	 * 
	 * @return the property descriptor of the bean property being observed
	 */
	public EStructuralFeature getStructuralFeature();
}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding;

import java.util.Map;

import org.eclipse.core.databinding.property.map.IMapProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link IMapProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFMapProperty extends IEMFProperty, IMapProperty {

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 * @see #values(IEMFValueProperty)
	 */
	public IEMFMapProperty values(FeaturePath featurePath);
	
	public IEMFMapProperty values(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified value
	 * property for all {@link Map#values() values} observed by this map
	 * property, mapping from this map property's {@link Map#keySet() key set}
	 * to the specified value property's value for each element in the master
	 * property's {@link Map#values() values} collection.
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFMapProperty values(IEMFValueProperty property);
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 208858, 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.list.DecoratingObservableList;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.emf.databinding.IEMFObservable;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableList}.
 * 
 * @since 3.3
 */
public class EMFObservableListDecorator extends DecoratingObservableList
		implements IEMFObservable {
	private EStructuralFeature eStructuralFeature;

	/**
	 * @param decorated
	 * @param propertyDescriptor
	 */
	public EMFObservableListDecorator(IObservableList decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, true);
		this.eStructuralFeature = eStructuralFeature;
	}

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

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

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}
}




/*******************************************************************************
 * 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 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.list.ListProperty;
import org.eclipse.emf.databinding.EMFProperties;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFListProperty;
import org.eclipse.emf.databinding.IEMFValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 3.3
 * 
 */
public class EMFListPropertyDecorator extends ListProperty implements
		IEMFListProperty {
	private final IListProperty delegate;
	private final EStructuralFeature eStructuralFeature;
	
	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFListPropertyDecorator(IListProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
	}

	public Object getElementType() {
		return delegate.getElementType();
	}
	
	public IEMFListProperty values(EStructuralFeature feature) {
		return values(FeaturePath.fromList(feature));
	}

	public IEMFListProperty values(FeaturePath featurePath) {
		return values(EMFProperties.value(featurePath));
	}

	public IEMFListProperty values(IEMFValueProperty property) {
		return new EMFListPropertyDecorator(super.values(property), property
				.getStructuralFeature());
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

	public IObservableList observe(Object source) {
		return new EMFObservableListDecorator(delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableList observe(Realm realm, Object source) {
		return new EMFObservableListDecorator(delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory listFactory() {
		return delegate.listFactory();
	}

	public IObservableFactory listFactory(Realm realm) {
		return delegate.listFactory(realm);
	}

	public IObservableList observeDetail(IObservableValue master) {
		return new EMFObservableListDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




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

/**
 * @since 3.3
 * 
 */
public class Util {

	/**
	 * Checks whether the two objects are <code>null</code> -- allowing for
	 * <code>null</code>.
	 * 
	 * @param left
	 *            The left object to compare; may be <code>null</code>.
	 * @param right
	 *            The right object to compare; may be <code>null</code>.
	 * @return <code>true</code> if the two objects are equivalent;
	 *         <code>false</code> otherwise.
	 */
	public static final boolean equals(final Object left, final Object right) {
		return left == null ? right == null : ((right != null) && left
				.equals(right));
	}
}




/*******************************************************************************
 * 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)
 *     Matthew Hall - bugs 195222, 264307, 265064, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import java.util.Set;

import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.ISimplePropertyListener;
import org.eclipse.core.databinding.property.set.SimpleSetProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 3.3
 * 
 */
public class EMFSetProperty extends SimpleSetProperty {
	private final EStructuralFeature eStructuralFeature;
	private final Class<?> elementType;

	/**
	 * @param propertyDescriptor
	 * @param elementType
	 */
	public EMFSetProperty(EStructuralFeature eStructuralFeature,
			Class<?> elementType) { 
		this.eStructuralFeature = eStructuralFeature;
		this.elementType = elementType == null ? EMFPropertyHelper
				.getCollectionPropertyElementType(eStructuralFeature)
				: elementType;
	}
	
	protected EStructuralFeature getFeature() {
		return eStructuralFeature;
	}

	public Object getElementType() {
		return elementType;
	}

	protected Set<?> doGetSet(Object source) {
		EObject eObj = (EObject) source;
	    return (Set<?>) eObj.eGet(eStructuralFeature);
	}

	@SuppressWarnings("unchecked")
	protected void doSetSet(Object source, Set set, SetDiff diff) {
		EObject eObject = (EObject) source;
	    eObject.eSet(eStructuralFeature, set);
	}

	public INativePropertyListener adaptListener(
			final ISimplePropertyListener listener) {
		return new EMFPropertyListener.EMFSetPropertyListener(){
		
			@Override
			protected IProperty getOwner() {
				return EMFSetProperty.this;
			}
		
			@Override
			protected ISimplePropertyListener getListener() {
				return listener;
			}
		
			@Override
			protected EStructuralFeature getFeature() {
				return eStructuralFeature;
			}
		};
	}

	public String toString() {
		String s = EMFPropertyHelper.propertyName(eStructuralFeature) + "{}"; //$NON-NLS-1$
		if (elementType != null)
			s += "<" + EMFPropertyHelper.shortClassName(elementType) + ">"; //$NON-NLS-1$//$NON-NLS-2$
		return s;
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.set.DecoratingObservableSet;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.emf.databinding.IEMFObservable;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableSet}.
 * 
 * @since 3.3
 */
public class EMFObservableSetDecorator extends DecoratingObservableSet
		implements IEMFObservable {
	private EStructuralFeature eStructuralFeature;

	/**
	 * @param decorated
	 * @param propertyDescriptor
	 */
	public EMFObservableSetDecorator(IObservableSet decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, true);
		this.eStructuralFeature = eStructuralFeature;
	}

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

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

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.value.DecoratingObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emf.databinding.IEMFObservable;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableValue}.
 * 
 * @since 3.3
 */
public class EMFObservableValueDecorator extends DecoratingObservableValue
		implements IEMFObservable {
	private EStructuralFeature eStructuralFeature;

	/**
	 * @param decorated
	 * @param propertyDescriptor
	 */
	public EMFObservableValueDecorator(IObservableValue decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, true);
		this.eStructuralFeature = eStructuralFeature;
	}

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

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

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}
}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding;

import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link ISetProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFSetProperty extends IEMFProperty, ISetProperty {
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 * @see #values(IEMFValueProperty)
	 */
	public IEMFMapProperty values(FeaturePath featurePath);
	
	public IEMFMapProperty values(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified value
	 * property for all elements observed by this set property, mapping from
	 * this set property's elements (keys) to the specified value property's
	 * value for each element (values).
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the set-typed &quot;children&quot; property of a Person object,
	 * // where the elements are Person objects
	 * IBeanSetProperty children = BeanProperties.set(Person.class, &quot;children&quot;,
	 * 		Person.class);
	 * // Observes the string-typed &quot;name&quot; property of a Person object
	 * IBeanValueProperty name = BeanProperties.value(Person.class, &quot;name&quot;);
	 * // Observes a map of children objects to their respective names.
	 * IBeanMapProperty childrenNames = children.values(name);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFMapProperty values(IEMFValueProperty property);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 194734)
 *     Matthew Hall - bug 195222, 247997, 261843, 264307
 ******************************************************************************/

package org.eclipse.emf.databinding;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.map.IMapProperty;
import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.emf.databinding.IEMFListValueProperty.Condition;
import org.eclipse.emf.databinding.internal.EMFListProperty;
import org.eclipse.emf.databinding.internal.EMFListPropertyDecorator;
import org.eclipse.emf.databinding.internal.EMFListValueProperty;
import org.eclipse.emf.databinding.internal.EMFListValuePropertyDecorator;
import org.eclipse.emf.databinding.internal.EMFMapProperty;
import org.eclipse.emf.databinding.internal.EMFMapPropertyDecorator;
import org.eclipse.emf.databinding.internal.EMFSetProperty;
import org.eclipse.emf.databinding.internal.EMFSetPropertyDecorator;
import org.eclipse.emf.databinding.internal.EMFValueProperty;
import org.eclipse.emf.databinding.internal.EMFValuePropertyDecorator;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * 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 EMFProperties {
	public static final boolean DEBUG = false;
	
	public static IEMFListValueProperty listValue(EStructuralFeature feature, Condition condition) {
		return listValue(FeaturePath.fromList(feature),condition);
	}
	
	public static IEMFListValueProperty listValue(FeaturePath featurePath, Condition condition) {
		IValueProperty property;
		if( featurePath.getFeaturePath().length == 1 ) {
			property = new EMFListValueProperty(featurePath.getFeaturePath()[0],condition);
			return new EMFListValuePropertyDecorator(property, featurePath.getFeaturePath()[0]);
		} else {
			property = new EMFValueProperty(featurePath.getFeaturePath()[0]);

			IEMFValueProperty beanProperty = new EMFValuePropertyDecorator(
					property, featurePath.getFeaturePath()[0]);
			
			int i = 1;
			for (i = 1; i < featurePath.getFeaturePath().length; i++) {
				beanProperty = beanProperty.value(featurePath.getFeaturePath()[i]);
			}
			
			return beanProperty.listValue(featurePath.getFeaturePath()[i],condition);
		}
		
	}
	
	public static IEMFValueProperty value(EStructuralFeature feature) {
		return value(FeaturePath.fromList(feature));
	}
	
	/**
	 * Returns a value property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name. May be nested e.g. "parent.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 IEMFValueProperty value(FeaturePath featurePath) {
		IValueProperty property;
		property = new EMFValueProperty(featurePath.getFeaturePath()[0]);

		IEMFValueProperty beanProperty = new EMFValuePropertyDecorator(
				property, featurePath.getFeaturePath()[0]);
		
		for (int i = 1; i < featurePath.getFeaturePath().length; i++) {
			beanProperty = beanProperty.value(featurePath.getFeaturePath()[i]);
		}
		
		return beanProperty;
	}

	public static IEMFValueProperty[] values(EStructuralFeature... features) {
		IEMFValueProperty[] properties = new IEMFValueProperty[features.length];
		for (int i = 0; i < properties.length; i++)
			properties[i] = value(features[i]);
		return properties;
	}
	
	/**
	 * Returns a value property array for the given property names of the given
	 * bean class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyNames
	 *            array of property names. May be nested e.g. "parent.name"
	 * @return a value property array for the given property names of the given
	 *         bean class.
	 */
	public static IEMFValueProperty[] values(FeaturePath... featurePaths) {
		IEMFValueProperty[] properties = new IEMFValueProperty[featurePaths.length];
		for (int i = 0; i < properties.length; i++)
			properties[i] = value(featurePaths[i]);
		return properties;
	}

	public static IEMFSetProperty set(EStructuralFeature feature) {
		return set(feature,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 IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType) {
		ISetProperty property;
		property = new EMFSetProperty(feature, elementType);
		return new EMFSetPropertyDecorator(property, feature);
	}

	/**
	 * 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 IEMFListProperty list(EStructuralFeature feature) {
		IListProperty property;
		property = new EMFListProperty(feature);
		return new EMFListPropertyDecorator(property, feature);
	}

	/**
	 * Returns a map property for the given property name of an arbitrary bean
	 * class. Objects lacking the named property are treated the same as if the
	 * property always contains an empty map.
	 * 
	 * @param propertyName
	 *            the property name
	 * @return a map property for the given property name of an arbitrary bean
	 *         class.
	 */
	public static IEMFMapProperty map(EStructuralFeature feature) {
		return map(feature, null, null);
	}

	/**
	 * Returns a map property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param keyType
	 *            the key type for the returned map property
	 * @param valueType
	 *            the value type for the returned map property
	 * @return a map property for the given property name of the given bean
	 *         class.
	 */
	public static IEMFMapProperty map(EStructuralFeature feature,
			Class<?> keyType, Class<?> valueType) {
		IMapProperty property;
		property = new EMFMapProperty(feature, keyType,
					valueType);
		return new EMFMapPropertyDecorator(property, feature);
	}
}




package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.core.databinding.property.value.ValueProperty;
import org.eclipse.emf.databinding.EMFProperties;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFListProperty;
import org.eclipse.emf.databinding.IEMFListValueProperty;
import org.eclipse.emf.databinding.IEMFMapProperty;
import org.eclipse.emf.databinding.IEMFSetProperty;
import org.eclipse.emf.databinding.IEMFValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

public class EMFListValuePropertyDecorator extends ValueProperty implements IEMFListValueProperty {
	private final IValueProperty delegate;
	private final EStructuralFeature eStructuralFeature;

	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFListValuePropertyDecorator(IValueProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

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

	public IEMFValueProperty value(EStructuralFeature feature) {
		return value(FeaturePath.fromList(feature));
	}
	
	public IEMFValueProperty value(FeaturePath featurePath) {
		return value(EMFProperties.value(featurePath));
	}

	public IEMFValueProperty value(IEMFValueProperty property) {
		return new EMFValuePropertyDecorator(super.value(property), property
				.getStructuralFeature());
	}

	public IEMFListProperty list(EStructuralFeature feature) {
		return list(EMFProperties.list(feature));
	}

	public IEMFListProperty list(IEMFListProperty property) {
		return new EMFListPropertyDecorator(super.list(property), property
				.getStructuralFeature());
	}

	public IEMFSetProperty set(EStructuralFeature feature) {
		return set(feature, null);
	}

	public IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType) {
		return set(EMFProperties.set(feature, elementType));
	}

	public IEMFSetProperty set(IEMFSetProperty property) {
		return new EMFSetPropertyDecorator(super.set(property), property
				.getStructuralFeature());
	}

	public IEMFMapProperty map(EStructuralFeature feature) {
		return map(feature, null, null);
	}

	public IEMFMapProperty map(EStructuralFeature feature, Class<?> keyType,
			Class<?> valueType) {
		return map(EMFProperties.map(feature, keyType,
				valueType));
	}

	public IEMFMapProperty map(IEMFMapProperty property) {
		return new EMFMapPropertyDecorator(super.map(property), property
				.getStructuralFeature());
	}

	public IObservableValue observe(Object source) {
		return new EMFObservableValueDecorator(delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableValue observe(Realm realm, Object source) {
		return new EMFObservableValueDecorator(delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory valueFactory() {
		return delegate.valueFactory();
	}

	public IObservableFactory valueFactory(Realm realm) {
		return delegate.valueFactory(realm);
	}

	public IObservableValue observeDetail(IObservableValue master) {
		return new EMFObservableValueDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableList observeDetail(IObservableList master) {
		return new EMFObservableListDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableMap observeDetail(IObservableSet master) {
		return new EMFObservableMapDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableMap observeDetail(IObservableMap master) {
		return new EMFObservableMapDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




package org.eclipse.emf.databinding;

import org.eclipse.emf.ecore.EStructuralFeature;

public class FeaturePath {
	private EStructuralFeature[] featurePath;
	
	private FeaturePath(EStructuralFeature[] featurePath) {
		this.featurePath = featurePath;
	}
	
	public EStructuralFeature[] getFeaturePath() {
		return featurePath;
	}
	
	public static FeaturePath fromList(EStructuralFeature... featurePath) {
		return new FeaturePath(featurePath);
	}
}




/*******************************************************************************
 * 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 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.map.IMapProperty;
import org.eclipse.core.databinding.property.map.MapProperty;
import org.eclipse.emf.databinding.EMFProperties;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFMapProperty;
import org.eclipse.emf.databinding.IEMFValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 3.3
 * 
 */
public class EMFMapPropertyDecorator extends MapProperty implements
		IEMFMapProperty {
	private final IMapProperty delegate;
	private final EStructuralFeature eStructuralFeature;

	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFMapPropertyDecorator(IMapProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

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

	public Object getValueType() {
		return delegate.getValueType();
	}
	
	public IEMFMapProperty values(EStructuralFeature feature) {
		return values(FeaturePath.fromList(feature));
	}

	public IEMFMapProperty values(FeaturePath featurePath) {
		return values(EMFProperties.value(featurePath));
	}

	public IEMFMapProperty values(IEMFValueProperty property) {
		return new EMFMapPropertyDecorator(super.values(property), property
				.getStructuralFeature());
	}

	public IObservableMap observe(Object source) {
		return new EMFObservableMapDecorator(delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableMap observe(Realm realm, Object source) {
		return new EMFObservableMapDecorator(delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory mapFactory() {
		return delegate.mapFactory();
	}

	public IObservableFactory mapFactory(Realm realm) {
		return delegate.mapFactory(realm);
	}

	public IObservableMap observeDetail(IObservableValue master) {
		return new EMFObservableMapDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




/*******************************************************************************
 * 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)
 *     Matthew Hall - bugs 195222, 264307, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import java.util.Map;

import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.ISimplePropertyListener;
import org.eclipse.core.databinding.property.map.SimpleMapProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 3.3
 * 
 */
public class EMFMapProperty extends SimpleMapProperty {
	private EStructuralFeature eStructuralFeature;
	
	private final Class<?> keyType;
	private final Class<?> valueType;

	/**
	 * @param propertyDescriptor
	 * @param keyType
	 * @param valueType
	 */
	public EMFMapProperty(EStructuralFeature eStructuralFeature,
			Class<?> keyType, Class<?> valueType) {
		this.eStructuralFeature = eStructuralFeature;
		this.keyType = keyType;
		this.valueType = valueType;
	}

	protected EStructuralFeature getFeature() {
		return eStructuralFeature;
	}
	
	public Object getKeyType() {
		return keyType;
	}

	public Object getValueType() {
		return valueType;
	}

	protected Map<?,?> doGetMap(Object source) {
		EObject eObj = (EObject) source;
	    return (Map<?, ?>) eObj.eGet(eStructuralFeature);
	}

	@SuppressWarnings("unchecked")
	protected void doSetMap(Object source, Map map, MapDiff diff) {
		EObject eObject = (EObject) source;
	    eObject.eSet(eStructuralFeature, map);
	}

	public INativePropertyListener adaptListener(
			final ISimplePropertyListener listener) {
		return new EMFPropertyListener.EMFMapPropertyListener(){
		
			@Override
			protected IProperty getOwner() {
				return EMFMapProperty.this;
			}
		
			@Override
			protected ISimplePropertyListener getListener() {
				return listener;
			}
		
			@Override
			protected EStructuralFeature getFeature() {
				return eStructuralFeature;
			}
		};
	}

	public String toString() {
		String s = EMFPropertyHelper.propertyName(eStructuralFeature) + "{:}"; //$NON-NLS-1$

		if (keyType != null || valueType != null)
			s += "<" + EMFPropertyHelper.shortClassName(keyType) + ", " //$NON-NLS-1$ //$NON-NLS-2$
					+ EMFPropertyHelper.shortClassName(valueType) + ">"; //$NON-NLS-1$
		return s;
	}
}




/*******************************************************************************
 * 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 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.core.databinding.property.set.SetProperty;
import org.eclipse.emf.databinding.EMFProperties;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFMapProperty;
import org.eclipse.emf.databinding.IEMFSetProperty;
import org.eclipse.emf.databinding.IEMFValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * @since 3.3
 * 
 */
public class EMFSetPropertyDecorator extends SetProperty implements
		IEMFSetProperty {
	private final ISetProperty delegate;
	private final EStructuralFeature eStructuralFeature;

	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFSetPropertyDecorator(ISetProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

	public Object getElementType() {
		return delegate.getElementType();
	}
	
	public IEMFMapProperty values(EStructuralFeature feature) {
		return values(FeaturePath.fromList(feature));
	}
	
	public IEMFMapProperty values(FeaturePath featurePath) {
		return values(EMFProperties.value(featurePath));
	}

	public IEMFMapProperty values(IEMFValueProperty property) {
		return new EMFMapPropertyDecorator(super.values(property), property
				.getStructuralFeature());
	}

	public IObservableSet observe(Object source) {
		return new EMFObservableSetDecorator(delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableSet observe(Realm realm, Object source) {
		return new EMFObservableSetDecorator(delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory setFactory() {
		return delegate.setFactory();
	}

	public IObservableFactory setFactory(Realm realm) {
		return delegate.setFactory(realm);
	}

	public IObservableSet observeDetail(IObservableValue master) {
		return new EMFObservableSetDecorator(delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}

Lines 11-16 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
11	Export-Package: org.eclipse.emf.databinding.edit	11	Export-Package: org.eclipse.emf.databinding.edit
12	Require-Bundle: org.eclipse.core.runtime,	12	Require-Bundle: org.eclipse.core.runtime,
13	org.eclipse.emf.databinding;visibility:=reexport,	13	org.eclipse.emf.databinding;visibility:=reexport,
14	org.eclipse.emf.edit;visibility:=reexport	14	org.eclipse.emf.edit;visibility:=reexport,
		15	org.eclipse.core.databinding.property;bundle-version="1.2.0"
15	Eclipse-LazyStart: true	16	Eclipse-LazyStart: true
16	Bundle-ActivationPolicy: lazy	17	Bundle-ActivationPolicy: lazy




/*******************************************************************************
 * 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)
 *     Matthew Hall - bugs 195222, 264307, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import java.util.Map;

import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.databinding.internal.EMFMapProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditMapProperty extends EMFMapProperty {
	private final EditingDomain editingDomain;
	
	public EMFEditMapProperty(EditingDomain editingDomain, EStructuralFeature eStructuralFeature,
			Class<?> keyType, Class<?> valueType) {
		super(eStructuralFeature, keyType, valueType);
		this.editingDomain = editingDomain;
	}

	@SuppressWarnings("unchecked")
	@Override
	protected void doSetMap(Object source, Map map, MapDiff diff) {
		EObject eObject = (EObject) source;
		Command command = SetCommand.create(editingDomain, eObject, getFeature(), map);
		editingDomain.getCommandStack().execute(command);
	}

}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding.edit;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link IListProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 */
public interface IEMFEditListProperty extends IEMFProperty, IListProperty {
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a nested combination of this property and the specified value
	 *         property.
	 * @see #values(IEMFEditValueProperty)
	 */
	public IEMFEditListProperty values(FeaturePath featurePath);
	
	public IEMFEditListProperty values(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified value
	 * property for all elements observed by this list property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the list-typed &quot;children&quot; property of a Person object,
	 * // where the elements are Person objects
	 * IBeanListProperty children = BeanProperties.list(Person.class, &quot;children&quot;,
	 * 		Person.class);
	 * // Observes the string-typed &quot;name&quot; property of a Person object
	 * IBeanValueProperty name = BeanProperties.value(Person.class, &quot;name&quot;);
	 * // Observes the names of children of a Person object.
	 * IBeanListProperty childrenNames = children.values(name);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFEditListProperty values(IEMFEditValueProperty property);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 194734)
 *     Matthew Hall - bugs 195222, 264307, 265064, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import java.util.Set;

import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.databinding.internal.EMFSetProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditSetProperty extends EMFSetProperty {
	private final EditingDomain editingDomain;
	
	public EMFEditSetProperty(EditingDomain editingDomain, EStructuralFeature eStructuralFeature,
			Class<?> elementType) {
		super(eStructuralFeature, elementType);
		this.editingDomain = editingDomain;
	}
	
	@SuppressWarnings("unchecked")
	@Override
	protected void doSetSet(Object source, Set set, SetDiff diff) {
		EObject eObject = (EObject) source;
		Command command = SetCommand.create(editingDomain, eObject, getFeature(), set);
		editingDomain.getCommandStack().execute(command);
	}
}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding.edit;

import java.util.Map;

import org.eclipse.core.databinding.property.map.IMapProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link IMapProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFEditMapProperty extends IEMFProperty, IMapProperty {

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 * @see #values(IEMFEditValueProperty)
	 */
	public IEMFEditMapProperty values(FeaturePath featurePath);
	
	public IEMFEditMapProperty values(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified value
	 * property for all {@link Map#values() values} observed by this map
	 * property, mapping from this map property's {@link Map#keySet() key set}
	 * to the specified value property's value for each element in the master
	 * property's {@link Map#values() values} collection.
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFEditMapProperty values(IEMFEditValueProperty property);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 221704)
 *     Matthew Hall - bug 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.emf.databinding.edit.IEMFEditObservable;
import org.eclipse.emf.databinding.internal.EMFObservableMapDecorator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableMap}.
 * 
 * @since 3.3
 */
public class EMFEditObservableMapDecorator extends EMFObservableMapDecorator
		implements IEMFEditObservable {
	private final EditingDomain editingDomain;
	
	/**
	 * @param decorated
	 * @param propertyDescriptor
	 */
	public EMFEditObservableMapDecorator(EditingDomain editingDomain, IObservableMap decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, eStructuralFeature);
		this.editingDomain = editingDomain;
	}

	public EditingDomain getEditingDomain() {
		return editingDomain;
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Brad Reynolds - bug 147515
 ******************************************************************************/

package org.eclipse.emf.databinding.edit;

import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * Provides access to details of bean observables.
 * <p>
 * This interface is not meant to be implemented by clients.
 * </p>
 * 
 * @since 3.3
 */
public interface IEMFEditObservable extends IObserving {
	/**
	 * @return property descriptor of the property being observed,
	 *         <code>null</code> if the runtime time information was not
	 *         provided on construction of the observable
	 */
	public EStructuralFeature getStructuralFeature();
	
	public EditingDomain getEditingDomain();
}




/*******************************************************************************
 * 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 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.core.databinding.property.set.SetProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.edit.EMFEditProperties;
import org.eclipse.emf.databinding.edit.IEMFEditMapProperty;
import org.eclipse.emf.databinding.edit.IEMFEditSetProperty;
import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditSetPropertyDecorator extends SetProperty implements
		IEMFEditSetProperty {
	private final ISetProperty delegate;
	private final EStructuralFeature eStructuralFeature;
	private final EditingDomain editingDomain;

	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFEditSetPropertyDecorator(EditingDomain editingDomain,ISetProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
		this.editingDomain = editingDomain;
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

	public Object getElementType() {
		return delegate.getElementType();
	}
	
	public IEMFEditMapProperty values(EStructuralFeature feature) {
		return values(FeaturePath.fromList(feature));
	}
	
	public IEMFEditMapProperty values(FeaturePath featurePath) {
		return values(EMFEditProperties.value(editingDomain,featurePath));
	}

	public IEMFEditMapProperty values(IEMFEditValueProperty property) {
		return new EMFEditMapPropertyDecorator(editingDomain,super.values(property), property
				.getStructuralFeature());
	}

	public IObservableSet observe(Object source) {
		return new EMFEditObservableSetDecorator(editingDomain,delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableSet observe(Realm realm, Object source) {
		return new EMFEditObservableSetDecorator(editingDomain,delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory setFactory() {
		return delegate.setFactory();
	}

	public IObservableFactory setFactory(Realm realm) {
		return delegate.setFactory(realm);
	}

	public IObservableSet observeDetail(IObservableValue master) {
		return new EMFEditObservableSetDecorator(editingDomain,delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




/*******************************************************************************
 * 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 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.list.ListProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.edit.EMFEditProperties;
import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditListPropertyDecorator extends ListProperty implements
		IEMFEditListProperty {
	private final IListProperty delegate;
	private final EStructuralFeature eStructuralFeature;
	private final EditingDomain editingDomain;
	
	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFEditListPropertyDecorator(EditingDomain editingDomain,IListProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
		this.editingDomain = editingDomain;
	}

	public Object getElementType() {
		return delegate.getElementType();
	}
	
	public IEMFEditListProperty values(EStructuralFeature feature) {
		return values(FeaturePath.fromList(feature));
	}

	public IEMFEditListProperty values(FeaturePath featurePath) {
		return values(EMFEditProperties.value(editingDomain,featurePath));
	}

	public IEMFEditListProperty values(IEMFEditValueProperty property) {
		return new EMFEditListPropertyDecorator(editingDomain,super.values(property), property
				.getStructuralFeature());
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

	public IObservableList observe(Object source) {
		return new EMFEditObservableListDecorator(editingDomain,delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableList observe(Realm realm, Object source) {
		return new EMFEditObservableListDecorator(editingDomain,delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory listFactory() {
		return delegate.listFactory();
	}

	public IObservableFactory listFactory(Realm realm) {
		return delegate.listFactory(realm);
	}

	public IObservableList observeDetail(IObservableValue master) {
		return new EMFEditObservableListDecorator(editingDomain,delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




/*******************************************************************************
 * 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 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.core.databinding.property.value.ValueProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.edit.EMFEditProperties;
import org.eclipse.emf.databinding.edit.IEMFEditListProperty;
import org.eclipse.emf.databinding.edit.IEMFEditMapProperty;
import org.eclipse.emf.databinding.edit.IEMFEditSetProperty;
import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditValuePropertyDecorator extends ValueProperty implements
		IEMFEditValueProperty {
	private final IValueProperty delegate;
	private final EStructuralFeature eStructuralFeature;
	private final EditingDomain editingDomain;

	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFEditValuePropertyDecorator(EditingDomain editingDomain,IValueProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
		this.editingDomain = editingDomain;
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

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

	public IEMFEditValueProperty value(EStructuralFeature feature) {
		return value(FeaturePath.fromList(feature));
	}
	
	public IEMFEditValueProperty value(FeaturePath featurePath) {
		return value(EMFEditProperties.value(editingDomain,featurePath));
	}

	public IEMFEditValueProperty value(IEMFEditValueProperty property) {
		return new EMFEditValuePropertyDecorator(editingDomain,super.value(property), property
				.getStructuralFeature());
	}

	public IEMFEditListProperty list(EStructuralFeature feature) {
		return list(EMFEditProperties.list(editingDomain,feature));
	}

	public IEMFEditListProperty list(IEMFEditListProperty property) {
		return new EMFEditListPropertyDecorator(editingDomain,super.list(property), property
				.getStructuralFeature());
	}

	public IEMFEditSetProperty set(EStructuralFeature feature) {
		return set(feature, null);
	}

	public IEMFEditSetProperty set(EStructuralFeature feature, Class<?> elementType) {
		return set(EMFEditProperties.set(editingDomain,feature, elementType));
	}

	public IEMFEditSetProperty set(IEMFEditSetProperty property) {
		return new EMFEditSetPropertyDecorator(editingDomain,super.set(property), property
				.getStructuralFeature());
	}

	public IEMFEditMapProperty map(EStructuralFeature feature) {
		return map(feature, null, null);
	}

	public IEMFEditMapProperty map(EStructuralFeature feature, Class<?> keyType,
			Class<?> valueType) {
		return map(EMFEditProperties.map(editingDomain,feature, keyType,
				valueType));
	}

	public IEMFEditMapProperty map(IEMFEditMapProperty property) {
		return new EMFEditMapPropertyDecorator(editingDomain,super.map(property), property
				.getStructuralFeature());
	}

	public IObservableValue observe(Object source) {
		return new EMFEditObservableValueDecorator(editingDomain,delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableValue observe(Realm realm, Object source) {
		return new EMFEditObservableValueDecorator(editingDomain,delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory valueFactory() {
		return delegate.valueFactory();
	}

	public IObservableFactory valueFactory(Realm realm) {
		return delegate.valueFactory(realm);
	}

	public IObservableValue observeDetail(IObservableValue master) {
		return new EMFEditObservableValueDecorator(editingDomain,delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableList observeDetail(IObservableList master) {
		return new EMFEditObservableListDecorator(editingDomain,delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableMap observeDetail(IObservableSet master) {
		return new EMFEditObservableMapDecorator(editingDomain,delegate.observeDetail(master),
				eStructuralFeature);
	}

	public IObservableMap observeDetail(IObservableMap master) {
		return new EMFEditObservableMapDecorator(editingDomain,delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.emf.databinding.edit.IEMFEditObservable;
import org.eclipse.emf.databinding.internal.EMFObservableValueDecorator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableValue}.
 * 
 * @since 3.3
 */
public class EMFEditObservableValueDecorator extends EMFObservableValueDecorator
		implements IEMFEditObservable {
	private final EditingDomain editingDomain;
	
	/**
	 * @param decorated
	 * @param propertyDescriptor
	 */
	public EMFEditObservableValueDecorator(EditingDomain editingDomain,IObservableValue decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, eStructuralFeature);
		this.editingDomain = editingDomain;
	}

	public EditingDomain getEditingDomain() {
		return editingDomain;
	}

}




/*******************************************************************************
 * 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.emf.databinding.edit;

import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * An IProperty extension interface providing access to details of bean
 * properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFEditProperty extends IProperty {
	/**
	 * Returns the property descriptor of the bean property being observed. This
	 * method returns null in the case of anonymous properties.
	 * 
	 * @return the property descriptor of the bean property being observed
	 */
	public EStructuralFeature getStructuralFeature();
	
	public EditingDomain getEditingDomain();
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 208858, 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.emf.databinding.edit.IEMFEditObservable;
import org.eclipse.emf.databinding.internal.EMFObservableListDecorator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableList}.
 * 
 * @since 3.3
 */
public class EMFEditObservableListDecorator extends EMFObservableListDecorator
		implements IEMFEditObservable {
	
	private final EditingDomain editingDomain;

	public EMFEditObservableListDecorator(EditingDomain editingDomain, IObservableList decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, eStructuralFeature);
		this.editingDomain = editingDomain;
	}

	public EditingDomain getEditingDomain() {
		return editingDomain;
	}
	
	
}




/*******************************************************************************
 * 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 195222)
 *     Matthew Hall - bug 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.map.IMapProperty;
import org.eclipse.core.databinding.property.map.MapProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.edit.EMFEditProperties;
import org.eclipse.emf.databinding.edit.IEMFEditMapProperty;
import org.eclipse.emf.databinding.edit.IEMFEditValueProperty;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditMapPropertyDecorator extends MapProperty implements
		IEMFEditMapProperty {
	private final IMapProperty delegate;
	private final EStructuralFeature eStructuralFeature;
	private final EditingDomain editingDomain;

	/**
	 * @param delegate
	 * @param propertyDescriptor
	 */
	public EMFEditMapPropertyDecorator(EditingDomain editingDomain,IMapProperty delegate,
			EStructuralFeature eStructuralFeature) {
		this.delegate = delegate;
		this.eStructuralFeature = eStructuralFeature;
		this.editingDomain = editingDomain;
	}

	public EStructuralFeature getStructuralFeature() {
		return eStructuralFeature;
	}

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

	public Object getValueType() {
		return delegate.getValueType();
	}
	
	public IEMFEditMapProperty values(EStructuralFeature feature) {
		return values(FeaturePath.fromList(feature));
	}

	public IEMFEditMapProperty values(FeaturePath featurePath) {
		return values(EMFEditProperties.value(editingDomain,featurePath));
	}

	public IEMFEditMapProperty values(IEMFEditValueProperty property) {
		return new EMFEditMapPropertyDecorator(editingDomain,super.values(property), property
				.getStructuralFeature());
	}

	public IObservableMap observe(Object source) {
		return new EMFEditObservableMapDecorator(editingDomain,delegate.observe(source),
				eStructuralFeature);
	}

	public IObservableMap observe(Realm realm, Object source) {
		return new EMFEditObservableMapDecorator(editingDomain,delegate.observe(realm, source),
				eStructuralFeature);
	}

	public IObservableFactory mapFactory() {
		return delegate.mapFactory();
	}

	public IObservableFactory mapFactory(Realm realm) {
		return delegate.mapFactory(realm);
	}

	public IObservableMap observeDetail(IObservableValue master) {
		return new EMFEditObservableMapDecorator(editingDomain,delegate.observeDetail(master),
				eStructuralFeature);
	}

	public String toString() {
		return delegate.toString();
	}
}




/*******************************************************************************
 * 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)
 *     Matthew Hall - bug 195222, 247997, 261843, 264307
 ******************************************************************************/

package org.eclipse.emf.databinding.edit;

import org.eclipse.core.databinding.property.list.IListProperty;
import org.eclipse.core.databinding.property.map.IMapProperty;
import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.edit.internal.EMFEditListProperty;
import org.eclipse.emf.databinding.edit.internal.EMFEditListPropertyDecorator;
import org.eclipse.emf.databinding.edit.internal.EMFEditMapProperty;
import org.eclipse.emf.databinding.edit.internal.EMFEditMapPropertyDecorator;
import org.eclipse.emf.databinding.edit.internal.EMFEditSetProperty;
import org.eclipse.emf.databinding.edit.internal.EMFEditSetPropertyDecorator;
import org.eclipse.emf.databinding.edit.internal.EMFEditValueProperty;
import org.eclipse.emf.databinding.edit.internal.EMFEditValuePropertyDecorator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * 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 EMFEditProperties {
	public static final boolean DEBUG = false;

	public static IEMFEditValueProperty value(EditingDomain editingDomain,
			EStructuralFeature feature) {
		return value(editingDomain, FeaturePath.fromList(feature));
	}

	/**
	 * Returns a value property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name. May be nested e.g. "parent.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 IEMFEditValueProperty value(EditingDomain editingDomain,
			FeaturePath featurePath) {
		IValueProperty property;
		property = new EMFEditValueProperty(editingDomain, featurePath
				.getFeaturePath()[0]);

		IEMFEditValueProperty beanProperty = new EMFEditValuePropertyDecorator(
				editingDomain, property, featurePath.getFeaturePath()[0]);

		for (int i = 1; i < featurePath.getFeaturePath().length; i++) {
			beanProperty = beanProperty.value(featurePath.getFeaturePath()[i]);
		}

		return beanProperty;
	}

	public static IEMFEditValueProperty[] values(EditingDomain editingDomain,
			EStructuralFeature... features) {
		IEMFEditValueProperty[] properties = new IEMFEditValueProperty[features.length];
		for (int i = 0; i < properties.length; i++)
			properties[i] = value(editingDomain, features[i]);
		return properties;
	}

	/**
	 * Returns a value property array for the given property names of the given
	 * bean class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyNames
	 *            array of property names. May be nested e.g. "parent.name"
	 * @return a value property array for the given property names of the given
	 *         bean class.
	 */
	public static IEMFEditValueProperty[] values(EditingDomain editingDomain,
			FeaturePath... featurePaths) {
		IEMFEditValueProperty[] properties = new IEMFEditValueProperty[featurePaths.length];
		for (int i = 0; i < properties.length; i++)
			properties[i] = value(editingDomain, featurePaths[i]);
		return properties;
	}

	public static IEMFEditSetProperty set(EditingDomain editingDomain,
			EStructuralFeature feature) {
		return set(editingDomain, feature, 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 IEMFEditSetProperty set(EditingDomain editingDomain,
			EStructuralFeature feature, Class<?> elementType) {
		ISetProperty property;
		property = new EMFEditSetProperty(editingDomain, feature, elementType);
		return new EMFEditSetPropertyDecorator(editingDomain, property, feature);
	}

	/**
	 * 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 IEMFEditListProperty list(EditingDomain editingDomain,
			EStructuralFeature feature) {
		IListProperty property;
		property = new EMFEditListProperty(editingDomain, feature);
		return new EMFEditListPropertyDecorator(editingDomain, property,
				feature);
	}

	/**
	 * Returns a map property for the given property name of an arbitrary bean
	 * class. Objects lacking the named property are treated the same as if the
	 * property always contains an empty map.
	 * 
	 * @param propertyName
	 *            the property name
	 * @return a map property for the given property name of an arbitrary bean
	 *         class.
	 */
	public static IEMFEditMapProperty map(EditingDomain editingDomain,
			EStructuralFeature feature) {
		return map(editingDomain, feature, null, null);
	}

	/**
	 * Returns a map property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param keyType
	 *            the key type for the returned map property
	 * @param valueType
	 *            the value type for the returned map property
	 * @return a map property for the given property name of the given bean
	 *         class.
	 */
	public static IEMFEditMapProperty map(EditingDomain editingDomain,
			EStructuralFeature feature, Class<?> keyType, Class<?> valueType) {
		IMapProperty property;
		property = new EMFEditMapProperty(editingDomain, feature, keyType,
				valueType);
		return new EMFEditMapPropertyDecorator(editingDomain, property, feature);
	}
}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding.edit;

import org.eclipse.core.databinding.property.set.ISetProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link ISetProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFEditSetProperty extends IEMFProperty, ISetProperty {
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 * @see #values(IEMFEditValueProperty)
	 */
	public IEMFEditMapProperty values(FeaturePath featurePath);
	
	public IEMFEditMapProperty values(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified value
	 * property for all elements observed by this set property, mapping from
	 * this set property's elements (keys) to the specified value property's
	 * value for each element (values).
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the set-typed &quot;children&quot; property of a Person object,
	 * // where the elements are Person objects
	 * IBeanSetProperty children = BeanProperties.set(Person.class, &quot;children&quot;,
	 * 		Person.class);
	 * // Observes the string-typed &quot;name&quot; property of a Person object
	 * IBeanValueProperty name = BeanProperties.value(Person.class, &quot;name&quot;);
	 * // Observes a map of children objects to their respective names.
	 * IBeanMapProperty childrenNames = children.values(name);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFEditMapProperty values(IEMFEditValueProperty property);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 194734)
 *     Matthew Hall - bug 195222, 264307, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.databinding.internal.EMFValueProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.command.SetCommand;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditValueProperty extends EMFValueProperty {
	private final EditingDomain editingDomain;

	public EMFEditValueProperty(EditingDomain editingDomain, EStructuralFeature eStructuralFeature) {
		super(eStructuralFeature);
		this.editingDomain = editingDomain;
	}
	
	
	
	@Override
	protected void doSetValue(Object source, Object value) {
		EObject eObject = (EObject) source;
		Command command = SetCommand.create(editingDomain, eObject, getFeature(), value);
		editingDomain.getCommandStack().execute(command);
	}
}




/*******************************************************************************
 * 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 195222)
 ******************************************************************************/

package org.eclipse.emf.databinding.edit;

import org.eclipse.core.databinding.property.value.IValueProperty;
import org.eclipse.emf.databinding.FeaturePath;
import org.eclipse.emf.databinding.IEMFProperty;
import org.eclipse.emf.ecore.EStructuralFeature;

/**
 * An {@link IValueProperty} extension interface with convenience methods for
 * creating nested bean properties.
 * 
 * @since 1.2
 * @noextend This interface is not intended to be extended by clients.
 * @noimplement This interface is not intended to be implemented by clients.
 */
public interface IEMFEditValueProperty extends IEMFProperty, IValueProperty {
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property.
	 * 
	 * @param propertyName
	 *            the value property to observe. May be nested e.g.
	 *            "parent.name"
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 * @see #value(IEMFEditValueProperty)
	 */
	public IEMFEditValueProperty value(FeaturePath featurePath);

	public IEMFEditValueProperty value(EStructuralFeature feature);
	
	/**
	 * Returns a master-detail combination of this property and the specified
	 * value property. The returned property will observe the specified detail
	 * value property for the value of the master value property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the string-typed &quot;name&quot; property of a Node object
	 * IBeanValueProperty name = BeanProperties.value(Node.class, &quot;name&quot;);
	 * // Observes the name of the parent of a Node object.
	 * IBeanValueProperty parentName = parent.value(name);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         value property.
	 */
	public IEMFEditValueProperty value(IEMFEditValueProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * list property.
	 * 
	 * @param propertyName
	 *            the list property to observe
	 * @return a master-detail combination of this property and the specified
	 *         list property.
	 * @see #list(IEMFEditListProperty)
	 */
	public IEMFEditListProperty list(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * list property. The returned property will observe the specified list
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object.
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the List-typed &quot;children&quot; property of a Node object
	 * // where the elements are Node objects
	 * IBeanListProperty children = BeanProperties.list(Node.class, &quot;children&quot;,
	 * 		Node.class);
	 * // Observes the children of the parent (siblings) of a Node object.
	 * IBeanListProperty siblings = parent.list(children);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         list property.
	 */
	public IEMFEditListProperty list(IEMFEditListProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property.
	 * 
	 * @param propertyName
	 *            the set property to observe
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 * @see #set(IEMFEditSetProperty)
	 */
	public IEMFEditSetProperty set(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property.
	 * 
	 * @param propertyName
	 *            the set property to observe
	 * @param elementType
	 *            the element type of the named property
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 * @see #set(IEMFEditSetProperty)
	 */
	public IEMFEditSetProperty set(EStructuralFeature feature, Class<?> elementType);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * set property. The returned property will observe the specified set
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Node-typed &quot;parent&quot; property of a Node object.
	 * IBeanValueProperty parent = BeanProperties.value(Node.class, &quot;parent&quot;);
	 * // Observes the Set-typed &quot;children&quot; property of a Node object
	 * // where the elements are Node objects
	 * IBeanSetProperty children = BeanProperties.set(Node.class, &quot;children&quot;,
	 * 		Node.class);
	 * // Observes the children of the parent (siblings) of a Node object.
	 * IBeanSetProperty siblings = parent.set(children);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         set property.
	 */
	public IEMFEditSetProperty set(IEMFEditSetProperty property);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property.
	 * 
	 * @param propertyName
	 *            the map property to observe
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 * @see #map(IEMFEditMapProperty)
	 */
	public IEMFEditMapProperty map(EStructuralFeature feature);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property.
	 * 
	 * @param propertyName
	 *            the map property to observe
	 * @param keyType
	 *            the key type of the named property
	 * @param valueType
	 *            the value type of the named property
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 * @see #map(IEMFEditMapProperty)
	 */
	public IEMFEditMapProperty map(EStructuralFeature feature, Class<?> keyType,
			Class<?> valueType);

	/**
	 * Returns a master-detail combination of this property and the specified
	 * map property. The returned property will observe the specified map
	 * property for the value of the master property.
	 * <p>
	 * Example:
	 * 
	 * <pre>
	 * // Observes the Contact-typed &quot;supervisor&quot; property of a
	 * // Contact class 
	 * IBeanValueProperty supervisor = BeanProperties.value(Contact.class,
	 * 		&quot;supervisor&quot;);
	 * // Observes the property &quot;phoneNumbers&quot; of a Contact object--a property mapping
	 * // from PhoneNumberType to PhoneNumber &quot;set-typed &quot;children&quot;,
	 * IBeanMapProperty phoneNumbers = BeanProperties.map(Contact.class,
	 * 		&quot;phoneNumbers&quot;, PhoneNumberType.class, PhoneNumber.class);
	 * // Observes the phone numbers of a contact's supervisor:
	 * IBeanMapProperty supervisorPhoneNumbers = supervisor.map(phoneNumbers);
	 * </pre>
	 * 
	 * @param property
	 *            the detail property to observe
	 * @return a master-detail combination of this property and the specified
	 *         map property.
	 */
	public IEMFEditMapProperty map(IEMFEditMapProperty property);
}




/*******************************************************************************
 * Copyright (c) 2008 Matthew Hall and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 194734)
 *     Matthew Hall - bugs 195222, 264307, 265561
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import java.util.List;

import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.observable.list.ListDiffVisitor;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.databinding.internal.EMFListProperty;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.command.AddCommand;
import org.eclipse.emf.edit.command.RemoveCommand;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * @since 3.3
 * 
 */
public class EMFEditListProperty extends EMFListProperty {
	private final EditingDomain editingDomain;

	public EMFEditListProperty(EditingDomain editingDomain,
			EStructuralFeature eStructuralFeature) {
		super(eStructuralFeature);
		this.editingDomain = editingDomain;
	}

	@SuppressWarnings("unchecked")
	@Override
	protected void doSetList(Object source, List list, ListDiff diff) {
		diff.accept(new ListVisitorImpl((EObject) source, getFeature()));
	}

	private class ListVisitorImpl extends ListDiffVisitor {
		private EObject eObj;
		private EStructuralFeature feature;

		private ListVisitorImpl(EObject eObj, EStructuralFeature feature) {
			this.eObj = eObj;
			this.feature = feature;
		}

		@Override
		public void handleAdd(int index, Object element) {
			execute(AddCommand.create(editingDomain, eObj, feature, element,
					index));
		}

		@Override
		public void handleRemove(int index, Object element) {
			execute(RemoveCommand.create(editingDomain, eObj, feature, element));
		}

		private boolean execute(Command command) {
			if (command.canExecute()) {
				editingDomain.getCommandStack().execute(command);
				return true;
			} else {
				return false;
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2007 Brad Reynolds 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:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 246625
 ******************************************************************************/

package org.eclipse.emf.databinding.edit.internal;

import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.emf.databinding.edit.IEMFEditObservable;
import org.eclipse.emf.databinding.internal.EMFObservableSetDecorator;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.edit.domain.EditingDomain;

/**
 * {@link IEMFObservable} decorator for an {@link IObservableSet}.
 * 
 * @since 3.3
 */
public class EMFEditObservableSetDecorator extends EMFObservableSetDecorator
		implements IEMFEditObservable {
	private final EditingDomain editingDomain;
	
	/**
	 * @param decorated
	 * @param propertyDescriptor
	 */
	public EMFEditObservableSetDecorator(EditingDomain editingDomain,IObservableSet decorated,
			EStructuralFeature eStructuralFeature) {
		super(decorated, eStructuralFeature);
		this.editingDomain = editingDomain;
	}

	public EditingDomain getEditingDomain() {
		return editingDomain;
	}

}

Return to bug 262160

Lines 17-23 Link Here

(-)src/org/eclipse/emf/databinding/EMFObservables.java (-161 / +214 lines)
17	*/	17	*/
18	package org.eclipse.emf.databinding;	18	package org.eclipse.emf.databinding;
19		19
20
21	import org.eclipse.core.databinding.observable.IObservable;	20	import org.eclipse.core.databinding.observable.IObservable;
22	import org.eclipse.core.databinding.observable.Realm;	21	import org.eclipse.core.databinding.observable.Realm;
23	import org.eclipse.core.databinding.observable.list.IObservableList;	22	import org.eclipse.core.databinding.observable.list.IObservableList;
Lines 26-194 Link Here
26	import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;	25	import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
27	import org.eclipse.core.databinding.observable.set.IObservableSet;	26	import org.eclipse.core.databinding.observable.set.IObservableSet;
28	import org.eclipse.core.databinding.observable.value.IObservableValue;	27	import org.eclipse.core.databinding.observable.value.IObservableValue;
		28	import org.eclipse.emf.common.notify.NotifyingList;
		29	import org.eclipse.emf.databinding.internal.EWritableList;
29	import org.eclipse.emf.ecore.EObject;	30	import org.eclipse.emf.ecore.EObject;
30	import org.eclipse.emf.ecore.EStructuralFeature;	31	import org.eclipse.emf.ecore.EStructuralFeature;
		32	import org.eclipse.emf.ecore.resource.Resource;
31		33
32	/**	34	/**
33	* PROVISIONAL	35	* PROVISIONAL This API is subject to arbitrary change, including renaming or
34	* This API is subject to arbitrary change, including renaming or removal.	36	* removal.
35	*/	37	*/
36	public class EMFObservables	38	public class EMFObservables {
37	{	39	/**
38	/**	40	* Returns an observable value for the given feature of the object.
39	* Returns an observable value for the given feature of the object.	41	*
40	* @param eObject the object to observe.	42	* @param eObject
41	* @param eStructuralFeature the feature of the object to observe.	43	* the object to observe.
42	* @return an observable value for the given feature of the object.	44	* @param eStructuralFeature
43	*/	45	* the feature of the object to observe.
44	public static IObservableValue observeValue(EObject eObject, EStructuralFeature eStructuralFeature)	46	* @return an observable value for the given feature of the object.
45	{	47	*/
46	return new EObjectObservableValue(eObject, eStructuralFeature);	48	public static IObservableValue observeValue(EObject eObject,
47	}	49	EStructuralFeature eStructuralFeature) {
48		50	return new EObjectObservableValue(eObject, eStructuralFeature);
49	/**	51	}
50	* Returns an observable value for the given feature of the object.	52
51	* @param realm the realm in which to observe.	53	/**
52	* @param eObject the object to observe.	54	* Returns an observable value for the given feature of the object.
53	* @param eStructuralFeature the feature of the object to observe.	55	*
54	* @return an observable value for the given feature of the object.	56	* @param realm
55	*/	57	* the realm in which to observe.
56	public static IObservableValue observeValue(Realm realm, EObject eObject, EStructuralFeature eStructuralFeature)	58	* @param eObject
57	{	59	* the object to observe.
58	return new EObjectObservableValue(realm, eObject, eStructuralFeature);	60	* @param eStructuralFeature
59	}	61	* the feature of the object to observe.
60		62	* @return an observable value for the given feature of the object.
61	/**	63	*/
62	* Returns an observable list for the given multi-valued feature of the object.	64	public static IObservableValue observeValue(Realm realm, EObject eObject,
63	* @param eObject the object to observe.	65	EStructuralFeature eStructuralFeature) {
64	* @param eStructuralFeature the feature of the object to observe.	66	return new EObjectObservableValue(realm, eObject, eStructuralFeature);
65	* @return an observable list for the given multi-valued feature of the object.	67	}
66	*/	68
67	public static IObservableList observeList(EObject eObject, EStructuralFeature eStructuralFeature)	69	/**
68	{	70	* Returns an observable list for the given multi-valued feature of the
69	return new EObjectObservableList(eObject, eStructuralFeature);	71	* object.
70	}	72	*
71		73	* @param eObject
72	/**	74	* the object to observe.
73	* Returns an observable list for the given multi-valued feature of the object.	75	* @param eStructuralFeature
74	* @param realm the realm in which to observe.	76	* the feature of the object to observe.
75	* @param eObject the object to observe.	77	* @return an observable list for the given multi-valued feature of the
76	* @param eStructuralFeature the feature of the object to observe.	78	* object.
77	* @return an observable list for the given multi-valued feature of the object.	79	*/
78	*/	80	public static IObservableList observeList(EObject eObject,
79	public static IObservableList observeList(Realm realm, EObject eObject, EStructuralFeature eStructuralFeature)	81	EStructuralFeature eStructuralFeature) {
80	{	82	return new EObjectObservableList(eObject, eStructuralFeature);
81	return new EObjectObservableList(realm, eObject, eStructuralFeature);	83	}
82	}	84
83		85	/**
84	/**	86	* Returns an observable list for the given multi-valued feature of the
85	* Returns an observable map in the default realm	87	* object.
86	* tracking the current value of the given feature for each object in the given set.	88	*
87	* @param objects the objects to track.	89	* @param realm
88	* @param eStructuralFeature the feature for which to track the value.	90	* the realm in which to observe.
89	* @return an observable map tracking the current value of the given feature for each object in the given set.	91	* @param eObject
90	*/	92	* the object to observe.
91	public static IObservableMap observeMap(IObservableSet objects, EStructuralFeature eStructuralFeature)	93	* @param eStructuralFeature
92	{	94	* the feature of the object to observe.
93	return new EObjectObservableMap(objects, eStructuralFeature);	95	* @return an observable list for the given multi-valued feature of the
94	}	96	* object.
95		97	*/
96	/**	98	public static IObservableList observeList(Realm realm, EObject eObject,
97	* Returns an array of observable maps in the default realm	99	EStructuralFeature eStructuralFeature) {
98	* tracking the current value of the given features for each object in the given set.	100	return new EObjectObservableList(realm, eObject, eStructuralFeature);
99	* @param objects the objects to track.	101	}
100	* @param eStructuralFeatures the features for which to track the value.	102
101	* @return an array of observable maps tracking the current value of the given features for each object in the given set.	103	/**
102	*/	104	* Returns an observable map in the default realm tracking the current value
103	public static IObservableMap[] observeMaps(IObservableSet objects, EStructuralFeature[] eStructuralFeatures)	105	* of the given feature for each object in the given set.
104	{	106	*
105	IObservableMap[] result = new IObservableMap [eStructuralFeatures.length];	107	* @param objects
106	for (int i = 0; i < eStructuralFeatures.length; i++)	108	* the objects to track.
107	{	109	* @param eStructuralFeature
108	result[i] = observeMap(objects, eStructuralFeatures[i]);	110	* the feature for which to track the value.
109	}	111	* @return an observable map tracking the current value of the given feature
110	return result;	112	* for each object in the given set.
111	}	113	*/
112		114	public static IObservableMap observeMap(IObservableSet objects,
113	/**	115	EStructuralFeature eStructuralFeature) {
114	* Returns an observable value that tracks the current value of the feature of the current value of the master observable value.	116	return new EObjectObservableMap(objects, eStructuralFeature);
115	* @param realm the realm in which to observe.	117	}
116	* @param value the master observable value.	118
117	* @param eStructuralFeature the feature for which to track the value.	119	/**
118	* @return an observable value that tracks the current value of the named property for the current value of the master observable value	120	* Returns an array of observable maps in the default realm tracking the
119	* @see MasterDetailObservables#detailValue(IObservableValue, IObservableFactory, Object)	121	* current value of the given features for each object in the given set.
120	*/	122	*
121	public static IObservableValue observeDetailValue(Realm realm, IObservableValue value, EStructuralFeature eStructuralFeature)	123	* @param objects
122	{	124	* the objects to track.
123	return MasterDetailObservables.detailValue(value, valueFactory(realm, eStructuralFeature), eStructuralFeature);	125	* @param eStructuralFeatures
124	}	126	* the features for which to track the value.
125		127	* @return an array of observable maps tracking the current value of the
126	/**	128	* given features for each object in the given set.
127	* Returns a factory for creating observable values	129	*/
128	* tracking the value of the given feature of a particular {@link EObject object}.	130	public static IObservableMap[] observeMaps(IObservableSet objects,
129	* @param realm the realm in which to observe.	131	EStructuralFeature[] eStructuralFeatures) {
130	* @param eStructuralFeature the feature for which to track the value.	132	IObservableMap[] result = new IObservableMap[eStructuralFeatures.length];
131	* @return an observable factory.	133	for (int i = 0; i < eStructuralFeatures.length; i++) {
132	*/	134	result[i] = observeMap(objects, eStructuralFeatures[i]);
133	public static IObservableFactory valueFactory(final Realm realm, final EStructuralFeature eStructuralFeature)	135	}
134	{	136	return result;
135	return	137	}
136	new IObservableFactory()	138
137	{	139	/**
138	public IObservable createObservable(Object target)	140	* Returns an observable value that tracks the current value of the feature
139	{	141	* of the current value of the master observable value.
140	return observeValue(realm, (EObject)target, eStructuralFeature);	142	*
141	}	143	* @param realm
142	};	144	* the realm in which to observe.
143	}	145	* @param value
144		146	* the master observable value.
145	/**	147	* @param eStructuralFeature
146	* Returns an observable list that tracks the current value of the feature of the current value of the master observable value.	148	* the feature for which to track the value.
147	* @param realm the realm in which to observe.	149	* @return an observable value that tracks the current value of the named
148	* @param value the master observable value.	150	* property for the current value of the master observable value
149	* @param eStructuralFeature the feature for which to track the value.	151	* @see MasterDetailObservables#detailValue(IObservableValue,
150	* @return an observable value that tracks the current value of the named property for the current value of the master observable value	152	* IObservableFactory, Object)
151	* @see MasterDetailObservables#detailList(IObservableValue, IObservableFactory, Object)	153	*/
152	*/	154	public static IObservableValue observeDetailValue(Realm realm,
153	public static IObservableList observeDetailList(Realm realm, IObservableValue value, EStructuralFeature eStructuralFeature)	155	IObservableValue value, EStructuralFeature eStructuralFeature) {
154	{	156	return MasterDetailObservables.detailValue(value, valueFactory(realm,
155	return MasterDetailObservables.detailList(value, listFactory(realm, eStructuralFeature), eStructuralFeature);	157	eStructuralFeature), eStructuralFeature);
156	}	158	}
157		159
158	/**	160	/**
159	* Returns a factory for creating observable lists	161	* Returns a factory for creating observable values tracking the value of
160	* tracking the value of the given feature of a particular {@link EObject object}.	162	* the given feature of a particular {@link EObject object}.
161	* @param realm the realm in which to observe.	163	*
162	* @param eStructuralFeature the feature for which to track the value.	164	* @param realm
163	* @return an observable factory.	165	* the realm in which to observe.
164	*/	166	* @param eStructuralFeature
165	public static IObservableFactory listFactory(final Realm realm, final EStructuralFeature eStructuralFeature)	167	* the feature for which to track the value.
166	{	168	* @return an observable factory.
167	return	169	*/
168	new IObservableFactory()	170	public static IObservableFactory valueFactory(final Realm realm,
169	{	171	final EStructuralFeature eStructuralFeature) {
170	public IObservable createObservable(Object target)	172	return new IObservableFactory() {
171	{	173	public IObservable createObservable(Object target) {
172	return observeList(realm, (EObject)target, eStructuralFeature);	174	return observeValue(realm, (EObject) target, eStructuralFeature);
173	}	175	}
174	};	176	};
175	}	177	}
176		178
177	/**	179	/**
178	* Returns a factory for creating observable maps	180	* Returns an observable list that tracks the current value of the feature
179	* tracking the value of the given feature of a particular {@link EObject object}.	181	* of the current value of the master observable value.
180	* @param eStructuralFeature the feature for which to track the value.	182	*
181	* @return an observable factory.	183	* @param realm
182	*/	184	* the realm in which to observe.
183	public static IObservableFactory mapFactory(final EStructuralFeature eStructuralFeature)	185	* @param value
184	{	186	* the master observable value.
185	return	187	* @param eStructuralFeature
186	new IObservableFactory()	188	* the feature for which to track the value.
187	{	189	* @return an observable value that tracks the current value of the named
188	public IObservable createObservable(Object target)	190	* property for the current value of the master observable value
189	{	191	* @see MasterDetailObservables#detailList(IObservableValue,
190	return observeMap((IObservableSet)target, eStructuralFeature);	192	* IObservableFactory, Object)
191	}	193	*/
192	};	194	public static IObservableList observeDetailList(Realm realm,
193	}	195	IObservableValue value, EStructuralFeature eStructuralFeature) {
		196	return MasterDetailObservables.detailList(value, listFactory(realm,
		197	eStructuralFeature), eStructuralFeature);
		198	}
		199
		200	/**
		201	* Returns a factory for creating observable lists tracking the value of the
		202	* given feature of a particular {@link EObject object}.
		203	*
		204	* @param realm
		205	* the realm in which to observe.
		206	* @param eStructuralFeature
		207	* the feature for which to track the value.
		208	* @return an observable factory.
		209	*/
		210	public static IObservableFactory listFactory(final Realm realm,
		211	final EStructuralFeature eStructuralFeature) {
		212	return new IObservableFactory() {
		213	public IObservable createObservable(Object target) {
		214	return observeList(realm, (EObject) target, eStructuralFeature);
		215	}
		216	};
		217	}
		218
		219	/**
		220	* Returns a factory for creating observable maps tracking the value of the
		221	* given feature of a particular {@link EObject object}.
		222	*
		223	* @param eStructuralFeature
		224	* the feature for which to track the value.
		225	* @return an observable factory.
		226	*/
		227	public static IObservableFactory mapFactory(
		228	final EStructuralFeature eStructuralFeature) {
		229	return new IObservableFactory() {
		230	public IObservable createObservable(Object target) {
		231	return observeMap((IObservableSet) target, eStructuralFeature);
		232	}
		233	};
		234	}
		235
		236	/**
		237	* Returns an observable for the resource contents (
		238	* {@link Resource#getContents()})
		239	*
		240	* @param resource
		241	* the resources the content should be observed
		242	* @return an observable list
		243	*/
		244	public static IObservableList observeResourceContents(Resource resource) {
		245	return new EWritableList<EObject>((NotifyingList<EObject>) resource.getContents());
		246	}
194	}	247	}

Added Link Here

(-)src/org/eclipse/emf/databinding/internal/EMFPropertyHelper.java (+69 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 194734)
10	* Martin Frey <martin.frey@logica.com> - bug 256150
11	* Matthew Hall - bug 264307
12	******************************************************************************/
13
14	package org.eclipse.emf.databinding.internal;
15
16	import org.eclipse.emf.ecore.EStructuralFeature;
17
18	/**
19	* @since 1.2
20	*
21	*/
22	public class EMFPropertyHelper {
23
24	/**
25	* Returns the element type of the given collection-typed property for the
26	* given bean.
27	*
28	* @param descriptor
29	* the property being inspected
30	* @return the element type of the given collection-typed property if it is
31	* an array property, or Object.class otherwise.
32	*/
33	public static Class<?> getCollectionPropertyElementType(
34	EStructuralFeature eStructuralFeature) {
35	return Object.class;
36	}
37
38
39	/**
40	* @param propertyDescriptor
41	* @return String description of property descriptor
42	*/
43	public static String propertyName(EStructuralFeature eStructuralFeature) {
44	return eStructuralFeature.getEContainingClass().getName()
45	+ "." + eStructuralFeature.getName() + ""; //$NON-NLS-1$ //$NON-NLS-2$
46	}
47
48	/**
49	* @param beanClass
50	* @return class name excluding package
51	*/
52	public static String shortClassName(EStructuralFeature eStructuralFeature) {
53	return eStructuralFeature.getEType().getName();
54	}
55
56	/**
57	* @param beanClass
58	* @return class name excluding package
59	*/
60	public static String shortClassName(Class<?> beanClass) {
61	if (beanClass == null)
62	return "?"; //$NON-NLS-1$
63	String className = beanClass.getName();
64	int lastDot = className.lastIndexOf('.');
65	if (lastDot != -1)
66	className = className.substring(lastDot + 1);
67	return className;
68	}
69	}

Added Link Here

(-)src/org/eclipse/emf/databinding/internal/EWritableList.java (+354 lines)
1	/**
2	* <copyright>
3	*
4	* Copyright (c) 2007 BestSolution.at and others.
5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at
8	* http://www.eclipse.org/legal/epl-v10.html
9	*
10	* Contributors:
11	* Tom Schindl<tom.schindl@bestsolution.at> - Initial API and implementation
12	*
13	* </copyright>
14	*
15	* $Id: $
16	*/
17	package org.eclipse.emf.databinding.internal;
18
19	import java.util.Collection;
20	import java.util.Iterator;
21	import java.util.List;
22	import java.util.ListIterator;
23
24	import org.eclipse.core.databinding.observable.Diffs;
25	import org.eclipse.core.databinding.observable.ObservableTracker;
26	import org.eclipse.core.databinding.observable.Realm;
27	import org.eclipse.core.databinding.observable.list.AbstractObservableList;
28	import org.eclipse.core.databinding.observable.list.IObservableList;
29	import org.eclipse.core.databinding.observable.list.ListDiff;
30	import org.eclipse.core.databinding.observable.list.ListDiffEntry;
31	import org.eclipse.emf.common.notify.Adapter;
32	import org.eclipse.emf.common.notify.Notification;
33	import org.eclipse.emf.common.notify.Notifier;
34	import org.eclipse.emf.common.notify.NotifyingList;
35	import org.eclipse.emf.common.notify.impl.AdapterImpl;
36	import org.eclipse.emf.ecore.resource.Resource;
37
38	/**
39	* Writable list which can be used to observe an {@link NotifyingList}
40	*
41	* @param <Type>
42	*/
43	public class EWritableList<Type> extends AbstractObservableList implements
44	IObservableList {
45	private NotifyingList<Type> wrappedList;
46	private Object elementType;
47	private boolean stale = false;
48
49	private class Listener extends AdapterImpl {
50	private Object feature;
51
52	public Listener(Object feature) {
53	this.feature = feature;
54	}
55
56	@Override
57	public void notifyChanged(Notification msg) {
58
59	if (feature == null
60	&& msg.getFeature() == null
61	&& msg.getFeatureID(Resource.class) != Resource.RESOURCE__CONTENTS) {
62	return;
63	}
64
65	if (feature == msg.getFeature() && !msg.isTouch()) {
66	final ListDiff diff;
67	switch (msg.getEventType()) {
68	case Notification.ADD: {
69	diff = Diffs.createListDiff(Diffs.createListDiffEntry(msg
70	.getPosition(), true, msg.getNewValue()));
71	// fireListChange(diff);
72	break;
73	}
74	case Notification.ADD_MANY: {
75	Collection<?> newValues = (Collection<?>) msg.getNewValue();
76	ListDiffEntry[] listDiffEntries = new ListDiffEntry[newValues
77	.size()];
78	int position = msg.getPosition();
79	int index = 0;
80	for (Object newValue : newValues) {
81	listDiffEntries[index++] = Diffs.createListDiffEntry(
82	position++, true, newValue);
83	}
84	diff = Diffs.createListDiff(listDiffEntries);
85	// fireListChange(diff);
86	break;
87	}
88	case Notification.REMOVE: {
89	diff = Diffs.createListDiff(Diffs.createListDiffEntry(msg
90	.getPosition(), false, msg.getOldValue()));
91	// fireListChange(diff);
92	break;
93	}
94	case Notification.REMOVE_MANY: {
95	Collection<?> oldValues = (Collection<?>) msg.getOldValue();
96	ListDiffEntry[] listDiffEntries = new ListDiffEntry[oldValues
97	.size()];
98	int position = msg.getPosition();
99	int index = 0;
100	for (Object oldValue : oldValues) {
101	listDiffEntries[index++] = Diffs.createListDiffEntry(
102	position++, false, oldValue);
103	}
104	diff = Diffs.createListDiff(listDiffEntries);
105	// fireListChange(diff);
106	break;
107	}
108	case Notification.MOVE: {
109	Object movedValue = msg.getNewValue();
110	ListDiffEntry[] listDiffEntries = new ListDiffEntry[2];
111	listDiffEntries[0] = Diffs.createListDiffEntry(
112	(Integer) msg.getOldValue(), false, movedValue);
113	listDiffEntries[1] = Diffs.createListDiffEntry(msg
114	.getPosition(), true, movedValue);
115	diff = Diffs.createListDiff(listDiffEntries);
116	// fireListChange(diff);
117	break;
118	}
119	case Notification.UNSET: {
120	// This just represents going back to the unset state, but
121	// that doesn't affect the contents of the list.
122	//
123	return;
124	}
125	default: {
126	throw new RuntimeException("unhandled case");
127	}
128	}
129
130	getRealm().exec(new Runnable() {
131	public void run() {
132	fireListChange(diff);
133	}
134	});
135
136	// System.err.println("CHANGE: " +
137	// diff.getDifferences()[0].getElement());
138
139	// fireListChange(diff);
140	// listener.handlePropertyChange(new SimplePropertyEvent(msg
141	// .getNotifier(), EMFListProperty.this, diff));
142	}
143	}
144
145	}
146
147	private Adapter listener;
148
149	/**
150	* New writable list wrapping the {@link NotifyingList}
151	*
152	* @param wrappedList
153	* the wrapped list
154	*/
155	public EWritableList(NotifyingList<Type> wrappedList) {
156	this(Realm.getDefault(), wrappedList);
157	}
158
159	/**
160	* New writable list wrapping the {@link NotifyingList} and using the
161	* {@link Realm}
162	*
163	* @param realm
164	* the realm
165	* @param wrappedList
166	* the wrapped list
167	*/
168	public EWritableList(Realm realm, NotifyingList<Type> wrappedList) {
169	this(realm, wrappedList, null);
170	}
171
172	/**
173	* New writable list wrapping the {@link NotifyingList}
174	*
175	* @param realm
176	* the realm
177	* @param wrappedList
178	* the wrapped list
179	* @param elementType
180	* the element type
181	*/
182	public EWritableList(Realm realm, NotifyingList<Type> wrappedList,
183	Class<Type> elementType) {
184	super(realm);
185	this.wrappedList = wrappedList;
186	this.elementType = elementType;
187	if (wrappedList.getNotifier() instanceof Notifier) {
188	Notifier notifier = (Notifier) wrappedList.getNotifier();
189	listener = new Listener(wrappedList.getFeature());
190	notifier.eAdapters().add(listener);
191	} else {
192	throw new IllegalArgumentException(
193	"Wrapped list must have a notifier attached!");
194	}
195	}
196
197	@Override
198	public synchronized void dispose() {
199	((Notifier) wrappedList.getNotifier()).eAdapters().remove(listener);
200	super.dispose();
201	}
202
203	private void getterCalled() {
204	ObservableTracker.getterCalled(this);
205	}
206
207	@SuppressWarnings("unchecked")
208	public boolean add(Object o) {
209	checkRealm();
210	return wrappedList.add((Type) o);
211	}
212
213	@SuppressWarnings("unchecked")
214	public boolean addAll(Collection c) {
215	checkRealm();
216	return wrappedList.addAll(c);
217	}
218
219	@SuppressWarnings("unchecked")
220	public boolean addAll(int index, Collection c) {
221	checkRealm();
222	return wrappedList.addAll(index, c);
223	}
224
225	public boolean contains(Object o) {
226	getterCalled();
227	return wrappedList.contains(o);
228	}
229
230	@SuppressWarnings("unchecked")
231	public boolean containsAll(Collection c) {
232	getterCalled();
233	return wrappedList.containsAll(c);
234	}
235
236	public Object get(int index) {
237	getterCalled();
238	return wrappedList.get(index);
239	}
240
241	public Object getElementType() {
242	checkRealm();
243	return elementType;
244	}
245
246	public int indexOf(Object o) {
247	getterCalled();
248	return wrappedList.indexOf(o);
249	}
250
251	public boolean isEmpty() {
252	getterCalled();
253	return wrappedList.isEmpty();
254	}
255
256	public Iterator<Type> iterator() {
257	getterCalled();
258	return wrappedList.iterator();
259	}
260
261	public int lastIndexOf(Object o) {
262	getterCalled();
263	return wrappedList.lastIndexOf(o);
264	}
265
266	public ListIterator<Type> listIterator() {
267	getterCalled();
268	return wrappedList.listIterator();
269	}
270
271	public ListIterator<Type> listIterator(int index) {
272	getterCalled();
273	return wrappedList.listIterator(index);
274	}
275
276	public Object move(int oldIndex, int newIndex) {
277	checkRealm();
278	return wrappedList.move(oldIndex, newIndex);
279	}
280
281	public boolean remove(Object o) {
282	checkRealm();
283	return wrappedList.remove(o);
284	}
285
286	public Object remove(int index) {
287	checkRealm();
288	return wrappedList.remove(index);
289	}
290
291	@SuppressWarnings("unchecked")
292	public boolean removeAll(Collection c) {
293	checkRealm();
294	return wrappedList.removeAll(c);
295	}
296
297	@SuppressWarnings("unchecked")
298	public boolean retainAll(Collection c) {
299	checkRealm();
300	return wrappedList.retainAll(c);
301	}
302
303	@SuppressWarnings("unchecked")
304	public Object set(int index, Object element) {
305	checkRealm();
306	return wrappedList.set(index, (Type) element);
307	}
308
309	public int doGetSize() {
310	getterCalled();
311	return wrappedList.size();
312	}
313
314	public List<Type> subList(int fromIndex, int toIndex) {
315	getterCalled();
316	return wrappedList.subList(fromIndex, toIndex);
317	}
318
319	public Object[] toArray() {
320	getterCalled();
321	return wrappedList.toArray();
322	}
323
324	public Object[] toArray(Object[] a) {
325	getterCalled();
326	return wrappedList.toArray();
327	}
328
329	@SuppressWarnings("unchecked")
330	public void add(int index, Object element) {
331	checkRealm();
332	wrappedList.add(index, (Type) element);
333	}
334
335	public void clear() {
336	checkRealm();
337	wrappedList.clear();
338	}
339
340	public boolean isStale() {
341	getterCalled();
342	return stale;
343	}
344
345	// public void setStale(boolean stale) {
346	// checkRealm();
347	//
348	// boolean wasStale = this.stale;
349	// this.stale = stale;
350	// if (!wasStale && stale) {
351	// fireStale();
352	// }
353	// }
354	}

Added Link Here

(-)src/org/eclipse/emf/databinding/IEMFListValueProperty.java (+192 lines)
1	package org.eclipse.emf.databinding;
2
3	import org.eclipse.core.databinding.property.value.IValueProperty;
4	import org.eclipse.emf.ecore.EStructuralFeature;
5
6	public interface IEMFListValueProperty extends IEMFProperty, IValueProperty {
7	public interface Condition {
8	public boolean match(int index, Object object);
9	}
10
11	/**
12	* Returns a master-detail combination of this property and the specified
13	* value property.
14	*
15	* @param propertyName
16	* the value property to observe. May be nested e.g.
17	* "parent.name"
18	* @return a master-detail combination of this property and the specified
19	* value property.
20	* @see #value(IEMFValueProperty)
21	*/
22	public IEMFValueProperty value(FeaturePath featurePath);
23
24	public IEMFValueProperty value(EStructuralFeature feature);
25
26	/**
27	* Returns a master-detail combination of this property and the specified
28	* value property. The returned property will observe the specified detail
29	* value property for the value of the master value property.
30	* <p>
31	* Example:
32	*
33	* <pre>
34	* // Observes the Node-typed "parent" property of a Node object
35	* IBeanValueProperty parent = BeanProperties.value(Node.class, "parent");
36	* // Observes the string-typed "name" property of a Node object
37	* IBeanValueProperty name = BeanProperties.value(Node.class, "name");
38	* // Observes the name of the parent of a Node object.
39	* IBeanValueProperty parentName = parent.value(name);
40	* </pre>
41	*
42	* @param property
43	* the detail property to observe
44	* @return a master-detail combination of this property and the specified
45	* value property.
46	*/
47	public IEMFValueProperty value(IEMFValueProperty property);
48
49	/**
50	* Returns a master-detail combination of this property and the specified
51	* list property.
52	*
53	* @param propertyName
54	* the list property to observe
55	* @return a master-detail combination of this property and the specified
56	* list property.
57	* @see #list(IEMFListProperty)
58	*/
59	public IEMFListProperty list(EStructuralFeature feature);
60
61	/**
62	* Returns a master-detail combination of this property and the specified
63	* list property. The returned property will observe the specified list
64	* property for the value of the master property.
65	* <p>
66	* Example:
67	*
68	* <pre>
69	* // Observes the Node-typed "parent" property of a Node object.
70	* IBeanValueProperty parent = BeanProperties.value(Node.class, "parent");
71	* // Observes the List-typed "children" property of a Node object
72	* // where the elements are Node objects
73	* IBeanListProperty children = BeanProperties.list(Node.class, "children",
74	* Node.class);
75	* // Observes the children of the parent (siblings) of a Node object.
76	* IBeanListProperty siblings = parent.list(children);
77	* </pre>
78	*
79	* @param property
80	* the detail property to observe
81	* @return a master-detail combination of this property and the specified
82	* list property.
83	*/
84	public IEMFListProperty list(IEMFListProperty property);
85
86	/**
87	* Returns a master-detail combination of this property and the specified
88	* set property.
89	*
90	* @param propertyName
91	* the set property to observe
92	* @return a master-detail combination of this property and the specified
93	* set property.
94	* @see #set(IEMFSetProperty)
95	*/
96	public IEMFSetProperty set(EStructuralFeature feature);
97
98	/**
99	* Returns a master-detail combination of this property and the specified
100	* set property.
101	*
102	* @param propertyName
103	* the set property to observe
104	* @param elementType
105	* the element type of the named property
106	* @return a master-detail combination of this property and the specified
107	* set property.
108	* @see #set(IEMFSetProperty)
109	*/
110	public IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType);
111
112	/**
113	* Returns a master-detail combination of this property and the specified
114	* set property. The returned property will observe the specified set
115	* property for the value of the master property.
116	* <p>
117	* Example:
118	*
119	* <pre>
120	* // Observes the Node-typed "parent" property of a Node object.
121	* IBeanValueProperty parent = BeanProperties.value(Node.class, "parent");
122	* // Observes the Set-typed "children" property of a Node object
123	* // where the elements are Node objects
124	* IBeanSetProperty children = BeanProperties.set(Node.class, "children",
125	* Node.class);
126	* // Observes the children of the parent (siblings) of a Node object.
127	* IBeanSetProperty siblings = parent.set(children);
128	* </pre>
129	*
130	* @param property
131	* the detail property to observe
132	* @return a master-detail combination of this property and the specified
133	* set property.
134	*/
135	public IEMFSetProperty set(IEMFSetProperty property);
136
137	/**
138	* Returns a master-detail combination of this property and the specified
139	* map property.
140	*
141	* @param propertyName
142	* the map property to observe
143	* @return a master-detail combination of this property and the specified
144	* map property.
145	* @see #map(IEMFMapProperty)
146	*/
147	public IEMFMapProperty map(EStructuralFeature feature);
148
149	/**
150	* Returns a master-detail combination of this property and the specified
151	* map property.
152	*
153	* @param propertyName
154	* the map property to observe
155	* @param keyType
156	* the key type of the named property
157	* @param valueType
158	* the value type of the named property
159	* @return a master-detail combination of this property and the specified
160	* map property.
161	* @see #map(IEMFMapProperty)
162	*/
163	public IEMFMapProperty map(EStructuralFeature feature, Class<?> keyType,
164	Class<?> valueType);
165
166	/**
167	* Returns a master-detail combination of this property and the specified
168	* map property. The returned property will observe the specified map
169	* property for the value of the master property.
170	* <p>
171	* Example:
172	*
173	* <pre>
174	* // Observes the Contact-typed "supervisor" property of a
175	* // Contact class
176	* IBeanValueProperty supervisor = BeanProperties.value(Contact.class,
177	* "supervisor");
178	* // Observes the property "phoneNumbers" of a Contact object--a property mapping
179	* // from PhoneNumberType to PhoneNumber "set-typed "children",
180	* IBeanMapProperty phoneNumbers = BeanProperties.map(Contact.class,
181	* "phoneNumbers", PhoneNumberType.class, PhoneNumber.class);
182	* // Observes the phone numbers of a contact's supervisor:
183	* IBeanMapProperty supervisorPhoneNumbers = supervisor.map(phoneNumbers);
184	* </pre>
185	*
186	* @param property
187	* the detail property to observe
188	* @return a master-detail combination of this property and the specified
189	* map property.
190	*/
191	public IEMFMapProperty map(IEMFMapProperty property);
192	}

Added Link Here

(-)src/org/eclipse/emf/databinding/internal/EMFPropertyListenerSupport.java (+51 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	* Matthew Hall - bug 118516
11	*******************************************************************************/
12	package org.eclipse.emf.databinding.internal;
13
14	import org.eclipse.core.runtime.Assert;
15	import org.eclipse.emf.common.notify.Adapter;
16	import org.eclipse.emf.ecore.EObject;
17
18	/**
19	* This is a helper that will hook up and listen for
20	* <code>PropertyChangeEvent</code> events for a set of target JavaBeans
21	*
22	* @since 1.0
23	*/
24	public class EMFPropertyListenerSupport {
25	/**
26	* Start listen to target (if it supports the JavaBean property change
27	* listener pattern)
28	*
29	* @param bean
30	* @param propertyName
31	* @param listener
32	*/
33	public static void hookListener(EObject bean, Adapter listener) {
34	Assert.isNotNull(bean, "Bean cannot be null"); //$NON-NLS-1$
35	Assert.isNotNull(listener, "Listener cannot be null"); //$NON-NLS-1$
36	bean.eAdapters().add(listener);
37	}
38
39	/**
40	* Stop listen to target
41	*
42	* @param bean
43	* @param propertyName
44	* @param listener
45	*/
46	public static void unhookListener(EObject bean, Adapter listener) {
47	Assert.isNotNull(bean, "Bean cannot be null"); //$NON-NLS-1$
48	Assert.isNotNull(listener, "Listener cannot be null"); //$NON-NLS-1$
49	bean.eAdapters().remove(listener);
50	}
51	}

Added Link Here

(-)src/org/eclipse/emf/databinding/IEMFObservable.java (+33 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 Brad Reynolds and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Brad Reynolds - initial API and implementation
10	* Brad Reynolds - bug 147515
11	******************************************************************************/
12
13	package org.eclipse.emf.databinding;
14
15	import org.eclipse.core.databinding.observable.IObserving;
16	import org.eclipse.emf.ecore.EStructuralFeature;
17
18	/**
19	* Provides access to details of bean observables.
20	* <p>
21	* This interface is not meant to be implemented by clients.
22	* </p>
23	*
24	* @since 3.3
25	*/
26	public interface IEMFObservable extends IObserving {
27	/**
28	* @return property descriptor of the property being observed,
29	* <code>null</code> if the runtime time information was not
30	* provided on construction of the observable
31	*/
32	public EStructuralFeature getStructuralFeature();
33	}

Added Link Here

(-)src/org/eclipse/emf/databinding/IEMFValueProperty.java (+212 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 195222)
10	******************************************************************************/
11
12	package org.eclipse.emf.databinding;
13
14	import org.eclipse.core.databinding.property.value.IValueProperty;
15	import org.eclipse.emf.databinding.IEMFListValueProperty.Condition;
16	import org.eclipse.emf.ecore.EStructuralFeature;
17
18	/**
19	* An {@link IValueProperty} extension interface with convenience methods for
20	* creating nested bean properties.
21	*
22	* @since 1.2
23	* @noextend This interface is not intended to be extended by clients.
24	* @noimplement This interface is not intended to be implemented by clients.
25	*/
26	public interface IEMFValueProperty extends IEMFProperty, IValueProperty {
27	/**
28	* Returns a master-detail combination of this property and the specified
29	* value property.
30	*
31	* @param propertyName
32	* the value property to observe. May be nested e.g.
33	* "parent.name"
34	* @return a master-detail combination of this property and the specified
35	* value property.
36	* @see #value(IEMFValueProperty)
37	*/
38	public IEMFValueProperty value(FeaturePath featurePath);
39
40	public IEMFValueProperty value(EStructuralFeature feature);
41
42	/**
43	* Returns a master-detail combination of this property and the specified
44	* value property. The returned property will observe the specified detail
45	* value property for the value of the master value property.
46	* <p>
47	* Example:
48	*
49	* <pre>
50	* // Observes the Node-typed "parent" property of a Node object
51	* IBeanValueProperty parent = BeanProperties.value(Node.class, "parent");
52	* // Observes the string-typed "name" property of a Node object
53	* IBeanValueProperty name = BeanProperties.value(Node.class, "name");
54	* // Observes the name of the parent of a Node object.
55	* IBeanValueProperty parentName = parent.value(name);
56	* </pre>
57	*
58	* @param property
59	* the detail property to observe
60	* @return a master-detail combination of this property and the specified
61	* value property.
62	*/
63	public IEMFValueProperty value(IEMFValueProperty property);
64
65	public IEMFListValueProperty listValue(FeaturePath featurePath, Condition condition);
66
67	public IEMFListValueProperty listValue(EStructuralFeature feature, Condition condition);
68
69	/**
70	* Returns a master-detail combination of this property and the specified
71	* list property.
72	*
73	* @param propertyName
74	* the list property to observe
75	* @return a master-detail combination of this property and the specified
76	* list property.
77	* @see #list(IEMFListProperty)
78	*/
79	public IEMFListProperty list(EStructuralFeature feature);
80
81	/**
82	* Returns a master-detail combination of this property and the specified
83	* list property. The returned property will observe the specified list
84	* property for the value of the master property.
85	* <p>
86	* Example:
87	*
88	* <pre>
89	* // Observes the Node-typed "parent" property of a Node object.
90	* IBeanValueProperty parent = BeanProperties.value(Node.class, "parent");
91	* // Observes the List-typed "children" property of a Node object
92	* // where the elements are Node objects
93	* IBeanListProperty children = BeanProperties.list(Node.class, "children",
94	* Node.class);
95	* // Observes the children of the parent (siblings) of a Node object.
96	* IBeanListProperty siblings = parent.list(children);
97	* </pre>
98	*
99	* @param property
100	* the detail property to observe
101	* @return a master-detail combination of this property and the specified
102	* list property.
103	*/
104	public IEMFListProperty list(IEMFListProperty property);
105
106	/**
107	* Returns a master-detail combination of this property and the specified
108	* set property.
109	*
110	* @param propertyName
111	* the set property to observe
112	* @return a master-detail combination of this property and the specified
113	* set property.
114	* @see #set(IEMFSetProperty)
115	*/
116	public IEMFSetProperty set(EStructuralFeature feature);
117
118	/**
119	* Returns a master-detail combination of this property and the specified
120	* set property.
121	*
122	* @param propertyName
123	* the set property to observe
124	* @param elementType
125	* the element type of the named property
126	* @return a master-detail combination of this property and the specified
127	* set property.
128	* @see #set(IEMFSetProperty)
129	*/
130	public IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType);
131
132	/**
133	* Returns a master-detail combination of this property and the specified
134	* set property. The returned property will observe the specified set
135	* property for the value of the master property.
136	* <p>
137	* Example:
138	*
139	* <pre>
140	* // Observes the Node-typed "parent" property of a Node object.
141	* IBeanValueProperty parent = BeanProperties.value(Node.class, "parent");
142	* // Observes the Set-typed "children" property of a Node object
143	* // where the elements are Node objects
144	* IBeanSetProperty children = BeanProperties.set(Node.class, "children",
145	* Node.class);
146	* // Observes the children of the parent (siblings) of a Node object.
147	* IBeanSetProperty siblings = parent.set(children);
148	* </pre>
149	*
150	* @param property
151	* the detail property to observe
152	* @return a master-detail combination of this property and the specified
153	* set property.
154	*/
155	public IEMFSetProperty set(IEMFSetProperty property);
156
157	/**
158	* Returns a master-detail combination of this property and the specified
159	* map property.
160	*
161	* @param propertyName
162	* the map property to observe
163	* @return a master-detail combination of this property and the specified
164	* map property.
165	* @see #map(IEMFMapProperty)
166	*/
167	public IEMFMapProperty map(EStructuralFeature feature);
168
169	/**
170	* Returns a master-detail combination of this property and the specified
171	* map property.
172	*
173	* @param propertyName
174	* the map property to observe
175	* @param keyType
176	* the key type of the named property
177	* @param valueType
178	* the value type of the named property
179	* @return a master-detail combination of this property and the specified
180	* map property.
181	* @see #map(IEMFMapProperty)
182	*/
183	public IEMFMapProperty map(EStructuralFeature feature, Class<?> keyType,
184	Class<?> valueType);
185
186	/**
187	* Returns a master-detail combination of this property and the specified
188	* map property. The returned property will observe the specified map
189	* property for the value of the master property.
190	* <p>
191	* Example:
192	*
193	* <pre>
194	* // Observes the Contact-typed "supervisor" property of a
195	* // Contact class
196	* IBeanValueProperty supervisor = BeanProperties.value(Contact.class,
197	* "supervisor");
198	* // Observes the property "phoneNumbers" of a Contact object--a property mapping
199	* // from PhoneNumberType to PhoneNumber "set-typed "children",
200	* IBeanMapProperty phoneNumbers = BeanProperties.map(Contact.class,
201	* "phoneNumbers", PhoneNumberType.class, PhoneNumber.class);
202	* // Observes the phone numbers of a contact's supervisor:
203	* IBeanMapProperty supervisorPhoneNumbers = supervisor.map(phoneNumbers);
204	* </pre>
205	*
206	* @param property
207	* the detail property to observe
208	* @return a master-detail combination of this property and the specified
209	* map property.
210	*/
211	public IEMFMapProperty map(IEMFMapProperty property);
212	}

Added Link Here

(-)src/org/eclipse/emf/databinding/IEMFProperty.java (+33 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 194734)
10	******************************************************************************/
11
12	package org.eclipse.emf.databinding;
13
14	import org.eclipse.core.databinding.property.IProperty;
15	import org.eclipse.emf.ecore.EStructuralFeature;
16
17	/**
18	* An IProperty extension interface providing access to details of bean
19	* properties.
20	*
21	* @since 1.2
22	* @noextend This interface is not intended to be extended by clients.
23	* @noimplement This interface is not intended to be implemented by clients.
24	*/
25	public interface IEMFProperty extends IProperty {
26	/**
27	* Returns the property descriptor of the bean property being observed. This
28	* method returns null in the case of anonymous properties.
29	*
30	* @return the property descriptor of the bean property being observed
31	*/
32	public EStructuralFeature getStructuralFeature();
33	}

Added Link Here

(-)src/org/eclipse/emf/databinding/IEMFMapProperty.java (+58 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 195222)
10	******************************************************************************/
11
12	package org.eclipse.emf.databinding;
13
14	import java.util.Map;
15
16	import org.eclipse.core.databinding.property.map.IMapProperty;
17	import org.eclipse.emf.ecore.EStructuralFeature;
18
19	/**
20	* An {@link IMapProperty} extension interface with convenience methods for
21	* creating nested bean properties.
22	*
23	* @since 1.2
24	* @noextend This interface is not intended to be extended by clients.
25	* @noimplement This interface is not intended to be implemented by clients.
26	*/
27	public interface IEMFMapProperty extends IEMFProperty, IMapProperty {
28
29	/**
30	* Returns a master-detail combination of this property and the specified
31	* value property.
32	*
33	* @param propertyName
34	* the value property to observe. May be nested e.g.
35	* "parent.name"
36	* @return a master-detail combination of this property and the specified
37	* value property.
38	* @see #values(IEMFValueProperty)
39	*/
40	public IEMFMapProperty values(FeaturePath featurePath);
41
42	public IEMFMapProperty values(EStructuralFeature feature);
43
44	/**
45	* Returns a master-detail combination of this property and the specified
46	* value property. The returned property will observe the specified value
47	* property for all {@link Map#values() values} observed by this map
48	* property, mapping from this map property's {@link Map#keySet() key set}
49	* to the specified value property's value for each element in the master
50	* property's {@link Map#values() values} collection.
51	*
52	* @param property
53	* the detail property to observe
54	* @return a master-detail combination of this property and the specified
55	* value property.
56	*/
57	public IEMFMapProperty values(IEMFValueProperty property);
58	}

Added Link Here

(-)src/org/eclipse/emf/databinding/internal/Util.java (+35 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.emf.databinding.internal;
13
14	/**
15	* @since 3.3
16	*
17	*/
18	public class Util {
19
20	/**
21	* Checks whether the two objects are <code>null</code> -- allowing for
22	* <code>null</code>.
23	*
24	* @param left
25	* The left object to compare; may be <code>null</code>.
26	* @param right
27	* The right object to compare; may be <code>null</code>.
28	* @return <code>true</code> if the two objects are equivalent;
29	* <code>false</code> otherwise.
30	*/
31	public static final boolean equals(final Object left, final Object right) {
32	return left == null ? right == null : ((right != null) && left
33	.equals(right));
34	}
35	}

Added Link Here

(-)src/org/eclipse/emf/databinding/IEMFSetProperty.java (+67 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 195222)
10	******************************************************************************/
11
12	package org.eclipse.emf.databinding;
13
14	import org.eclipse.core.databinding.property.set.ISetProperty;
15	import org.eclipse.emf.ecore.EStructuralFeature;
16
17	/**
18	* An {@link ISetProperty} extension interface with convenience methods for
19	* creating nested bean properties.
20	*
21	* @since 1.2
22	* @noextend This interface is not intended to be extended by clients.
23	* @noimplement This interface is not intended to be implemented by clients.
24	*/
25	public interface IEMFSetProperty extends IEMFProperty, ISetProperty {
26	/**
27	* Returns a master-detail combination of this property and the specified
28	* value property.
29	*
30	* @param propertyName
31	* the value property to observe. May be nested e.g.
32	* "parent.name"
33	* @return a master-detail combination of this property and the specified
34	* value property.
35	* @see #values(IEMFValueProperty)
36	*/
37	public IEMFMapProperty values(FeaturePath featurePath);
38
39	public IEMFMapProperty values(EStructuralFeature feature);
40
41	/**
42	* Returns a master-detail combination of this property and the specified
43	* value property. The returned property will observe the specified value
44	* property for all elements observed by this set property, mapping from
45	* this set property's elements (keys) to the specified value property's
46	* value for each element (values).
47	* <p>
48	* Example:
49	*
50	* <pre>
51	* // Observes the set-typed "children" property of a Person object,
52	* // where the elements are Person objects
53	* IBeanSetProperty children = BeanProperties.set(Person.class, "children",
54	* Person.class);
55	* // Observes the string-typed "name" property of a Person object
56	* IBeanValueProperty name = BeanProperties.value(Person.class, "name");
57	* // Observes a map of children objects to their respective names.
58	* IBeanMapProperty childrenNames = children.values(name);
59	* </pre>
60	*
61	* @param property
62	* the detail property to observe
63	* @return a master-detail combination of this property and the specified
64	* value property.
65	*/
66	public IEMFMapProperty values(IEMFValueProperty property);
67	}

Added Link Here

(-)src/org/eclipse/emf/databinding/EMFProperties.java (+201 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 194734)
10	* Matthew Hall - bug 195222, 247997, 261843, 264307
11	******************************************************************************/
12
13	package org.eclipse.emf.databinding;
14
15	import org.eclipse.core.databinding.property.list.IListProperty;
16	import org.eclipse.core.databinding.property.map.IMapProperty;
17	import org.eclipse.core.databinding.property.set.ISetProperty;
18	import org.eclipse.core.databinding.property.value.IValueProperty;
19	import org.eclipse.emf.databinding.IEMFListValueProperty.Condition;
20	import org.eclipse.emf.databinding.internal.EMFListProperty;
21	import org.eclipse.emf.databinding.internal.EMFListPropertyDecorator;
22	import org.eclipse.emf.databinding.internal.EMFListValueProperty;
23	import org.eclipse.emf.databinding.internal.EMFListValuePropertyDecorator;
24	import org.eclipse.emf.databinding.internal.EMFMapProperty;
25	import org.eclipse.emf.databinding.internal.EMFMapPropertyDecorator;
26	import org.eclipse.emf.databinding.internal.EMFSetProperty;
27	import org.eclipse.emf.databinding.internal.EMFSetPropertyDecorator;
28	import org.eclipse.emf.databinding.internal.EMFValueProperty;
29	import org.eclipse.emf.databinding.internal.EMFValuePropertyDecorator;
30	import org.eclipse.emf.ecore.EStructuralFeature;
31
32	/**
33	* A factory for creating properties for Java objects that conform to the <a
34	* href="http://java.sun.com/products/javabeans/docs/spec.html">JavaBean
35	* specification</a> for bound properties.
36	*
37	* @since 1.2
38	*/
39	public class EMFProperties {
40	public static final boolean DEBUG = false;
41
42	public static IEMFListValueProperty listValue(EStructuralFeature feature, Condition condition) {
43	return listValue(FeaturePath.fromList(feature),condition);
44	}
45
46	public static IEMFListValueProperty listValue(FeaturePath featurePath, Condition condition) {
47	IValueProperty property;
48	if( featurePath.getFeaturePath().length == 1 ) {
49	property = new EMFListValueProperty(featurePath.getFeaturePath()[0],condition);
50	return new EMFListValuePropertyDecorator(property, featurePath.getFeaturePath()[0]);
51	} else {
52	property = new EMFValueProperty(featurePath.getFeaturePath()[0]);
53
54	IEMFValueProperty beanProperty = new EMFValuePropertyDecorator(
55	property, featurePath.getFeaturePath()[0]);
56
57	int i = 1;
58	for (i = 1; i < featurePath.getFeaturePath().length; i++) {
59	beanProperty = beanProperty.value(featurePath.getFeaturePath()[i]);
60	}
61
62	return beanProperty.listValue(featurePath.getFeaturePath()[i],condition);
63	}
64
65	}
66
67	public static IEMFValueProperty value(EStructuralFeature feature) {
68	return value(FeaturePath.fromList(feature));
69	}
70
71	/**
72	* Returns a value property for the given property name of the given bean
73	* class.
74	*
75	* @param beanClass
76	* the bean class
77	* @param propertyName
78	* the property name. May be nested e.g. "parent.name"
79	* @param valueType
80	* the value type of the returned value property
81	* @return a value property for the given property name of the given bean
82	* class.
83	*/
84	public static IEMFValueProperty value(FeaturePath featurePath) {
85	IValueProperty property;
86	property = new EMFValueProperty(featurePath.getFeaturePath()[0]);
87
88	IEMFValueProperty beanProperty = new EMFValuePropertyDecorator(
89	property, featurePath.getFeaturePath()[0]);
90
91	for (int i = 1; i < featurePath.getFeaturePath().length; i++) {
92	beanProperty = beanProperty.value(featurePath.getFeaturePath()[i]);
93	}
94
95	return beanProperty;
96	}
97
98	public static IEMFValueProperty[] values(EStructuralFeature... features) {
99	IEMFValueProperty[] properties = new IEMFValueProperty[features.length];
100	for (int i = 0; i < properties.length; i++)
101	properties[i] = value(features[i]);
102	return properties;
103	}
104
105	/**
106	* Returns a value property array for the given property names of the given
107	* bean class.
108	*
109	* @param beanClass
110	* the bean class
111	* @param propertyNames
112	* array of property names. May be nested e.g. "parent.name"
113	* @return a value property array for the given property names of the given
114	* bean class.
115	*/
116	public static IEMFValueProperty[] values(FeaturePath... featurePaths) {
117	IEMFValueProperty[] properties = new IEMFValueProperty[featurePaths.length];
118	for (int i = 0; i < properties.length; i++)
119	properties[i] = value(featurePaths[i]);
120	return properties;
121	}
122
123	public static IEMFSetProperty set(EStructuralFeature feature) {
124	return set(feature,null);
125	}
126
127	/**
128	* Returns a set property for the given property name of the given bean
129	* class.
130	*
131	* @param beanClass
132	* the bean class
133	* @param propertyName
134	* the property name
135	* @param elementType
136	* the element type of the returned set property
137	* @return a set property for the given property name of the given bean
138	* class.
139	*/
140	public static IEMFSetProperty set(EStructuralFeature feature, Class<?> elementType) {
141	ISetProperty property;
142	property = new EMFSetProperty(feature, elementType);
143	return new EMFSetPropertyDecorator(property, feature);
144	}
145
146	/**
147	* Returns a list property for the given property name of the given bean
148	* class.
149	*
150	* @param beanClass
151	* the bean class
152	* @param propertyName
153	* the property name
154	* @param elementType
155	* the element type of the returned list property
156	* @return a list property for the given property name of the given bean
157	* class.
158	*/
159	public static IEMFListProperty list(EStructuralFeature feature) {
160	IListProperty property;
161	property = new EMFListProperty(feature);
162	return new EMFListPropertyDecorator(property, feature);
163	}
164
165	/**
166	* Returns a map property for the given property name of an arbitrary bean
167	* class. Objects lacking the named property are treated the same as if the
168	* property always contains an empty map.
169	*
170	* @param propertyName
171	* the property name
172	* @return a map property for the given property name of an arbitrary bean
173	* class.
174	*/
175	public static IEMFMapProperty map(EStructuralFeature feature) {
176	return map(feature, null, null);
177	}
178
179	/**
180	* Returns a map property for the given property name of the given bean
181	* class.
182	*
183	* @param beanClass
184	* the bean class
185	* @param propertyName
186	* the property name
187	* @param keyType
188	* the key type for the returned map property
189	* @param valueType
190	* the value type for the returned map property
191	* @return a map property for the given property name of the given bean
192	* class.
193	*/
194	public static IEMFMapProperty map(EStructuralFeature feature,
195	Class<?> keyType, Class<?> valueType) {
196	IMapProperty property;
197	property = new EMFMapProperty(feature, keyType,
198	valueType);
199	return new EMFMapPropertyDecorator(property, feature);
200	}
201	}

Added Link Here

(-)src/org/eclipse/emf/databinding/FeaturePath.java (+19 lines)
1	package org.eclipse.emf.databinding;
2
3	import org.eclipse.emf.ecore.EStructuralFeature;
4
5	public class FeaturePath {
6	private EStructuralFeature[] featurePath;
7
8	private FeaturePath(EStructuralFeature[] featurePath) {
9	this.featurePath = featurePath;
10	}
11
12	public EStructuralFeature[] getFeaturePath() {
13	return featurePath;
14	}
15
16	public static FeaturePath fromList(EStructuralFeature... featurePath) {
17	return new FeaturePath(featurePath);
18	}
19	}

Added Link Here

(-)src/org/eclipse/emf/databinding/edit/internal/EMFEditMapProperty.java (+46 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 194734)
10	* Matthew Hall - bugs 195222, 264307, 265561
11	******************************************************************************/
12
13	package org.eclipse.emf.databinding.edit.internal;
14
15	import java.util.Map;
16
17	import org.eclipse.core.databinding.observable.map.MapDiff;
18	import org.eclipse.emf.common.command.Command;
19	import org.eclipse.emf.databinding.internal.EMFMapProperty;
20	import org.eclipse.emf.ecore.EObject;
21	import org.eclipse.emf.ecore.EStructuralFeature;
22	import org.eclipse.emf.edit.command.SetCommand;
23	import org.eclipse.emf.edit.domain.EditingDomain;
24
25	/**
26	* @since 3.3
27	*
28	*/
29	public class EMFEditMapProperty extends EMFMapProperty {
30	private final EditingDomain editingDomain;
31
32	public EMFEditMapProperty(EditingDomain editingDomain, EStructuralFeature eStructuralFeature,
33	Class<?> keyType, Class<?> valueType) {
34	super(eStructuralFeature, keyType, valueType);
35	this.editingDomain = editingDomain;
36	}
37
38	@SuppressWarnings("unchecked")
39	@Override
40	protected void doSetMap(Object source, Map map, MapDiff diff) {
41	EObject eObject = (EObject) source;
42	Command command = SetCommand.create(editingDomain, eObject, getFeature(), map);
43	editingDomain.getCommandStack().execute(command);
44	}
45
46	}