Attachment #112360 for bug #194734

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

View | Details | Raw Unified | Return to bug 194734 | Differences between

and this patch

Collapse All | Expand All

Lines 7-13 Link Here

(-)src/org/eclipse/core/databinding/observable/map/ComputedObservableMap.java (-5 / +37 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Matthew Hall - bug 241585	10	* Matthew Hall - bugs 241585, 194734
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.core.databinding.observable.map;	13	package org.eclipse.core.databinding.observable.map;
Lines 31-37 Link Here
31	*/	31	*/
32	public abstract class ComputedObservableMap extends AbstractObservableMap {	32	public abstract class ComputedObservableMap extends AbstractObservableMap {
33		33
34	private final IObservableSet keySet;	34	private IObservableSet keySet;
35		35
36	private ISetChangeListener setChangeListener = new ISetChangeListener() {	36	private ISetChangeListener setChangeListener = new ISetChangeListener() {
37	public void handleSetChange(SetChangeEvent event) {	37	public void handleSetChange(SetChangeEvent event) {
Lines 109-118 Link Here
109	this.keySet.addSetChangeListener(setChangeListener);	109	this.keySet.addSetChangeListener(setChangeListener);
110	}	110	}
111		111
		112	/**
		113	* @deprecated Subclasses are no longer required to call this method.
		114	*/
112	protected void init() {	115	protected void init() {
113	for (Iterator it = this.keySet.iterator(); it.hasNext();) {	116	}
114	Object key = it.next();	117
115	hookListener(key);	118	protected void firstListenerAdded() {
		119	hookListeners();
		120	}
		121
		122	protected void lastListenerRemoved() {
		123	unhookListeners();
		124	}
		125
		126	private void hookListeners() {
		127	if (keySet != null) {
		128	for (Iterator it = this.keySet.iterator(); it.hasNext();) {
		129	Object key = it.next();
		130	hookListener(key);
		131	}
		132	}
		133	}
		134
		135	private void unhookListeners() {
		136	if (keySet != null) {
		137	Object[] keys = keySet.toArray();
		138	for (int i = 0; i < keys.length; i++) {
		139	unhookListener(keys[i]);
		140	}
		141	keySet = null;
116	}	142	}
117	}	143	}
118		144
Lines 163-166 Link Here
163	* @return the old value for the given key	189	* @return the old value for the given key
164	*/	190	*/
165	protected abstract Object doPut(Object key, Object value);	191	protected abstract Object doPut(Object key, Object value);
		192
		193	public void dispose() {
		194	unhookListeners();
		195	entrySet = null;
		196	super.dispose();
		197	}
166	}	198	}

Lines 7-17 Link Here

(-)src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java (-11 / +20 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bug 164653	10	* Brad Reynolds - bugs 164653, 167204
11	* Brad Reynolds - bug 167204	11	* Matthew Hall - bugs 118516, 208858, 208332, 194734
12	* Matthew Hall - bug 118516
13	* Matthew Hall - bug 208858
14	* Matthew Hall - bug 208332
15	*******************************************************************************/	12	*******************************************************************************/
16		13
17	package org.eclipse.core.databinding.observable.list;	14	package org.eclipse.core.databinding.observable.list;
Lines 76-86 Link Here
76	}	73	}
77		74
78	public synchronized void addListChangeListener(IListChangeListener listener) {	75	public synchronized void addListChangeListener(IListChangeListener listener) {
79	changeSupport.addListener(ListChangeEvent.TYPE, listener);	76	if (changeSupport != null) {
		77	changeSupport.addListener(ListChangeEvent.TYPE, listener);
		78	}
80	}	79	}
81		80
82	public synchronized void removeListChangeListener(IListChangeListener listener) {	81	public synchronized void removeListChangeListener(IListChangeListener listener) {
83	changeSupport.removeListener(ListChangeEvent.TYPE, listener);	82	if (changeSupport != null) {
		83	changeSupport.removeListener(ListChangeEvent.TYPE, listener);
		84	}
84	}	85	}
85		86
86	protected void fireListChange(ListDiff diff) {	87	protected void fireListChange(ListDiff diff) {
Lines 90-108 Link Here
90	}	91	}
91		92
92	public synchronized void addChangeListener(IChangeListener listener) {	93	public synchronized void addChangeListener(IChangeListener listener) {
93	changeSupport.addChangeListener(listener);	94	if (changeSupport != null) {
		95	changeSupport.addChangeListener(listener);
		96	}
94	}	97	}
95		98
96	public synchronized void removeChangeListener(IChangeListener listener) {	99	public synchronized void removeChangeListener(IChangeListener listener) {
97	changeSupport.removeChangeListener(listener);	100	if (changeSupport != null) {
		101	changeSupport.removeChangeListener(listener);
		102	}
98	}	103	}
99		104
100	public synchronized void addStaleListener(IStaleListener listener) {	105	public synchronized void addStaleListener(IStaleListener listener) {
101	changeSupport.addStaleListener(listener);	106	if (changeSupport != null) {
		107	changeSupport.addStaleListener(listener);
		108	}
102	}	109	}
103		110
104	public synchronized void removeStaleListener(IStaleListener listener) {	111	public synchronized void removeStaleListener(IStaleListener listener) {
105	changeSupport.removeStaleListener(listener);	112	if (changeSupport != null) {
		113	changeSupport.removeStaleListener(listener);
		114	}
106	}	115	}
107		116
108	/**	117	/**




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

package org.eclipse.core.databinding.property;

import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;

/**
 * Abstract map property implementation for properties where the map can be
 * completely replaced in a single atomic operation.
 * <p>
 * For example, a map-typed bean property Customer.phoneNumbers can be modified
 * by calling Customer.setPhoneNumbers(Map phoneNumbers).
 * 
 * @since 1.2
 */
public abstract class BasicMapProperty extends MapProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	/**
	 * Returns whether this property is currently being updated on the source.
	 * Implementors should query this value to avoid unnecessary calculations,
	 * such as computing a diff.
	 * 
	 * @param source
	 *            the property source
	 * @return whether this property is currently being updated on the source.
	 */
	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	/**
	 * Sets the map property on the source to the specified map, then fires a
	 * map change using the specified diff.
	 * 
	 * @param source
	 *            the property source
	 * @param map
	 *            the new map
	 * @param diff
	 *            the diff to be fired after the map property has been set. If
	 *            null, the diff will be computed.
	 */
	protected void setMap(Object source, Map map, MapDiff diff) {
		if (diff == null) {
			diff = Diffs.computeMapDiff(getMap(source), map);
		}

		updateHelper.setUpdating(source, true);
		try {
			doSetMap(source, map);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			fireMapChange(source, diff);
		}
	}

	public void clear(Object source) {
		setMap(source, new HashMap(), Diffs.createMapDiffRemoveAll(new HashMap(
				getMap(source))));
	}

	public Object put(Object source, Object key, Object value) {
		Map map = new HashMap(getMap(source));
		boolean addition = !map.containsKey(key);
		Object result = map.put(key, value);
		MapDiff diff;
		if (addition) {
			diff = Diffs.createMapDiffSingleAdd(key, value);
		} else {
			diff = Diffs.createMapDiffSingleChange(key, result, value);
		}
		setMap(source, map, diff);
		return result;
	}

	public void putAll(Object source, Map t) {
		Map map = new HashMap(getMap(source));
		Set addedKeys = new HashSet();
		Set changedKeys = new HashSet();
		Map oldValues = new HashMap();
		Map newValues = new HashMap();
		for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			Object key = entry.getKey();
			Object newValue = entry.getValue();
			boolean addition = !map.containsKey(key);
			Object oldValue = map.put(key, newValue);
			if (addition) {
				addedKeys.add(key);
			} else {
				changedKeys.add(key);
				oldValues.put(key, oldValue);
			}
			newValues.put(key, newValue);
		}
		setMap(source, map, Diffs.createMapDiff(addedKeys,
				Collections.EMPTY_SET, changedKeys, oldValues, newValues));
	}

	public Object remove(Object source, Object key) {
		Map map = getMap(source);
		if (map.containsKey(key)) {
			map = new HashMap(map);
			Object result = map.remove(key);
			setMap(source, map, Diffs.createMapDiffSingleRemove(key, result));
			return result;
		}
		return null;
	}

	public int size(Object source) {
		return getMap(source).size();
	}

	protected abstract void doSetMap(Object source, Map map);

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property;

import java.util.Collection;
import java.util.List;

/**
 * Interface for list-typed properties.
 * 
 * @since 1.2
 */
public interface IListProperty extends ICollectionProperty {
	/**
	 * Returns a List with the current contents of the source's list property
	 * 
	 * @param source
	 *            the property source
	 * @return a List with the current contents of the source's list property
	 */
	List getList(Object source);

	/**
	 * Inserts all elements in the specified collection into the source's list
	 * property at the specified index.
	 * 
	 * @param source
	 *            the property source
	 * @param index
	 *            the insertion index
	 * @param c
	 *            the collection of elements to add
	 * @return whether the source's list property was changed
	 */
	boolean addAll(Object source, int index, Collection c);

	/**
	 * Returns the element at the specified position in the source's list
	 * property
	 * 
	 * @param source
	 *            the property source
	 * @param index
	 *            the element position
	 * @return the element at the given position in the source's list property
	 */
	Object get(Object source, int index);

	/**
	 * Replaces the element at the specified position in the source's list
	 * property with the given element.
	 * 
	 * @param source
	 *            the property source
	 * @param index
	 *            the element position
	 * @param element
	 *            the replacement element
	 * @return the element previously at the specified position in the source's
	 *         list property
	 */
	Object set(Object source, int index, Object element);

	/**
	 * Moves the element at the specified old position in the source's list
	 * property to the specified new position
	 * 
	 * @param source
	 *            the property source
	 * @param oldIndex
	 *            the old element position
	 * @param newIndex
	 *            the new element position
	 * @return the element that was moved
	 */
	Object move(Object source, int oldIndex, int newIndex);

	/**
	 * Inserts the element into the source's list property at the specified
	 * position
	 * 
	 * @param source
	 *            the property source
	 * @param index
	 *            the insertion index
	 * @param element
	 *            the element to insert
	 */
	void add(Object source, int index, Object element);

	/**
	 * Removes the element from the source's list property which is located at
	 * the specified position
	 * 
	 * @param source
	 *            the property source
	 * @param index
	 *            the index of the element to remove
	 * @return the element that was removed from the source's list property
	 */
	Object remove(Object source, int index);

	/**
	 * Returns the index of the first location of the given element in the
	 * source's list property, or -1 if the list does not contain the element.
	 * 
	 * @param source
	 *            the property source
	 * @param o
	 *            the element
	 * @return the index of the first location of the given element in the
	 *         source's list property, or -1 if the list does not contain the
	 *         element
	 */
	int indexOf(Object source, Object o);

	/**
	 * Returns the index of the last location of the given element in the
	 * source's list property, or -1 if the list does not contain the given
	 * element.
	 * 
	 * @param source
	 * @param o
	 * @return the index of the last location of the given element in the
	 *         source's list property, or -1 if the list does not contain the
	 *         element
	 */
	int lastIndexOf(Object source, Object o);

	/**
	 * Adds the given list property change listener to the list of listeners for
	 * the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void addListChangeListener(Object source,
			IListPropertyChangeListener listener);

	/**
	 * Removes the given list property change listener from the list of
	 * listeners for the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void removeListChangeListener(Object source,
			IListPropertyChangeListener listener);
}




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

package org.eclipse.core.databinding.property;

import java.util.Set;

/**
 * Interface for set-typed properties
 * 
 * @since 1.2
 */
public interface ISetProperty extends ICollectionProperty {
	/**
	 * Returns a Set with the current contents of the source's set property
	 * 
	 * @param source
	 *            the property source
	 * @return a Set with the current contents of the source's set property
	 */
	public Set getSet(Object source);

	/**
	 * Adds the given set property change listener to the list of listeners for
	 * the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void addSetChangeListener(Object source,
			ISetPropertyChangeListener listener);

	/**
	 * Removes the given set property change listener from the list of listeners
	 * for the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void removeSetChangeListener(Object source,
			ISetPropertyChangeListener listener);
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.runtime.Assert;

/**
 * Value change event describing a change of a value property on a particular
 * property source.
 * 
 * @since 1.2
 */
public class ValuePropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * The value property that changed
	 */
	public final IValueProperty property;

	/**
	 * ValueDiff with the old and new values of the property.
	 */
	public final ValueDiff diff;

	/**
	 * Constructs a ValuePropertyChangeEvent with the given attributes
	 * 
	 * @param source
	 *            the property source
	 * @param property
	 *            the property that changed on the source
	 * @param diff
	 *            a ValueDiff describing the changes to the value property
	 */
	public ValuePropertyChangeEvent(Object source, IValueProperty property,
			ValueDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((IValuePropertyChangeListener) listener)
				.handleValuePropertyChange(this);
	}
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.map.MapDiff;

/**
 * Abstract implementation of IMapProperty
 * 
 * @since 1.2
 */
public abstract class MapProperty extends Property implements IMapProperty {
	public boolean containsKey(Object source, Object key) {
		return getMap(source).containsKey(key);
	}

	public boolean containsValue(Object source, Object value) {
		return getMap(source).containsValue(value);
	}

	public boolean equals(Object source, Object o) {
		return getMap(source).equals(o);
	}

	public Object get(Object source, Object key) {
		return getMap(source).get(key);
	}

	public int hashCode(Object source) {
		return getMap(source).hashCode();
	}

	public boolean isEmpty(Object source) {
		return getMap(source).isEmpty();
	}

	public int size(Object source) {
		return getMap(source).size();
	}

	public final void addMapChangeListener(Object source,
			IMapPropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeMapChangeListener(Object source,
			IMapPropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	/**
	 * Fires a MapPropertyChangeEvent with the given source and diff
	 * 
	 * @param source
	 *            the property source
	 * @param diff
	 *            the map diff
	 */
	protected final void fireMapChange(Object source, MapDiff diff) {
		getChangeSupport().firePropertyChange(
				new MapPropertyChangeEvent(source, this, diff));
	}
}




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

package org.eclipse.core.databinding.property;

import java.util.Collection;

import org.eclipse.core.databinding.observable.list.ListDiff;

/**
 * Abstract implementation of IListProperty.
 * 
 * @since 1.2
 */
public abstract class ListProperty extends CollectionProperty implements
		IListProperty {
	Collection getCollection(Object source) {
		return getList(source);
	}

	public Object get(Object source, int index) {
		return getList(source).get(index);
	}

	public int indexOf(Object source, Object o) {
		return getList(source).indexOf(o);
	}

	public int lastIndexOf(Object source, Object o) {
		return getList(source).lastIndexOf(o);
	}

	public final void addListChangeListener(Object source,
			IListPropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeListChangeListener(Object source,
			IListPropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	/**
	 * Fires a ListPropertyChangeEvent with the given source and diff
	 * 
	 * @param source
	 *            the property source
	 * @param diff
	 *            the list diff
	 */
	protected void fireListChange(Object source, ListDiff diff) {
		getChangeSupport().firePropertyChange(
				new ListPropertyChangeEvent(source, this, diff));
	}
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.runtime.Assert;

/**
 * Set change event describing an incremental change of a set property on a
 * particular property source.
 * 
 * @since 1.2
 */
public class SetPropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * The set property that changed
	 */
	public final ISetProperty property;

	/**
	 * SetDiff enumerating the added and removed elements in the set.
	 */
	public final SetDiff diff;

	/**
	 * Constructs a SetPropertyChangeEvent with the given attributes
	 * 
	 * @param source
	 *            the property source
	 * @param property
	 *            the property that changed on the source
	 * @param diff
	 *            a SetDiff describing the changes to the set property
	 */
	public SetPropertyChangeEvent(Object source, ISetProperty property,
			SetDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((ISetPropertyChangeListener) listener).handleSetPropertyChange(this);
	}
}




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

package org.eclipse.core.internal.databinding.property;

import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.AbstractObservableMap;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.MapPropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class PropertyObservableMap extends AbstractObservableMap implements
		IPropertyObservable {
	private Object source;
	private IMapProperty property;

	private volatile boolean updating = false;

	private boolean disposed = false;

	private transient volatile int modCount = 0;

	private IMapPropertyChangeListener listener = new IMapPropertyChangeListener() {
		public void handleMapPropertyChange(final MapPropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						getRealm().exec(new Runnable() {
							public void run() {
								modCount++;
								fireMapChange(event.diff);
							}
						});
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableMap(Realm realm, Object source,
			IMapProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

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

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addMapChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeMapChangeListener(source, listener);
		}
	}

	public boolean containsKey(Object key) {
		getterCalled();
		return property.containsKey(source, key);
	}

	public boolean containsValue(Object value) {
		getterCalled();
		return property.containsValue(source, value);
	}

	public Set entrySet() {
		getterCalled();
		// unmodifiable for now
		return Collections.unmodifiableSet(property.getMap(source).entrySet());
	}

	public Object get(Object key) {
		getterCalled();
		return property.get(source, key);
	}

	public boolean isEmpty() {
		getterCalled();
		return property.isEmpty(source);
	}

	public Set keySet() {
		getterCalled();
		return Collections.unmodifiableSet(property.getMap(source).keySet());
	}

	public Object put(Object key, Object value) {
		checkRealm();
		return property.put(source, key, value);
	}

	public void putAll(Map m) {
		checkRealm();
		property.putAll(source, m);
	}

	public Object remove(Object key) {
		checkRealm();
		return property.remove(source, key);
	}

	public int size() {
		getterCalled();
		return property.size(source);
	}

	public Collection values() {
		getterCalled();
		return Collections.unmodifiableCollection(property.getMap(source)
				.values());
	}

	public void clear() {
		getterCalled();
		property.clear(source);
	}

	public boolean equals(Object o) {
		getterCalled();
		return property.equals(source, o);
	}

	public int hashCode() {
		getterCalled();
		return property.hashCode(source);
	}

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeMapChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property;

/**
 * Interface for value-typed properties
 * 
 * @since 1.2
 */
public interface IValueProperty extends IProperty {
	/**
	 * Returns the source's value property
	 * 
	 * @param source
	 *            the property source
	 * @return the current value of the source's value property
	 */
	public Object getValue(Object source);

	/**
	 * Sets the source's value property to the specified value
	 * 
	 * @param source
	 *            the property source
	 * @param value
	 *            the new value
	 */
	public void setValue(Object source, Object value);

	/**
	 * Returns the value type of the property, or <code>null</code> if untyped.
	 * 
	 * @return the value type of the property, or <code>null</code> if untyped.
	 */
	public Object getValueType();

	/**
	 * Adds the given value property change listener to the list of listeners
	 * for the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void addValueChangeListener(Object source,
			IValuePropertyChangeListener listener);

	/**
	 * Removes the given list property change listener from the list of
	 * listeners for the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void removeValueChangeListener(Object source,
			IValuePropertyChangeListener listener);
}




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

package org.eclipse.core.databinding.property;

import java.util.Map;

/**
 * Interface for map-typed properties
 * 
 * @since 1.2
 */
public interface IMapProperty extends IProperty {
	/**
	 * Returns a Map with the current contents of the source's map property
	 * 
	 * @param source
	 *            the property source
	 * @return a Map with the current contents of the source's map property
	 */
	Map getMap(Object source);

	/**
	 * Returns the size of the source's map property
	 * 
	 * @param source
	 *            the property source
	 * @return the size of the source's map property
	 */
	int size(Object source);

	/**
	 * Returns whether the source's map property is empty
	 * 
	 * @param source
	 *            the property source
	 * @return whether the source's map property is empty
	 */
	boolean isEmpty(Object source);

	/**
	 * Returns whether the specified key is contained in the key set of the
	 * source's map property
	 * 
	 * @param source
	 *            the property source
	 * @param key
	 *            the key
	 * @return whether the specified key is contained in the key set of the
	 *         source's map property
	 */
	boolean containsKey(Object source, Object key);

	/**
	 * Returns whether the specified value is contains in the values collection
	 * of the source's map property
	 * 
	 * @param source
	 *            the property source
	 * @param value
	 *            the value
	 * @return whether the specified value is contains in the values collection
	 *         of the source's map property
	 */
	boolean containsValue(Object source, Object value);

	/**
	 * Returns the value associated with the specified key in the source's map
	 * property
	 * 
	 * @param source
	 *            the property source
	 * @param key
	 *            the key
	 * @return the value associated with the specified key in the source's map
	 *         property
	 */
	Object get(Object source, Object key);

	/**
	 * Associates the specified value with the specified key in the source's map
	 * property
	 * 
	 * @param source
	 *            the property source
	 * @param key
	 *            the key
	 * @param value
	 *            the value
	 * @return the value that was previously associated with the given key in
	 *         the source's map property
	 */
	Object put(Object source, Object key, Object value);

	/**
	 * Removes the mapping for the specified key from the source's map property
	 * 
	 * @param source
	 *            the property source
	 * @param key
	 *            the key
	 * @return the value that was previously associated with the specified key
	 *         in the source's map property, or null if no such mapping exists
	 */
	Object remove(Object source, Object key);

	/**
	 * Adds all mappings in the specified map to the source's map property.
	 * 
	 * @param source
	 *            the property source
	 * @param t
	 *            the map
	 */
	void putAll(Object source, Map t);

	/**
	 * Removes all mapping from the source's map property
	 * 
	 * @param source
	 *            the property source
	 */
	void clear(Object source);

	/**
	 * Returns whether the source's map property is equal to the argument
	 * 
	 * @param source
	 *            the property source
	 * @param o
	 *            the object to test for equality
	 * @return whether the source's map property is equal to the argument
	 */
	boolean equals(Object source, Object o);

	/**
	 * Returns the hash code of the source's map property
	 * 
	 * @param source
	 *            the property source
	 * @return the hash code of the source's map property
	 */
	int hashCode(Object source);

	/**
	 * Adds the given map property change listener to the list of listeners for
	 * the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void addMapChangeListener(Object source,
			IMapPropertyChangeListener listener);

	/**
	 * Removes the given map property change listener from the list of listeners
	 * for the given source.
	 * 
	 * @param source
	 *            the property source
	 * @param listener
	 *            the listener
	 */
	public void removeMapChangeListener(Object source,
			IMapPropertyChangeListener listener);
}




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

package org.eclipse.core.databinding.property;

/**
 * Listener for changes to map properties on a property source
 * 
 * @since 1.2
 */
public interface IMapPropertyChangeListener extends IPropertyChangeListener {
	/**
	 * Handle a change to a map property on a specific property source.
	 * 
	 * @param event
	 *            an event describing the map change that occured.
	 */
	public void handleMapPropertyChange(MapPropertyChangeEvent event);
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.value.ValueDiff;

/**
 * Abstract implementation of IValueProperty.
 * 
 * @since 1.2
 */
public abstract class ValueProperty extends Property implements IValueProperty {
	public final void addValueChangeListener(Object source,
			IValuePropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeValueChangeListener(Object source,
			IValuePropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	/**
	 * Fires a ValuePropertyChangeEvent with the given source and diff
	 * 
	 * @param source
	 *            the property source
	 * @param diff
	 *            the value diff
	 */
	protected void fireValueChange(Object source, ValueDiff diff) {
		getChangeSupport().firePropertyChange(
				new ValuePropertyChangeEvent(source, this, diff));
	}
}




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

package org.eclipse.core.databinding.property;

/**
 * Listener for changes to value properties on a property source
 * 
 * @since 1.2
 */
public interface IValuePropertyChangeListener extends IPropertyChangeListener {
	/**
	 * Handle a change to a value property on a specific property source.
	 * 
	 * @param event
	 *            an event describing the value change that occured.
	 */
	public void handleValuePropertyChange(ValuePropertyChangeEvent event);
}




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

package org.eclipse.core.databinding.property;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;

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.internal.databinding.property.PropertyUpdateHelper;

/**
 * Abstract list property implementation for properties where the list can be
 * completely replaced in a single atomic operation.
 * <p>
 * For example, a list-typed bean property Customer.invoices can be modified by
 * calling Customer.setInvoices(List invoices).
 * 
 * @since 1.2
 */
public abstract class BasicListProperty extends ListProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	/**
	 * Returns whether this property is currently being updated on the source.
	 * Implementors should query this value to avoid unnecessary calculations,
	 * such as computing a diff.
	 * 
	 * @param source
	 *            the property source
	 * @return whether this property is currently being updated on the source.
	 */
	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	/**
	 * Sets the list property on the source to the specified list, then fires a
	 * list change using the specified diff.
	 * 
	 * @param source
	 *            the property source
	 * @param list
	 *            the new list
	 * @param diff
	 *            the diff to be fired after the list property has been set. If
	 *            null, the diff will be computed.
	 */
	protected void setList(Object source, List list, ListDiff diff) {
		if (diff == null) {
			diff = Diffs.computeListDiff(getList(source), list);
		}

		updateHelper.setUpdating(source, true);
		try {
			doSetList(source, list);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			fireListChange(source, diff);
		}
	}

	protected void fireListChange(Object source, ListDiff diff) {
		if (!isUpdating(source))
			super.fireListChange(source, diff);
	}

	/**
	 * Sets the list property on the source to the specified list.
	 * 
	 * @param source
	 *            the property source
	 * @param list
	 *            the new list
	 */
	protected abstract void doSetList(Object source, List list);

	public boolean add(Object source, Object o) {
		add(source, size(source), o);
		return true;
	}

	public void add(Object source, int index, Object element) {
		List list = new ArrayList(getList(source));
		list.add(index, element);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				index, true, element)));
	}

	public boolean addAll(Object source, Collection c) {
		if (c.isEmpty())
			return false;
		addAll(source, size(source), c);
		return true;
	}

	public boolean addAll(Object source, int index, Collection c) {
		if (c.isEmpty()) {
			return false;
		}

		List list = new ArrayList(getList(source));
		List entries = new ArrayList();
		int i = index;
		for (Iterator it = c.iterator(); it.hasNext(); i++) {
			Object o = it.next();
			list.add(i, o);
			entries.add(Diffs.createListDiffEntry(i, true, o));
		}
		boolean changed = !entries.isEmpty();
		if (changed) {
			ListDiffEntry[] ea = (ListDiffEntry[]) entries
					.toArray(new ListDiffEntry[entries.size()]);
			setList(source, list, Diffs.createListDiff(ea));
		}
		return changed;
	}

	public void clear(Object source) {
		if (isEmpty(source))
			return;
		List list = getList(source);
		ListDiffEntry[] entries = new ListDiffEntry[list.size()];
		int i = 0;
		for (Iterator it = getList(source).iterator(); it.hasNext(); i++) {
			entries[i] = Diffs.createListDiffEntry(0, false, it.next());
		}
		setList(source, new ArrayList(), Diffs.createListDiff(entries));
	}

	public Object move(Object source, int oldIndex, int newIndex) {
		if (oldIndex == newIndex)
			return get(source, oldIndex);
		List list = new ArrayList(getList(source));
		Object result = list.remove(oldIndex);
		list.add(newIndex, result);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				oldIndex, false, result), Diffs.createListDiffEntry(newIndex,
				true, result)));
		return result;
	}

	public boolean remove(Object source, Object o) {
		int i = indexOf(source, o);
		if (i == -1)
			return false;
		remove(source, i);
		return true;
	}

	public Object remove(Object source, int index) {
		List list = new ArrayList(getList(source));
		Object result = list.remove(index);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				index, false, result)));
		return result;
	}

	public boolean removeAll(Object source, Collection c) {
		if (isEmpty(source)) {
			return false;
		}
		if (c.isEmpty()) {
			return false;
		}
		List list = new ArrayList(getList(source));
		List entries = new ArrayList();
		for (ListIterator it = list.listIterator(); it.hasNext();) {
			Object o = it.next();
			if (c.contains(o)) {
				entries.add(Diffs.createListDiffEntry(it.previousIndex(),
						false, o));
				it.remove();
			}
		}
		boolean changed = !entries.isEmpty();
		if (changed) {
			ListDiffEntry[] ea = (ListDiffEntry[]) entries
					.toArray(new ListDiffEntry[entries.size()]);
			setList(source, list, Diffs.createListDiff(ea));
		}
		return changed;
	}

	public boolean retainAll(Object source, Collection c) {
		if (isEmpty(source)) {
			return false;
		}
		if (c.isEmpty()) {
			clear(source);
			return true;
		}
		List list = new ArrayList(getList(source));
		List entries = new ArrayList();
		for (ListIterator it = list.listIterator(); it.hasNext();) {
			Object o = it.next();
			if (!c.contains(o)) {
				entries.add(Diffs.createListDiffEntry(it.previousIndex(),
						false, o));
				it.remove();
			}
		}
		boolean changed = !entries.isEmpty();
		if (changed) {
			ListDiffEntry[] ea = (ListDiffEntry[]) entries
					.toArray(new ListDiffEntry[entries.size()]);
			setList(source, list, Diffs.createListDiff(ea));
		}
		return changed;
	}

	public Object set(Object source, int index, Object element) {
		List list = new ArrayList(getList(source));
		Object result = list.set(index, element);
		setList(source, list, Diffs.createListDiff(Diffs.createListDiffEntry(
				index, false, result), Diffs.createListDiffEntry(index, true,
				element)));
		return result;
	}

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property.masterdetail;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.property.masterdetail.ListPropertyDetailValueList;
import org.eclipse.core.internal.databinding.property.masterdetail.MapPropertyDetailValueMap;
import org.eclipse.core.internal.databinding.property.masterdetail.SetPropertyDetailValueMap;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailList;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailMap;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailSet;
import org.eclipse.core.internal.databinding.property.masterdetail.ValuePropertyDetailValue;

/**
 * A factory for combining properties to create nested properties.
 * <p>
 * Example: Suppose class <code>A</code> has a property <code>b</code> of type
 * <code>B</code>, and that class <code>B</code> has a property <code>c</code>
 * of type <code>C</code>:
 * 
 * <pre>
 * A a = new A();
 * B b = a.getB();
 * IValueProperty ab = BeanProperties.valueProperty(A.class, &quot;b&quot;);
 * assertTrue(ab.getValue(a) == b);
 * 
 * IValueProperty bc = BeanProperties.valueProperty(B.class, &quot;c&quot;);
 * C c = b.getC();
 * assertTrue(bc.getValue(b) == c);
 * </pre>
 * 
 * Using MasterDetailProperties, the <code>ab</code> and <code>bc</code>
 * properties may be combined to form a nested <code>abc</code> property:
 * 
 * <pre>
 * IValueProperty abc = MasterDetailProperties.detailValue(ab, bc)
 * assertTrue(abc.getValue(a) == c);
 * </pre>
 * 
 * @since 1.2
 */
public class MasterDetailProperties {
	// Properties of IValueProperty master properties

	/**
	 * Returns the nested combination of the master value and detail value
	 * properties. Value modifications made through the returned property are
	 * delegated to the detail property, using the value of the master property
	 * as the source.
	 * 
	 * @param masterValue
	 *            the master property
	 * @param detailValue
	 *            the detail property
	 * @return the nested combination of the master and detail properties
	 */
	public static IValueProperty detailValue(IValueProperty masterValue,
			IValueProperty detailValue) {
		return new ValuePropertyDetailValue(masterValue, detailValue);
	}

	/**
	 * Returns the nested combination of the master value and detail list
	 * properties. List modifications made through the returned property are
	 * delegated to the detail property, using the value of the master property
	 * as the source.
	 * 
	 * @param masterValue
	 *            the master property
	 * @param detailList
	 *            the detail property
	 * @return the nested combination of the master value and detail list
	 *         properties
	 */
	public static IListProperty detailList(IValueProperty masterValue,
			IListProperty detailList) {
		return new ValuePropertyDetailList(masterValue, detailList);
	}

	/**
	 * Returns the nested combination of the master value and detail set
	 * properties. Set modifications made through the returned property are
	 * delegated to the detail property, using the value of the master property
	 * as the source.
	 * 
	 * @param masterValue
	 *            the master property
	 * @param detailSet
	 *            the detail property
	 * @return the nested combination of the master value and detail set
	 *         properties
	 */
	public static ISetProperty detailSet(IValueProperty masterValue,
			ISetProperty detailSet) {
		return new ValuePropertyDetailSet(masterValue, detailSet);
	}

	/**
	 * Returns the nested combination of the master value and detail map
	 * properties. Map modifications made through the returned property are
	 * delegated to the detail property, using the value of the master property
	 * as the source.
	 * 
	 * @param masterValue
	 *            the master property
	 * @param detailMap
	 *            the detail property
	 * @return the nested combination of the master value and detial map
	 *         properties
	 */
	public static IMapProperty detailMap(IValueProperty masterValue,
			IMapProperty detailMap) {
		return new ValuePropertyDetailMap(masterValue, detailMap);
	}

	// Properties of IListProperty master properties

	/**
	 * Returns the nested combination of the master list and detail value
	 * properties. Note that because this property is a projection of value
	 * properties over a list, the only modification supported is through the
	 * {@link IValueProperty#setValue(Object, Object)} method. Modifications
	 * made through the returned property are delegated to the detail property,
	 * using the corresponding list element from the master property as the
	 * source.
	 * 
	 * @param masterList
	 *            the master property
	 * @param detailValue
	 *            the detail property
	 * @return the nested combination of the master list and detail value
	 *         properties
	 */
	public static IListProperty detailValues(IListProperty masterList,
			IValueProperty detailValue) {
		return new ListPropertyDetailValueList(masterList, detailValue);
	}

	// Properties of ISetProperty master properties

	/**
	 * Returns the nested combination of the master set and detail value
	 * properties. Note that because this property is a projection of value
	 * properties over a set, the only modifications supported are through the
	 * {@link IMapProperty#put(Object, Object, Object)} and
	 * {@link IMapProperty#putAll(Object, java.util.Map)} methods. In the latter
	 * case, this property does not put entries for keys not already in the
	 * master key set. Modifications made through the returned property are
	 * delegated to the detail property, using the corresponding set element
	 * from the master property as the source.
	 * 
	 * @param masterKeySet
	 *            the master property
	 * @param detailValues
	 *            the detail property
	 * @return the nested combination of the master set and detail value
	 *         properties
	 */
	public static IMapProperty detailValues(ISetProperty masterKeySet,
			IValueProperty detailValues) {
		return new SetPropertyDetailValueMap(masterKeySet, detailValues);
	}

	// Properties of IMapProperty master properties

	/**
	 * Returns the nested combination of the master map and detail value
	 * properties. Note that because this property is a projection of value
	 * properties over a values collection, the only modifications supported are
	 * through the {@link IMapProperty#put(Object, Object, Object)} and
	 * {@link IMapProperty#putAll(Object, java.util.Map)} methods. In the latter
	 * case, this property does not entries for keys not already contained in
	 * the master map's key set. Modifications made through the returned
	 * property are delegated to the detail property, using the corresponding
	 * entry value from the master property as the source.
	 * 
	 * @param masterMap
	 *            the master property
	 * @param detailValues
	 *            the detail property
	 * @return the nested combination of the master map and detail value
	 *         properties.
	 */
	public static IMapProperty detailValues(IMapProperty masterMap,
			IValueProperty detailValues) {
		return new MapPropertyDetailValueMap(masterMap, detailValues);
	}
}




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

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValueProperty;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 1.2
 * 
 */
public class ValuePropertyDetailValue extends ValueProperty implements
		IValueProperty {
	private IValueProperty masterProperty;
	private IValueProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements
			IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			Object oldValue = detailProperty.getValue(oldSource);
			Object newValue = detailProperty.getValue(newSource);

			ValueDiff diff = Diffs.createValueDiff(oldValue, newValue);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireValueChange(source, diff);
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			fireValueChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailValue(IValueProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addValueChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeValueChangeListener(
					detailListener.masterValue, detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public Object getValue(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getValue(masterValue);
	}

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

	public void setValue(Object source, Object value) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.setValue(masterValue, value);
	}
}




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

package org.eclipse.core.internal.databinding.property;

import java.util.AbstractSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.IStaleListener;
import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.StaleEvent;
import org.eclipse.core.databinding.observable.map.AbstractObservableMap;
import org.eclipse.core.databinding.observable.map.IMapChangeListener;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.map.MapChangeEvent;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class MapValuePropertyObservableMap extends AbstractObservableMap
		implements IObserving {
	private IObservableMap map;
	private IValueProperty property;

	private Map keyToMasterValueListener;

	private boolean updating = false;
	private boolean disposed = false;

	private IMapChangeListener mapListener = new IMapChangeListener() {
		public void handleMapChange(final MapChangeEvent event) {
			if (!updating && !disposed) {
				getRealm().exec(new Runnable() {
					public void run() {
						Map oldValues = new HashMap();
						Map newValues = new HashMap();

						Set addedKeys = event.diff.getAddedKeys();
						for (Iterator it = addedKeys.iterator(); it.hasNext();) {
							Object key = it.next();
							Object newSource = event.diff.getNewValue(key);
							Object newValue = property.getValue(newSource);
							newValues.put(key, newValue);
							addPropertySourceListener(key, newSource);
						}

						Set removedKeys = event.diff.getRemovedKeys();
						for (Iterator it = removedKeys.iterator(); it.hasNext();) {
							Object key = it.next();
							Object oldSource = event.diff.getOldValue(key);
							Object oldValue = property.getValue(oldSource);
							oldValues.put(key, oldValue);
							removePropertySourceListener(key, oldSource);
						}

						Set changedKeys = new HashSet(event.diff
								.getChangedKeys());
						for (Iterator it = changedKeys.iterator(); it.hasNext();) {
							Object key = it.next();

							Object oldSource = event.diff.getOldValue(key);
							Object newSource = event.diff.getNewValue(key);

							Object oldValue = property.getValue(oldSource);
							Object newValue = property.getValue(newSource);

							if (Util.equals(oldValue, newValue)) {
								it.remove();
							} else {
								oldValues.put(key, oldValue);
								newValues.put(key, newValue);
							}

							removePropertySourceListener(key, oldSource);
							addPropertySourceListener(key, newSource);
						}

						fireMapChange(Diffs.createMapDiff(addedKeys,
								removedKeys, changedKeys, oldValues, newValues));
					}
				});
			}
		}
	};

	private IStaleListener staleListener = new IStaleListener() {
		public void handleStale(StaleEvent staleEvent) {
			fireStale();
		}
	};

	/**
	 * @param map
	 * @param valueProperty
	 */
	public MapValuePropertyObservableMap(IObservableMap map,
			IValueProperty valueProperty) {
		super(map.getRealm());
		this.map = map;
		this.property = valueProperty;

		this.keyToMasterValueListener = new IdentityHashMap();
	}

	private class ValuePropertySourceChangeListener implements
			IValuePropertyChangeListener {
		private final Object key;

		public ValuePropertySourceChangeListener(Object key) {
			this.key = key;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object oldValue = property.getValue(oldSource);
			property.removeValueChangeListener(oldSource, this);

			Object newSource = event.diff.getNewValue();
			Object newValue = property.getValue(newSource);
			property.addValueChangeListener(newSource, this);

			if (!Util.equals(oldValue, newValue))
				fireMapChange(Diffs.createMapDiffSingleChange(key, oldValue,
						newValue));
		}
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			map.addMapChangeListener(mapListener);
			map.addStaleListener(staleListener);
			for (Iterator iterator = map.entrySet().iterator(); iterator
					.hasNext();) {
				Map.Entry entry = (Map.Entry) iterator.next();
				Object key = entry.getKey();
				Object masterValue = entry.getValue();

				addPropertySourceListener(key, masterValue);
			}
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			map.removeMapChangeListener(mapListener);
			map.removeStaleListener(staleListener);
			for (Iterator iterator = map.entrySet().iterator(); iterator
					.hasNext();) {
				Map.Entry entry = (Map.Entry) iterator.next();
				Object key = entry.getKey();
				Object propertySource = entry.getValue();

				removePropertySourceListener(key, propertySource);
			}
		}
	}

	private void addPropertySourceListener(Object key, Object propertySource) {
		IValuePropertyChangeListener propertyListener = new ValuePropertySourceChangeListener(
				key);
		property.addValueChangeListener(propertySource, propertyListener);
		keyToMasterValueListener.put(key, propertyListener);
	}

	private void removePropertySourceListener(Object key, Object propertySource) {
		IValuePropertyChangeListener propertyListener = (IValuePropertyChangeListener) keyToMasterValueListener
				.remove(key);
		if (propertyListener != null) {
			property
					.removeValueChangeListener(propertySource, propertyListener);
		}
	}

	protected Object doGet(Object key) {
		if (!map.containsKey(key))
			return null;
		return property.getValue(map.get(key));
	}

	protected Object doPut(Object key, Object value) {
		if (!map.containsKey(key))
			return null;
		Object source = map.get(key);

		Object oldValue = property.getValue(source);

		updating = true;
		try {
			property.setValue(source, value);
		} finally {
			updating = false;
		}

		Object newValue = property.getValue(source);

		if (!Util.equals(oldValue, newValue)) {
			fireMapChange(Diffs.createMapDiffSingleChange(key, oldValue,
					newValue));
		}

		return oldValue;
	}

	private Set entrySet;

	public Set entrySet() {
		getterCalled();
		if (entrySet == null)
			entrySet = new EntrySet();
		return entrySet;
	}

	class EntrySet extends AbstractSet {
		public Iterator iterator() {
			return new Iterator() {
				Iterator it = map.entrySet().iterator();

				public boolean hasNext() {
					getterCalled();
					return it.hasNext();
				}

				public Object next() {
					getterCalled();
					Map.Entry next = (Map.Entry) it.next();
					return new MapEntry(next.getKey());
				}

				public void remove() {
					it.remove();
				}
			};
		}

		public int size() {
			return map.size();
		}
	}

	class MapEntry implements Map.Entry {
		private Object key;

		MapEntry(Object key) {
			this.key = key;
		}

		public Object getKey() {
			getterCalled();
			return key;
		}

		public Object getValue() {
			getterCalled();
			return get(key);
		}

		public Object setValue(Object value) {
			return put(key, value);
		}

		public boolean equals(Object o) {
			getterCalled();
			if (o == this)
				return true;
			if (o == null)
				return false;
			if (!(o instanceof Map.Entry))
				return false;
			Map.Entry that = (Map.Entry) o;
			return Util.equals(this.getKey(), that.getKey())
					&& Util.equals(this.getValue(), that.getValue());
		}

		public int hashCode() {
			getterCalled();
			Object value = getValue();
			return (key == null ? 0 : key.hashCode())
					^ (value == null ? 0 : value.hashCode());
		}
	}

	public boolean isStale() {
		getterCalled();
		return map.isStale();
	}

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

	public Object getObserved() {
		return map;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property = null;
		}

		super.dispose();
	}
}




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

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.ISetPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.MapProperty;
import org.eclipse.core.databinding.property.SetPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class SetPropertyDetailValueMap extends MapProperty {
	private final ISetProperty masterProperty;
	private final IValueProperty detailProperty;

	private Map sourceToMasterElementToDetailListener = new HashMap();

	private ISetPropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements ISetPropertyChangeListener {
		public void handleSetPropertyChange(final SetPropertyChangeEvent event) {
			Object source = event.getSource();

			MapDiff diff;
			if (event.diff == null) {
				diff = null;
			} else {
				final Set removals = event.diff.getRemovals();
				final Set additions = event.diff.getAdditions();

				diff = new MapDiff() {
					public Set getAddedKeys() {
						return additions;
					}

					public Set getChangedKeys() {
						return Collections.EMPTY_SET;
					}

					public Object getNewValue(Object key) {
						return getValue(key);
					}

					public Object getOldValue(Object key) {
						return getValue(key);
					}

					private Object getValue(Object key) {
						return detailProperty.getValue(key);
					}

					public Set getRemovedKeys() {
						return removals;
					}
				};

				for (Iterator it = removals.iterator(); it.hasNext();) {
					removeElementPropertyListener(source, it.next());
				}
				for (Iterator it = additions.iterator(); it.hasNext();) {
					addElementPropertyListener(source, it.next());
				}
			}

			fireMapChange(source, diff);
		}

		private void addElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener == null) {
				sourceToMasterElementToDetailListener.put(source,
						elementToDetailListener = new HashMap());
			}
			if (!elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = new DetailPropertyListener(
						source, element);
				detailProperty.addValueChangeListener(element, detailListener);
				elementToDetailListener.put(element, detailListener);
			}
		}

		private void removeElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener != null
					&& elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = (DetailPropertyListener) elementToDetailListener
						.remove(element);
				detailProperty.removeValueChangeListener(element,
						detailListener);
			}
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			MapDiff diff;
			if (event.diff == null) {
				diff = null;
			} else {
				diff = Diffs.createMapDiffSingleChange(masterValue, event.diff
						.getOldValue(), event.diff.getNewValue());
			}
			fireMapChange(source, diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public SetPropertyDetailValueMap(ISetProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addSetChangeListener(source, masterListener);

		Map masterElementToDetailListener = new HashMap();
		for (Iterator it = masterProperty.getSet(source).iterator(); it
				.hasNext();) {
			Object masterElement = it.next();
			DetailPropertyListener detailListener = new DetailPropertyListener(
					source, masterElement);
			detailProperty
					.addValueChangeListener(masterElement, detailListener);
			masterElementToDetailListener.put(masterElement, detailListener);
		}

		sourceToMasterElementToDetailListener.put(source,
				masterElementToDetailListener);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeSetChangeListener(source, masterListener);
		Map masterElementToDetailListener = (Map) sourceToMasterElementToDetailListener
				.remove(source);
		if (masterElementToDetailListener != null) {
			for (Iterator it = masterElementToDetailListener.entrySet()
					.iterator(); it.hasNext();) {
				Map.Entry entry = (Map.Entry) it.next();
				detailProperty.removeValueChangeListener(entry.getKey(),
						(DetailPropertyListener) entry.getValue());
			}
		}
	}

	public Map getMap(Object source) {
		Map result = new HashMap();
		for (Iterator it = masterProperty.getSet(source).iterator(); it
				.hasNext();) {
			Object element = it.next();
			result.put(element, detailProperty.getValue(element));
		}
		return result;
	}

	public void clear(Object source) {
		throw new UnsupportedOperationException();
	}

	public Object put(Object source, Object key, Object value) {
		if (!masterProperty.contains(source, key))
			return null;
		Object result = detailProperty.getValue(key);
		detailProperty.setValue(key, value);
		return result;
	}

	public void putAll(Object source, Map t) {
		Set masterSet = masterProperty.getSet(source);
		for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			if (masterSet.contains(entry.getKey())) {
				detailProperty.setValue(entry.getKey(), entry.getValue());
			}
		}
	}

	public Object remove(Object source, Object key) {
		throw new UnsupportedOperationException();
	}
}




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

package org.eclipse.core.databinding.property;

import java.util.Collection;

import org.eclipse.core.databinding.observable.set.SetDiff;

/**
 * Abstract implementation of ISetProperty
 * 
 * @since 1.2
 */
public abstract class SetProperty extends CollectionProperty implements
		ISetProperty {
	Collection getCollection(Object source) {
		return getSet(source);
	}

	public final void addSetChangeListener(Object source,
			ISetPropertyChangeListener listener) {
		getChangeSupport().addListener(source, listener);
	}

	public final void removeSetChangeListener(Object source,
			ISetPropertyChangeListener listener) {
		getChangeSupport().removeListener(source, listener);
	}

	/**
	 * Fires a SetPropertyChangeEvent with the given source and diff
	 * 
	 * @param source
	 *            the property source
	 * @param diff
	 *            the set diff
	 */
	protected void fireSetChange(Object source, SetDiff diff) {
		getChangeSupport().firePropertyChange(
				new SetPropertyChangeEvent(source, this, diff));
	}
}




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

package org.eclipse.core.databinding.property;

/**
 * Interface for observing a property of a source object.
 * 
 * @noimplement
 * @since 1.2
 */
public interface IProperty {
	/**
	 * Disposes the property, removing all property listeners on source objects.
	 */
	public void dispose();
}




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

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IListPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ListProperty;
import org.eclipse.core.databinding.property.ListPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class ValuePropertyDetailList extends ListProperty {
	private final IValueProperty masterProperty;
	private final IListProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements
			IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			List oldList = detailProperty.getList(oldSource);
			List newList = detailProperty.getList(newSource);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireListChange(source, Diffs.computeListDiff(oldList, newList));
		}
	}

	private class DetailPropertyListener implements IListPropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleListPropertyChange(ListPropertyChangeEvent event) {
			fireListChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailList(IValueProperty masterProperty,
			IListProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addListChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeListChangeListener(detailListener.masterValue,
					detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public List getList(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getList(masterValue);
	}

	public boolean add(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.add(masterValue, o);
	}

	public boolean addAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.addAll(masterValue, c);
	}

	public void clear(Object source) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.clear(masterValue);
	}

	public Object getElementType() {
		return detailProperty.getElementType();
	}

	public boolean remove(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, o);
	}

	public boolean removeAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.removeAll(masterValue, c);
	}

	public boolean retainAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.retainAll(masterValue, c);
	}

	public void add(Object source, int index, Object element) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.add(masterValue, index, element);
	}

	public boolean addAll(Object source, int index, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.addAll(masterValue, index, c);
	}

	public Object move(Object source, int oldIndex, int newIndex) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.move(masterValue, oldIndex, newIndex);
	}

	public Object remove(Object source, int index) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, index);
	}

	public Object set(Object source, int index, Object element) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.set(masterValue, index, element);
	}
}




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

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IListPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ListProperty;
import org.eclipse.core.databinding.property.ListPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class ListPropertyDetailValueList extends ListProperty {
	private final IListProperty masterProperty;
	private final IValueProperty detailProperty;

	private Map sourceToMasterElementToDetailListener = new HashMap();

	private IListPropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements IListPropertyChangeListener {
		public void handleListPropertyChange(ListPropertyChangeEvent event) {
			Object source = event.getSource();
			ListDiffEntry[] masterEntries = event.diff.getDifferences();
			ListDiffEntry[] detailEntries = new ListDiffEntry[masterEntries.length];
			Set masterElementsAdded = new HashSet();
			Set masterElementsRemoved = new HashSet();
			for (int i = 0; i < masterEntries.length; i++) {
				ListDiffEntry masterDifference = masterEntries[i];
				int index = masterDifference.getPosition();
				boolean addition = masterDifference.isAddition();
				Object masterElement = masterDifference.getElement();
				Object elementDetailValue = detailProperty
						.getValue(masterElement);
				detailEntries[i] = Diffs.createListDiffEntry(index, addition,
						elementDetailValue);
				if (addition)
					masterElementsAdded.add(masterElement);
				else
					masterElementsRemoved.add(masterElement);
			}

			ListDiff diff = Diffs.createListDiff(detailEntries);

			for (Iterator it = masterElementsRemoved.iterator(); it.hasNext();) {
				Object element = it.next();
				if (!masterProperty.contains(source, element))
					removeElementPropertyListener(source, element);
			}
			for (Iterator it = masterElementsAdded.iterator(); it.hasNext();) {
				Object element = it.next();
				if (masterProperty.contains(source, element))
					addElementPropertyListener(source, element);
			}

			fireListChange(source, diff);
		}

		private void addElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener == null) {
				sourceToMasterElementToDetailListener.put(source,
						elementToDetailListener = new HashMap());
			}
			if (!elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = new DetailPropertyListener(
						source, element);
				detailProperty.addValueChangeListener(element, detailListener);
				elementToDetailListener.put(element, detailListener);
			}
		}

		private void removeElementPropertyListener(Object source, Object element) {
			Map elementToDetailListener = (Map) sourceToMasterElementToDetailListener
					.get(source);
			if (elementToDetailListener != null
					&& elementToDetailListener.containsKey(element)) {
				DetailPropertyListener detailListener = (DetailPropertyListener) elementToDetailListener
						.remove(element);
				detailProperty.removeValueChangeListener(element,
						detailListener);
			}
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object masterElement;

		DetailPropertyListener(Object source, Object masterElement) {
			this.source = source;
			this.masterElement = masterElement;
		}

		private int[] findIndices() {
			List indices = new ArrayList();

			List list = masterProperty.getList(source);
			for (ListIterator it = list.listIterator(); it.hasNext();) {
				if (Util.equals(masterElement, it.next()))
					indices.add(Integer.valueOf(it.previousIndex()));
			}

			int[] result = new int[indices.size()];
			for (int i = 0; i < result.length; i++) {
				result[i] = ((Integer) indices.get(i)).intValue();
			}
			return result;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			int[] indices = findIndices();
			Object oldValue = event.diff.getOldValue();
			Object newValue = event.diff.getNewValue();
			ListDiffEntry[] entries = new ListDiffEntry[indices.length * 2];
			for (int i = 0; i < indices.length; i++) {
				int index = indices[i];
				entries[i * 2] = Diffs.createListDiffEntry(index, false,
						oldValue);
				entries[i * 2 + 1] = Diffs.createListDiffEntry(index, true,
						newValue);
			}

			ListDiff diff = Diffs.createListDiff(entries);
			fireListChange(source, diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ListPropertyDetailValueList(IListProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addListChangeListener(source, masterListener);

		Map masterElementToDetailListener = new HashMap();
		for (Iterator it = masterProperty.getList(source).iterator(); it
				.hasNext();) {
			Object masterElement = it.next();
			DetailPropertyListener detailListener = new DetailPropertyListener(
					source, masterElement);
			detailProperty
					.addValueChangeListener(masterElement, detailListener);
			masterElementToDetailListener.put(masterElement, detailListener);
		}

		sourceToMasterElementToDetailListener.put(source,
				masterElementToDetailListener);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeListChangeListener(source, masterListener);
		Map masterElementToDetailListener = (Map) sourceToMasterElementToDetailListener
				.remove(source);
		if (masterElementToDetailListener != null) {
			for (Iterator it = masterElementToDetailListener.entrySet()
					.iterator(); it.hasNext();) {
				Map.Entry entry = (Map.Entry) it.next();
				detailProperty.removeValueChangeListener(entry.getKey(),
						(DetailPropertyListener) entry.getValue());
			}
		}
	}

	public List getList(Object source) {
		List result = new ArrayList();
		for (Iterator it = masterProperty.getList(source).iterator(); it
				.hasNext();) {
			result.add(detailProperty.getValue(it.next()));
		}
		return result;
	}

	public boolean add(Object source, Object o) {
		throw new UnsupportedOperationException();
	}

	public boolean addAll(Object source, Collection c) {
		throw new UnsupportedOperationException();
	}

	public void clear(Object source) {
		throw new UnsupportedOperationException();
	}

	public Object getElementType() {
		return detailProperty.getValueType();
	}

	public boolean remove(Object source, Object o) {
		throw new UnsupportedOperationException();
	}

	public boolean removeAll(Object source, Collection c) {
		throw new UnsupportedOperationException();
	}

	public boolean retainAll(Object source, Collection c) {
		throw new UnsupportedOperationException();
	}

	public void add(Object source, int index, Object element) {
		throw new UnsupportedOperationException();
	}

	public boolean addAll(Object source, int index, Collection c) {
		throw new UnsupportedOperationException();
	}

	public Object move(Object source, int oldIndex, int newIndex) {
		throw new UnsupportedOperationException();
	}

	public Object remove(Object source, int index) {
		throw new UnsupportedOperationException();
	}

	public Object set(Object source, int index, Object element) {
		Object masterElement = masterProperty.get(source, index);
		Object result = detailProperty.getValue(masterElement);
		detailProperty.setValue(masterElement, element);
		return result;
	}
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.IObserving;

/**
 * Provides access to the details of property observables
 * 
 * @since 1.2
 */
public interface IPropertyObservable extends IObserving {
	/**
	 * Returns the property being observed
	 * 
	 * @return the property being observed
	 */
	IProperty getProperty();
}




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

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.MapProperty;
import org.eclipse.core.databinding.property.MapPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class ValuePropertyDetailMap extends MapProperty {
	private final IValueProperty masterProperty;
	private final IMapProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterValueListener();

	private class MasterValueListener implements IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			Map oldMap = detailProperty.getMap(oldSource);
			Map newMap = detailProperty.getMap(newSource);
			MapDiff diff = Diffs.computeMapDiff(oldMap, newMap);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireMapChange(source, diff);
		}
	}

	private class DetailPropertyListener implements IMapPropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleMapPropertyChange(MapPropertyChangeEvent event) {
			fireMapChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailMap(IValueProperty masterProperty,
			IMapProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addMapChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeMapChangeListener(detailListener.masterValue,
					detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public Map getMap(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getMap(masterValue);
	}

	public void clear(Object source) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.clear(masterValue);
	}

	public Object put(Object source, Object key, Object value) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.put(masterValue, key, value);
	}

	public void putAll(Object source, Map t) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.putAll(masterValue, t);
	}

	public Object remove(Object source, Object key) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, key);
	}
}




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

package org.eclipse.core.databinding.property;

/**
 * Listener for changes to set properties on a property source
 * 
 * @since 1.2
 */
public interface ISetPropertyChangeListener extends IPropertyChangeListener {
	/**
	 * Handle a change to a set property on a specific property source.
	 * 
	 * @param event
	 *            an event describing the set change that occured.
	 */
	public void handleSetPropertyChange(SetPropertyChangeEvent event);
}




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

package org.eclipse.core.databinding.property;

import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;

/**
 * Abstract set property implementation for properties where the set can be
 * completely replaced in a single atomic operation.
 * <p>
 * For example, a set-typed bean property Customer.addresses can be modified by
 * calling Customer.setAddresses(List addresses).
 * 
 * @since 1.2
 */
public abstract class BasicSetProperty extends SetProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	/**
	 * Returns whether this property is currently being updated on the source.
	 * Implementors should query this value to avoid unnecessary calculations,
	 * such as computing a diff.
	 * 
	 * @param source
	 *            the property source
	 * @return whether this property is currently being updated on the source.
	 */
	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	/**
	 * Sets the set property on the source to the specified set, then fires a
	 * set change using the specified diff.
	 * 
	 * @param source
	 *            the property source
	 * @param set
	 *            the new set
	 * @param diff
	 *            the diff to be fired after the set property has been set. If
	 *            null, the diff will be computed.
	 */
	protected void setSet(Object source, Set set, SetDiff diff) {
		if (diff == null) {
			diff = Diffs.computeSetDiff(getSet(source), set);
		}

		updateHelper.setUpdating(source, true);
		try {
			doSetSet(source, set);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			fireSetChange(source, diff);
		}
	}

	protected void fireSetChange(Object source, SetDiff diff) {
		if (!isUpdating(source))
			super.fireSetChange(source, diff);
	}

	/**
	 * Sets the set property on the source to the specified set.
	 * 
	 * @param source
	 *            the property source
	 * @param set
	 *            the new set
	 */
	protected abstract void doSetSet(Object source, Set set);

	public boolean add(Object source, Object o) {
		Set set = getSet(source);
		if (!set.contains(o)) {
			set = new HashSet(set);
			boolean added = set.add(o);
			if (added)
				setSet(source, set, Diffs.createSetDiff(Collections
						.singleton(o), Collections.EMPTY_SET));
			return added;
		}
		return false;
	}

	public boolean addAll(Object source, Collection c) {
		Set set = getSet(source);
		Set additions = new HashSet();
		for (Iterator it = c.iterator(); it.hasNext();) {
			Object o = it.next();
			if (!set.contains(o)) {
				additions.add(o);
			}
		}
		boolean changed = !additions.isEmpty();
		if (changed) {
			set = new HashSet(set);
			set.addAll(additions);
			setSet(source, set, Diffs.createSetDiff(additions,
					Collections.EMPTY_SET));
		}
		return changed;
	}

	public void clear(Object source) {
		setSet(source, new HashSet(), Diffs.createSetDiff(
				Collections.EMPTY_SET, getSet(source)));
	}

	public boolean remove(Object source, Object o) {
		Set set = getSet(source);
		if (set.contains(o)) {
			set = new HashSet(set);
			boolean removed = set.remove(o);
			if (removed)
				setSet(source, set, Diffs.createSetDiff(Collections.EMPTY_SET,
						Collections.singleton(o)));
			return removed;
		}
		return false;
	}

	public boolean removeAll(Object source, Collection c) {
		Set set = new HashSet(getSet(source));
		Set removals = new HashSet();
		for (Iterator it = set.iterator(); it.hasNext();) {
			Object o = it.next();
			if (c.contains(o)) {
				removals.add(o);
				it.remove();
			}
		}
		boolean changed = !removals.isEmpty();
		if (changed) {
			setSet(source, set, Diffs.createSetDiff(Collections.EMPTY_SET,
					removals));
		}
		return changed;
	}

	public boolean retainAll(Object source, Collection c) {
		Set set = new HashSet(getSet(source));
		Set removals = new HashSet();
		for (Iterator it = set.iterator(); it.hasNext();) {
			Object o = it.next();
			if (!c.contains(o)) {
				removals.add(o);
				it.remove();
			}
		}
		boolean changed = !removals.isEmpty();
		if (changed) {
			setSet(source, set, Diffs.createSetDiff(Collections.EMPTY_SET,
					removals));
		}
		return changed;
	}

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.runtime.Assert;

/**
 * Map change event describing an incremental change of a map property on a
 * particular property source.
 * 
 * @since 1.2
 */
public class MapPropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * The map property that changed
	 */
	public final IMapProperty property;

	/**
	 * MapDiff enumerating the added, changed, and removed entries in the map.
	 */
	public final MapDiff diff;

	/**
	 * Constructs a MapPropertyChangeEvent with the given attributes
	 * 
	 * @param source
	 *            the property source
	 * @param property
	 *            the property that changed on the source
	 * @param diff
	 *            a MapDiff describing the changes to the map property
	 */
	public MapPropertyChangeEvent(Object source, IMapProperty property,
			MapDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((IMapPropertyChangeListener) listener).handleMapPropertyChange(this);
	}
}




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

package org.eclipse.core.databinding.property;

import java.util.EventObject;

abstract class PropertyChangeEvent extends EventObject {
	private static final long serialVersionUID = 1L;

	PropertyChangeEvent(Object source) {
		super(source);
	}

	abstract void dispatch(IPropertyChangeListener listener);
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.runtime.Assert;

/**
 * List change event describing an incremental change of a list property on a
 * particular property source.
 * 
 * @since 1.2
 */
public class ListPropertyChangeEvent extends PropertyChangeEvent {
	private static final long serialVersionUID = 1L;

	/**
	 * The list property that changed
	 */
	public final IListProperty property;

	/**
	 * ListDiff enumerating the added and removed elements in the list.
	 */
	public final ListDiff diff;

	/**
	 * Constructs a ListPropertyChangeEvent with the given attributes
	 * 
	 * @param source
	 *            the property source
	 * @param property
	 *            the property that changed on the source
	 * @param diff
	 *            a ListDiff describing the changes to the list property
	 */
	public ListPropertyChangeEvent(Object source, IListProperty property,
			ListDiff diff) {
		super(source);
		this.property = property;
		Assert.isNotNull(diff, "diff cannot be null"); //$NON-NLS-1$
		this.diff = diff;
	}

	void dispatch(IPropertyChangeListener listener) {
		((IListPropertyChangeListener) listener).handleListPropertyChange(this);
	}
}




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

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.MapProperty;
import org.eclipse.core.databinding.property.MapPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class MapPropertyDetailValueMap extends MapProperty {
	private final IMapProperty masterProperty;
	private final IValueProperty detailProperty;

	private Map sourceToKeyToDetailListener = new HashMap();

	private IMapPropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements IMapPropertyChangeListener {
		public void handleMapPropertyChange(final MapPropertyChangeEvent event) {
			Object source = event.getSource();

			Map oldValues = new HashMap();
			Map newValues = new HashMap();

			Set addedKeys = event.diff.getAddedKeys();
			for (Iterator it = addedKeys.iterator(); it.hasNext();) {
				Object key = it.next();
				Object newMasterValue = event.diff.getNewValue(key);
				Object newDetailValue = detailProperty.getValue(newMasterValue);
				newValues.put(key, newDetailValue);
				addPropertySourceListener(source, key, newMasterValue);
			}

			Set removedKeys = event.diff.getRemovedKeys();
			for (Iterator it = removedKeys.iterator(); it.hasNext();) {
				Object key = it.next();
				Object oldMasterValue = event.diff.getOldValue(key);
				Object oldDetailValue = detailProperty.getValue(oldMasterValue);
				oldValues.put(key, oldDetailValue);
				removePropertySourceListener(source, key, oldMasterValue);
			}

			Set changedKeys = new HashSet(event.diff.getChangedKeys());
			for (Iterator it = changedKeys.iterator(); it.hasNext();) {
				Object key = it.next();

				Object oldMasterValue = event.diff.getOldValue(key);
				Object newMasterValue = event.diff.getNewValue(key);

				Object oldDetailValue = detailProperty.getValue(oldMasterValue);
				Object newDetailValue = detailProperty.getValue(newMasterValue);

				if (Util.equals(oldDetailValue, newDetailValue)) {
					it.remove();
				} else {
					oldValues.put(key, oldDetailValue);
					newValues.put(key, newDetailValue);
				}

				removePropertySourceListener(source, key, oldMasterValue);
				addPropertySourceListener(source, key, newMasterValue);
			}

			MapDiff diff = Diffs.createMapDiff(addedKeys, removedKeys,
					changedKeys, oldValues, newValues);

			fireMapChange(source, diff);
		}

		private void addPropertySourceListener(Object source, Object key,
				Object masterValue) {
			Map keyToDetailListener = (Map) sourceToKeyToDetailListener
					.get(source);
			if (keyToDetailListener == null) {
				sourceToKeyToDetailListener.put(source,
						keyToDetailListener = new HashMap());
			}
			if (!keyToDetailListener.containsKey(key)) {
				DetailPropertyListener detailListener = new DetailPropertyListener(
						source, key);
				detailProperty.addValueChangeListener(masterValue,
						detailListener);
				keyToDetailListener.put(key, detailListener);
			}
		}

		private void removePropertySourceListener(Object source, Object key,
				Object masterValue) {
			Map keyToDetailListener = (Map) sourceToKeyToDetailListener
					.get(source);
			if (keyToDetailListener != null
					&& keyToDetailListener.containsKey(key)) {
				DetailPropertyListener detailListener = (DetailPropertyListener) keyToDetailListener
						.remove(key);
				detailProperty.removeValueChangeListener(masterValue,
						detailListener);
			}
		}
	}

	private class DetailPropertyListener implements
			IValuePropertyChangeListener {
		private Object source;
		private Object key;

		DetailPropertyListener(Object source, Object key) {
			this.source = source;
			this.key = key;
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			fireMapChange(source, Diffs.createMapDiffSingleChange(key,
					event.diff.getOldValue(), event.diff.getNewValue()));
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public MapPropertyDetailValueMap(IMapProperty masterProperty,
			IValueProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addMapChangeListener(source, masterListener);

		Map keyToDetailListener = new HashMap();
		for (Iterator it = masterProperty.getMap(source).entrySet().iterator(); it
				.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			Object key = entry.getKey();
			Object masterValue = entry.getValue();
			DetailPropertyListener detailListener = new DetailPropertyListener(
					source, key);
			detailProperty.addValueChangeListener(masterValue, detailListener);
			keyToDetailListener.put(masterValue, detailListener);
		}

		sourceToKeyToDetailListener.put(source, keyToDetailListener);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeMapChangeListener(source, masterListener);
		Map masterElementToDetailListener = (Map) sourceToKeyToDetailListener
				.remove(source);
		if (masterElementToDetailListener != null) {
			for (Iterator it = masterElementToDetailListener.entrySet()
					.iterator(); it.hasNext();) {
				Map.Entry entry = (Map.Entry) it.next();
				detailProperty.removeValueChangeListener(entry.getKey(),
						(DetailPropertyListener) entry.getValue());
			}
		}
	}

	public Map getMap(Object source) {
		Map result = new HashMap();
		for (Iterator it = masterProperty.getMap(source).entrySet().iterator(); it
				.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			result.put(entry.getKey(), detailProperty
					.getValue(entry.getValue()));
		}
		return result;
	}

	public void clear(Object source) {
		throw new UnsupportedOperationException();
	}

	public Object put(Object source, Object key, Object value) {
		if (!masterProperty.containsKey(source, key))
			return null;
		Object masterValue = masterProperty.get(source, key);

		Object result = detailProperty.getValue(masterValue);
		detailProperty.setValue(masterValue, value);
		return result;
	}

	public void putAll(Object source, Map t) {
		for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
			Map.Entry entry = (Map.Entry) it.next();
			Object masterKey = entry.getKey();
			Object detailValue = entry.getValue();
			if (masterProperty.getMap(source).containsKey(masterKey)) {
				detailProperty.setValue(masterKey, detailValue);
			}
		}
	}

	public Object remove(Object source, Object key) {
		throw new UnsupportedOperationException();
	}
}




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

package org.eclipse.core.databinding.property;

import java.util.Collection;

/**
 * Interface for collection-typed properties.
 * 
 * @since 1.2
 */
public interface ICollectionProperty extends IProperty {
	/**
	 * Returns the size of the source's collection property
	 * 
	 * @param source
	 *            the property source
	 * @return the size of the source's collection property
	 */
	int size(Object source);

	/**
	 * Returns whether the source's collection property is empty
	 * 
	 * @param source
	 *            the property source
	 * @return whether the source's collection property is empty
	 */
	boolean isEmpty(Object source);

	/**
	 * Returns whether the source's collection property contains the given
	 * element.
	 * 
	 * @param source
	 *            the property source
	 * @param o
	 *            the element
	 * @return whether the source's collection property contains the given
	 *         element.
	 */
	boolean contains(Object source, Object o);

	/**
	 * Returns an array of all elements in the source's collection property
	 * 
	 * @param source
	 *            the property source
	 * @return an array of all elements in the source's collection property
	 */
	Object[] toArray(Object source);

	/**
	 * Returns an array of all elements in the source's collection property
	 * 
	 * @param source
	 *            the property source
	 * @param array
	 *            the array into which the elements will be copied. If the array
	 *            is not large enough to hold all elements, the elements will be
	 *            returned in a new array of the same runtime type.
	 * @return an array of all elements in the source's collection property
	 */
	Object[] toArray(Object source, Object[] array);

	/**
	 * Adds the element to the source's collection property
	 * 
	 * @param source
	 *            the property source
	 * @param o
	 *            the element to add
	 * @return whether the element was added to the source's collection property
	 */
	boolean add(Object source, Object o);

	/**
	 * Removes the element from the source's collection property
	 * 
	 * @param source
	 *            the property source
	 * @param o
	 *            the element to remove
	 * @return whether the element was removed from the source's collection
	 *         property
	 */
	boolean remove(Object source, Object o);

	/**
	 * Returns whether the source's collection property contains all elements in
	 * the given collection
	 * 
	 * @param source
	 *            the property source
	 * @param c
	 *            the collection of elements to test for
	 * @return whether the source's collection property contains all elements in
	 *         the given collection
	 */
	boolean containsAll(Object source, Collection c);

	/**
	 * Adds all elements in the specified collection to the source's collection
	 * property.
	 * 
	 * @param source
	 *            the property source
	 * @param c
	 *            the collection of elements to add.
	 * @return whether the source's collection property was changed
	 */
	boolean addAll(Object source, Collection c);

	/**
	 * Removes all elements from the source's collection property which are
	 * contained in the specified collection.
	 * 
	 * @param source
	 *            the property source
	 * @param c
	 *            the collection of elements to be removed
	 * @return whether the source's collection property was changed
	 */
	boolean removeAll(Object source, Collection c);

	/**
	 * Removes all elements from the source's collection property which are not
	 * contained in the specified collection.
	 * 
	 * @param source
	 *            the property source
	 * @param c
	 *            the collection of elements to retain
	 * @return whether the source's collection property was changed
	 */
	boolean retainAll(Object source, Collection c);

	/**
	 * Removes all elements from the source's collection property.
	 * 
	 * @param source
	 *            the property source
	 */
	void clear(Object source);

	/**
	 * Returns whether the source's collection property is equal to the
	 * argument.
	 * 
	 * @param source
	 *            the property source
	 * @param o
	 *            the object to test for equality to the source's collection
	 *            property
	 * @return whether the source's collection property is equal to the argument
	 */
	boolean equals(Object source, Object o);

	/**
	 * Returns the hash code of the source's collection property.
	 * 
	 * @param source
	 *            the property source
	 * @return the hash code of the source's collection property
	 */
	int hashCode(Object source);

	/**
	 * Returns the type of the elements in the collection or <code>null</code>
	 * if untyped
	 * 
	 * @return the type of the elements in the collection or <code>null</code>
	 *         if untyped
	 */
	Object getElementType();
}




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

package org.eclipse.core.databinding.property;

import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.core.runtime.ListenerList;

class PropertyChangeSupport {
	private Property property;
	private Map changeListeners;

	PropertyChangeSupport(Property property) {
		this.property = property;
		this.changeListeners = null;
	}

	protected final void addListener(Object source,
			IPropertyChangeListener listener) {
		boolean hadListeners = hasListeners(source);

		if (changeListeners == null) {
			synchronized (this) {
				if (changeListeners == null) {
					changeListeners = Collections
							.synchronizedMap(new IdentityHashMap());
				}
			}
		}

		ListenerList listeners;
		synchronized (changeListeners) {
			if (changeListeners.containsKey(source)) {
				listeners = (ListenerList) changeListeners.get(source);
			} else {
				changeListeners.put(source, listeners = new ListenerList());
			}
		}

		synchronized (listeners) {
			listeners.add(listener);
		}

		if (!hadListeners)
			property.addListenerTo(source);
	}

	/**
	 * Returns whether the change support has listeners registered for the given
	 * property source
	 * 
	 * @param source
	 *            the property source
	 * @return whether the change support has listeners registered for the given
	 *         property source
	 */
	public boolean hasListeners(Object source) {
		return changeListeners != null && changeListeners.containsKey(source);
	}

	protected final void removeListener(Object source,
			IPropertyChangeListener listener) {
		if (changeListeners != null) {
			ListenerList listeners = (ListenerList) changeListeners.get(source);
			if (listeners != null) {
				listeners.remove(listener);
				if (listeners.isEmpty()) {
					synchronized (listeners) {
						if (listeners.isEmpty()) {
							changeListeners.remove(source);
							property.removeListenerFrom(source);
						}
					}
				}
			}
		}
	}

	protected final void firePropertyChange(PropertyChangeEvent event) {
		ListenerList listenerList;
		synchronized (this) {
			if (changeListeners == null)
				return;
			listenerList = (ListenerList) changeListeners
					.get(event.getSource());
		}
		if (listenerList != null) {
			Object[] listeners = listenerList.getListeners();
			for (int i = 0; i < listeners.length; i++) {
				event.dispatch((IPropertyChangeListener) listeners[i]);
			}
		}
	}

	void dispose() {
		if (changeListeners != null) {
			for (Iterator iterator = changeListeners.keySet().iterator(); iterator
					.hasNext();) {
				Object source = iterator.next();
				property.removeListenerFrom(source);
				iterator.remove();
			}
			changeListeners = null;
		}
	}
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.property.ListValuePropertyObservableList;
import org.eclipse.core.internal.databinding.property.MapValuePropertyObservableMap;
import org.eclipse.core.internal.databinding.property.PropertyObservableList;
import org.eclipse.core.internal.databinding.property.PropertyObservableMap;
import org.eclipse.core.internal.databinding.property.PropertyObservableSet;
import org.eclipse.core.internal.databinding.property.PropertyObservableValue;
import org.eclipse.core.internal.databinding.property.SetValuePropertyObservableMap;

/**
 * A factory for creating observables observing properties of source objects
 * 
 * @since 1.2
 */
public class PropertyObservables {
	/**
	 * Returns an observable value on the default realm that tracks the given
	 * property of the source object.
	 * 
	 * @param source
	 *            the property value
	 * @param property
	 *            the value property to observe
	 * @return an observable value on the default realm that tracks the given
	 *         property of the source object.
	 * @since 1.2
	 */
	public static IObservableValue observeValue(Object source,
			IValueProperty property) {
		return observeValue(Realm.getDefault(), source, property);
	}

	/**
	 * Returns an observable value on the given realm that tracks the given
	 * property of the source object
	 * 
	 * @param realm
	 *            the realm
	 * @param source
	 *            the property source
	 * @param property
	 *            the value property observe
	 * @return an observable value that tracks the given property of the source
	 *         object
	 * @since 1.2
	 */
	public static IObservableValue observeValue(Realm realm, Object source,
			IValueProperty property) {
		return new PropertyObservableValue(realm, source, property);
	}

	/**
	 * Returns a factory for creating observable values on the default realm
	 * tracking the given property of a particular source object
	 * 
	 * @param property
	 *            the property to observe
	 * @return a factory for creating observable values on the default realm
	 *         tracking the given property of a particular source object
	 */
	public static IObservableFactory valueFactory(IValueProperty property) {
		return valueFactory(Realm.getDefault(), property);
	}

	/**
	 * Returns a factory for creating observable values on the given realm
	 * tracking the given property of a particular source object
	 * 
	 * @param realm
	 *            the realm
	 * @param property
	 *            the property to observe
	 * @return a factory for creating observable values on the given realm
	 *         tracking the given property of a particular source object
	 */
	public static IObservableFactory valueFactory(final Realm realm,
			final IValueProperty property) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeValue(realm, target, property);
			}
		};
	}

	/**
	 * Returns an observable value on the master observable's realm which tracks
	 * the given property of the current value of <code>master</code>.
	 * 
	 * @param master
	 *            the master observable
	 * @param property
	 *            the property to observe
	 * @return an observable value which tracks the given property of the
	 *         current value of <code>master</code>.
	 */
	public static IObservableValue observeDetailValue(IObservableValue master,
			IValueProperty property) {
		return MasterDetailObservables.detailValue(master, valueFactory(master
				.getRealm(), property), property.getValueType());
	}

	/**
	 * Returns an observable set on the default realm that tracks the given
	 * property of the source object
	 * 
	 * @param source
	 *            the property source
	 * @param property
	 *            the property to observe
	 * @return an observable set on the default realm that tracks the given
	 *         property of the source object
	 */
	public static IObservableSet observeSet(Object source, ISetProperty property) {
		return observeSet(Realm.getDefault(), source, property);
	}

	/**
	 * Returns an observable set on the given realm that tracks the given
	 * property of the source object
	 * 
	 * @param realm
	 *            the realm
	 * @param source
	 *            the property source
	 * @param property
	 *            the property to observe
	 * @return an observable set on the given realm that tracks the given
	 *         property of the source object
	 */
	public static IObservableSet observeSet(Realm realm, Object source,
			ISetProperty property) {
		return new PropertyObservableSet(realm, source, property);
	}

	/**
	 * Returns a factory for creating observable sets on the default realm
	 * tracking the given property of a particular source object
	 * 
	 * @param property
	 *            the property to be observed
	 * @return a factory for creating observable sets on the default realm
	 *         tracking the given property of a particular source object
	 */
	public static IObservableFactory setFactory(ISetProperty property) {
		return setFactory(Realm.getDefault(), property);
	}

	/**
	 * Returns a factory for creating obervable sets on the given realm tracking
	 * the given property of a particular source object
	 * 
	 * @param realm
	 *            the realm
	 * @param property
	 *            the property to be observed
	 * @return a factory for creating obervable sets on the given realm tracking
	 *         the given property of a particular source object
	 */
	public static IObservableFactory setFactory(final Realm realm,
			final ISetProperty property) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeSet(realm, target, property);
			}
		};
	}

	/**
	 * Returns an observable set on the master observable's realm which tracks
	 * the given property of the current value of <code>master</code>.
	 * 
	 * @param master
	 *            the master observable
	 * @param property
	 *            the property to observe
	 * @return an observable set on the given realm which tracks the given
	 *         property of the current value of <code>master</code>.
	 */
	public static IObservableSet observeDetailSet(IObservableValue master,
			ISetProperty property) {
		return MasterDetailObservables.detailSet(master, setFactory(master
				.getRealm(), property), property.getElementType());
	}

	/**
	 * Returns an observable list on the default realm that tracks the given
	 * property of the source object
	 * 
	 * @param source
	 *            the property source
	 * @param property
	 *            the property to observe
	 * @return an observable list on the default realm that tracks the given
	 *         property of the source object
	 */
	public static IObservableList observeList(Object source,
			IListProperty property) {
		return observeList(Realm.getDefault(), source, property);
	}

	/**
	 * Returns an observable list on the given realm that tracks the given
	 * property of the source object
	 * 
	 * @param realm
	 *            the realm
	 * @param source
	 *            the property source
	 * @param property
	 *            the property to observe
	 * @return an observable list on the given realm that tracks the given
	 *         property of the source object
	 */
	public static IObservableList observeList(Realm realm, Object source,
			IListProperty property) {
		return new PropertyObservableList(realm, source, property);
	}

	/**
	 * Returns a factory for creating observable lists on the default realm
	 * tracking the given property of a particular source object
	 * 
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory listFactory(IListProperty property) {
		return listFactory(Realm.getDefault(), property);
	}

	/**
	 * Returns a factory for creating obervable lists on the given realm
	 * tracking the given property of a particular source object
	 * 
	 * @param realm
	 *            the realm
	 * @param property
	 *            the property to be observed
	 * @return an observable value factory on
	 */
	public static IObservableFactory listFactory(final Realm realm,
			final IListProperty property) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeList(realm, target, property);
			}
		};
	}

	/**
	 * Returns an observable list on the master observable's realm which tracks
	 * the given property of the current value of <code>master</code>.
	 * 
	 * @param master
	 *            the master observable
	 * @param property
	 *            the property to observe
	 * @return an observable list on the given realm which tracks the given
	 *         property of the current value of <code>master</code>.
	 */
	public static IObservableList observeDetailList(IObservableValue master,
			IListProperty property) {
		return MasterDetailObservables.detailList(master, listFactory(master
				.getRealm(), property), property.getElementType());
	}

	/**
	 * Returns an observable list on the master observable's realm which tracks
	 * the given property of each element of <code>master</code>.
	 * 
	 * @param master
	 *            the master observable
	 * @param property
	 *            the property to observe on each element in the master
	 *            observable
	 * @return an observable
	 */
	public static IObservableList observeDetailValues(IObservableList master,
			IValueProperty property) {
		return new ListValuePropertyObservableList(master, property);
	}

	/**
	 * Returns an observable map on the default realm which tracks the given
	 * property of the source object
	 * 
	 * @param source
	 *            the property source
	 * @param property
	 *            the property to observe
	 * @return an observable map on the default realm which tracks the given
	 *         property of the source object
	 */
	public static IObservableMap observeMap(Object source, IMapProperty property) {
		return observeMap(Realm.getDefault(), source, property);
	}

	/**
	 * Returns an observable map on the given realm which tracks the given
	 * property of the source object
	 * 
	 * @param realm
	 *            the realm
	 * @param source
	 *            the property source
	 * @param property
	 *            the property to observe
	 * @return an observable map on the given realm which tracks the given
	 *         property of the source object
	 */
	public static IObservableMap observeMap(Realm realm, Object source,
			IMapProperty property) {
		return new PropertyObservableMap(realm, source, property);
	}

	/**
	 * Returns an observable map on the master observable's realm tracking the
	 * current values of the given property for the elements in the given set.
	 * 
	 * @param keySet
	 *            the master observable
	 * @param valueProperty
	 *            the property to observe on each element of the master
	 *            observable
	 * @return an observable map that tracks the current value of the given
	 *         property for the elements in the given set.
	 */
	public static IObservableMap observeDetailValues(IObservableSet keySet,
			IValueProperty valueProperty) {
		return new SetValuePropertyObservableMap(keySet, valueProperty);
	}

	/**
	 * Returns an observable map on the master observable's realm which tracks
	 * the current values of the given property for the entry values in the
	 * given map.
	 * 
	 * @param map
	 *            the master observable
	 * @param valueProperty
	 *            the property to observe on each entry value in the master
	 *            observable
	 * @return an observable map on the master observable's realm which tracks
	 *         the current value of the given property for the elements in the
	 *         given map's values collection
	 */
	public static IObservableMap observeDetailValues(IObservableMap map,
			IValueProperty valueProperty) {
		return new MapValuePropertyObservableMap(map, valueProperty);
	}
}




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

package org.eclipse.core.internal.databinding.property.masterdetail;

import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.ISetPropertyChangeListener;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.SetProperty;
import org.eclipse.core.databinding.property.SetPropertyChangeEvent;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class ValuePropertyDetailSet extends SetProperty {
	private final IValueProperty masterProperty;
	private final ISetProperty detailProperty;

	private Map sourceToDetailListener = new HashMap();

	private IValuePropertyChangeListener masterListener = new MasterPropertyListener();

	private class MasterPropertyListener implements
			IValuePropertyChangeListener {
		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			Object oldSource = event.diff.getOldValue();
			Object newSource = event.diff.getNewValue();

			Set oldSet = detailProperty.getSet(oldSource);
			Set newSet = detailProperty.getSet(newSource);
			SetDiff diff = Diffs.computeSetDiff(oldSet, newSet);

			Object source = event.getSource();

			removeDetailPropertyListener(source);
			addDetailPropertyListener(source);

			fireSetChange(source, diff);
		}
	}

	private class DetailPropertyListener implements ISetPropertyChangeListener {
		private Object source;
		private Object masterValue;

		DetailPropertyListener(Object source, Object masterValue) {
			this.source = source;
			this.masterValue = masterValue;
		}

		public void handleSetPropertyChange(SetPropertyChangeEvent event) {
			fireSetChange(source, event.diff);
		}
	}

	/**
	 * @param masterProperty
	 * @param detailProperty
	 */
	public ValuePropertyDetailSet(IValueProperty masterProperty,
			ISetProperty detailProperty) {
		this.masterProperty = masterProperty;
		this.detailProperty = detailProperty;
	}

	protected void addListenerTo(Object source) {
		masterProperty.addValueChangeListener(source, masterListener);
		addDetailPropertyListener(source);
	}

	protected void removeListenerFrom(Object source) {
		masterProperty.removeValueChangeListener(source, masterListener);
		removeDetailPropertyListener(source);
	}

	private void addDetailPropertyListener(Object source) {
		Object masterValue = masterProperty.getValue(source);
		DetailPropertyListener detailListener = new DetailPropertyListener(
				source, masterValue);
		detailProperty.addSetChangeListener(masterValue, detailListener);
		sourceToDetailListener.put(source, detailListener);
	}

	private void removeDetailPropertyListener(Object source) {
		DetailPropertyListener detailListener = (DetailPropertyListener) sourceToDetailListener
				.remove(source);
		if (detailListener != null) {
			detailProperty.removeSetChangeListener(detailListener.masterValue,
					detailListener);
		}
		sourceToDetailListener.remove(source);
	}

	public Set getSet(Object source) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.getSet(masterValue);
	}

	public boolean add(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.add(masterValue, o);
	}

	public boolean addAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.addAll(masterValue, c);
	}

	public void clear(Object source) {
		Object masterValue = masterProperty.getValue(source);
		detailProperty.clear(masterValue);
	}

	public Object getElementType() {
		return detailProperty.getElementType();
	}

	public boolean remove(Object source, Object o) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.remove(masterValue, o);
	}

	public boolean removeAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.removeAll(masterValue, c);
	}

	public boolean retainAll(Object source, Collection c) {
		Object masterValue = masterProperty.getValue(source);
		return detailProperty.retainAll(masterValue, c);
	}
}




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

package org.eclipse.core.internal.databinding.property;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.ConcurrentModificationException;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;

import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.AbstractObservableList;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IListPropertyChangeListener;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.ListPropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class PropertyObservableList extends AbstractObservableList implements
		IPropertyObservable {
	private Object source;
	private IListProperty property;

	private volatile boolean updating = false;

	private boolean disposed = false;

	private transient volatile int modCount = 0;

	private IListPropertyChangeListener listener = new IListPropertyChangeListener() {
		public void handleListPropertyChange(final ListPropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						getRealm().exec(new Runnable() {
							public void run() {
								modCount++;
								fireListChange(event.diff);
							}
						});
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableList(Realm realm, Object source,
			IListProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addListChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeListChangeListener(source, listener);
		}
	}

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

	public Object getElementType() {
		return property.getElementType();
	}

	// Queries

	protected int doGetSize() {
		return property.size(source);
	}

	public boolean contains(Object o) {
		getterCalled();
		return property.contains(source, o);
	}

	public boolean containsAll(Collection c) {
		getterCalled();
		return property.containsAll(source, c);
	}

	public Object get(int index) {
		getterCalled();
		return property.get(source, index);
	}

	public int indexOf(Object o) {
		getterCalled();
		return property.indexOf(source, o);
	}

	public boolean isEmpty() {
		getterCalled();
		return property.isEmpty(source);
	}

	public int lastIndexOf(Object o) {
		getterCalled();
		return property.lastIndexOf(source, o);
	}

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

	public Object[] toArray(Object[] a) {
		getterCalled();
		return property.toArray(source, a);
	}

	// Single change operations

	public boolean add(Object o) {
		checkRealm();
		return property.add(source, o);
	}

	public Iterator iterator() {
		getterCalled();
		return new Iterator() {
			int lastReturned = -1;
			int expectedModCount = modCount;
			ListIterator delegate = new ArrayList(property.getList(source))
					.listIterator();

			public boolean hasNext() {
				getterCalled();
				checkForComodification();
				return delegate.hasNext();
			}

			public Object next() {
				getterCalled();
				checkForComodification();
				Object next = delegate.next();
				lastReturned = delegate.previousIndex();
				return next;
			}

			public void remove() {
				checkRealm();
				checkForComodification();
				if (lastReturned == -1)
					throw new IllegalStateException();

				delegate.remove(); // stay in sync

				property.remove(source, lastReturned);

				lastReturned = -1;
				expectedModCount = modCount;
			}

			private void checkForComodification() {
				if (expectedModCount != modCount)
					throw new ConcurrentModificationException();
			}
		};
	}

	public Object move(int oldIndex, int newIndex) {
		getterCalled();
		return property.move(source, oldIndex, newIndex);
	}

	public boolean remove(Object o) {
		getterCalled();
		return property.remove(source, o);
	}

	public void add(int index, Object o) {
		getterCalled();
		property.add(source, index, o);
	}

	public ListIterator listIterator() {
		return listIterator(0);
	}

	public ListIterator listIterator(final int index) {
		getterCalled();
		return new ListIterator() {
			int lastReturned = -1;
			int expectedModCount = modCount;
			ListIterator delegate = new ArrayList(property.getList(source))
					.listIterator(index);

			public boolean hasNext() {
				getterCalled();
				checkForComodification();
				return delegate.hasNext();
			}

			public int nextIndex() {
				getterCalled();
				checkForComodification();
				return delegate.nextIndex();
			}

			public Object next() {
				getterCalled();
				checkForComodification();
				Object next = delegate.next();
				lastReturned = delegate.previousIndex();
				return next;
			}

			public boolean hasPrevious() {
				getterCalled();
				checkForComodification();
				return delegate.hasPrevious();
			}

			public int previousIndex() {
				getterCalled();
				checkForComodification();
				return delegate.previousIndex();
			}

			public Object previous() {
				getterCalled();
				checkForComodification();
				Object previous = delegate.previous();
				lastReturned = delegate.nextIndex();
				return previous;
			}

			public void add(Object o) {
				checkRealm();
				checkForComodification();
				int index = delegate.nextIndex();

				delegate.add(o); // keep in sync

				property.add(source, index, o);

				lastReturned = -1;
				expectedModCount = modCount;
			}

			public void set(Object o) {
				checkRealm();
				checkForComodification();

				delegate.set(o);

				property.set(source, lastReturned, o);

				expectedModCount = modCount;
			}

			public void remove() {
				checkRealm();
				checkForComodification();
				if (lastReturned == -1)
					throw new IllegalStateException();

				delegate.remove(); // keep in sync

				property.remove(source, lastReturned);

				lastReturned = -1;
				expectedModCount = modCount;
			}

			private void checkForComodification() {
				if (expectedModCount != modCount)
					throw new ConcurrentModificationException();
			}

		};
	}

	public Object remove(int index) {
		getterCalled();
		return property.remove(source, index);
	}

	public Object set(int index, Object o) {
		getterCalled();
		return property.set(source, index, o);
	}

	public List subList(int fromIndex, int toIndex) {
		getterCalled();
		return Collections.unmodifiableList(property.getList(source).subList(
				fromIndex, toIndex));
	}

	// Bulk change operations

	public boolean addAll(Collection c) {
		getterCalled();
		return property.addAll(source, c);
	}

	public boolean addAll(int index, Collection c) {
		getterCalled();
		return property.addAll(source, index, c);
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		return property.removeAll(source, c);
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		return property.retainAll(source, c);
	}

	public void clear() {
		getterCalled();
		property.clear(source);
	}

	public boolean equals(Object o) {
		getterCalled();
		return property.equals(source, o);
	}

	public int hashCode() {
		getterCalled();
		return property.hashCode(source);
	}

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeListChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.internal.databinding.property;

import java.util.HashMap;
import java.util.Map;

/**
 * @since 3.3
 * 
 */
public class PropertyUpdateHelper {
	private ThreadLocal localMap = new ThreadLocal() {
		protected Object initialValue() {
			return new HashMap();
		}
	};

	/**
	 * @param source
	 * @return blah
	 */
	public boolean isUpdating(Object source) {
		Map map = (Map) localMap.get();
		return map.containsKey(source);
	}

	/**
	 * @param source
	 * @param state
	 */
	public void setUpdating(Object source, boolean state) {
		Map map = (Map) localMap.get();
		Integer count = (Integer) map.get(source);
		int newCount = (count == null ? 0 : count.intValue())
				+ (state ? 1 : -1);
		if (newCount > 0)
			map.put(source, new Integer(newCount));
		else
			map.remove(source);
	}

	/**
	 * 
	 */
	public void dispose() {
		if (localMap != null) {
			Map map = (Map) localMap.get();
			if (map != null) {
				map.clear();
				localMap.set(null);
			}
			localMap = null;
		}
	}
}




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

package org.eclipse.core.internal.databinding.property;

import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.list.AbstractObservableList;
import org.eclipse.core.databinding.observable.list.IListChangeListener;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListChangeEvent;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.ISetChangeListener;
import org.eclipse.core.databinding.observable.set.SetChangeEvent;
import org.eclipse.core.databinding.observable.set.WritableSet;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class ListValuePropertyObservableList extends AbstractObservableList
		implements IObserving {
	private IObservableList masterList;
	private IValueProperty detailProperty;

	private IObservableSet knownMasterElements;

	private boolean disposed = false;

	private IListChangeListener masterListener = new IListChangeListener() {
		public void handleListChange(ListChangeEvent event) {
			ListDiffEntry[] masterEntries = event.diff.getDifferences();
			ListDiffEntry[] detailEntries = new ListDiffEntry[masterEntries.length];
			for (int i = 0; i < masterEntries.length; i++) {
				ListDiffEntry masterDifference = masterEntries[i];
				int index = masterDifference.getPosition();
				boolean addition = masterDifference.isAddition();
				Object masterElement = masterDifference.getElement();
				Object elementDetailValue = detailProperty
						.getValue(masterElement);
				detailEntries[i] = Diffs.createListDiffEntry(index, addition,
						elementDetailValue);
			}

			// Removes listeners from elements removed from list
			knownMasterElements.retainAll(masterList);

			// Adds listeners to elements added to list
			knownMasterElements.addAll(masterList);

			fireListChange(Diffs.createListDiff(detailEntries));
		}
	};

	private IValuePropertyChangeListener detailListener = new IValuePropertyChangeListener() {
		public void handleValuePropertyChange(
				final ValuePropertyChangeEvent event) {
			if (!disposed) {
				Object source = event.getSource();
				int[] indices = findIndices(source);
				Object oldValue = event.diff.getOldValue();
				Object newValue = event.diff.getNewValue();
				ListDiffEntry[] entries = new ListDiffEntry[indices.length * 2];
				for (int i = 0; i < indices.length; i++) {
					int index = indices[i];
					entries[i * 2] = Diffs.createListDiffEntry(index, false,
							oldValue);
					entries[i * 2 + 1] = Diffs.createListDiffEntry(index, true,
							newValue);
				}

				ListDiff diff = Diffs.createListDiff(entries);
				fireListChange(diff);
			}
		}

		private int[] findIndices(Object masterElement) {
			List indices = new ArrayList();

			for (ListIterator it = masterList.listIterator(); it.hasNext();) {
				if (Util.equals(masterElement, it.next()))
					indices.add(Integer.valueOf(it.previousIndex()));
			}

			int[] result = new int[indices.size()];
			for (int i = 0; i < result.length; i++) {
				result[i] = ((Integer) indices.get(i)).intValue();
			}
			return result;
		}
	};

	/**
	 * @param masterList
	 * @param valueProperty
	 */
	public ListValuePropertyObservableList(IObservableList masterList,
			IValueProperty valueProperty) {
		super(masterList.getRealm());
		this.masterList = masterList;
		this.detailProperty = valueProperty;
	}

	protected void firstListenerAdded() {
		knownMasterElements = new WritableSet(getRealm());
		knownMasterElements.addSetChangeListener(new ISetChangeListener() {
			public void handleSetChange(SetChangeEvent event) {
				for (Iterator it = event.diff.getRemovals().iterator(); it
						.hasNext();) {
					detailProperty.addValueChangeListener(it.next(),
							detailListener);
				}
				for (Iterator it = event.diff.getAdditions().iterator(); it
						.hasNext();) {
					detailProperty.removeValueChangeListener(it.next(),
							detailListener);
				}
			}
		});
		knownMasterElements.addAll(masterList);
		masterList.addListChangeListener(masterListener);
	}

	protected void lastListenerRemoved() {
		masterList.removeListChangeListener(masterListener);
		if (knownMasterElements != null) {
			knownMasterElements.clear();
			knownMasterElements.dispose();
			knownMasterElements = null;
		}
	}

	protected int doGetSize() {
		getterCalled();
		return masterList.size();
	}

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

	public Object getElementType() {
		return detailProperty.getValueType();
	}

	public Object get(int index) {
		getterCalled();
		Object masterElement = masterList.get(index);
		return detailProperty.getValue(masterElement);
	}

	public boolean add(Object o) {
		throw new UnsupportedOperationException();
	}

	public boolean addAll(Collection c) {
		throw new UnsupportedOperationException();
	}

	public boolean addAll(int index, Collection c) {
		throw new UnsupportedOperationException();
	}

	public boolean contains(Object o) {
		getterCalled();

		Iterator it;
		if (knownMasterElements != null)
			it = knownMasterElements.iterator();
		else
			it = masterList.iterator();
		for (; it.hasNext();) {
			if (Util.equals(detailProperty.getValue(it.next()), o))
				return true;
		}
		return false;
	}

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

	public boolean isStale() {
		getterCalled();
		return masterList.isStale();
	}

	public Iterator iterator() {
		getterCalled();
		return new Iterator() {
			Iterator it = masterList.iterator();

			public boolean hasNext() {
				getterCalled();
				return it.hasNext();
			}

			public Object next() {
				getterCalled();
				Object masterElement = it.next();
				return detailProperty.getValue(masterElement);
			}

			public void remove() {
				throw new UnsupportedOperationException();
			}
		};
	}

	public Object move(int oldIndex, int newIndex) {
		throw new UnsupportedOperationException();
	}

	public boolean remove(Object o) {
		throw new UnsupportedOperationException();
	}

	public boolean removeAll(Collection c) {
		throw new UnsupportedOperationException();
	}

	public boolean retainAll(Collection c) {
		throw new UnsupportedOperationException();
	}

	public Object[] toArray() {
		getterCalled();
		Object[] masterElements = masterList.toArray();
		Object[] result = new Object[masterElements.length];
		for (int i = 0; i < result.length; i++) {
			result[i] = detailProperty.getValue(masterElements[i]);
		}
		return result;
	}

	public Object[] toArray(Object[] a) {
		getterCalled();
		Object[] masterElements = masterList.toArray();
		if (a.length < masterElements.length)
			a = (Object[]) Array.newInstance(a.getClass().getComponentType(),
					masterElements.length);
		for (int i = 0; i < masterElements.length; i++) {
			a[i] = detailProperty.getValue(masterElements[i]);
		}
		return a;
	}

	public void add(int index, Object o) {
		throw new UnsupportedOperationException();
	}

	public void clear() {
		throw new UnsupportedOperationException();
	}

	public ListIterator listIterator() {
		return listIterator(0);
	}

	public ListIterator listIterator(final int index) {
		getterCalled();
		return new ListIterator() {
			ListIterator it = masterList.listIterator(index);
			Object lastReturned;
			boolean haveIterated = false;

			public void add(Object arg0) {
				throw new UnsupportedOperationException();
			}

			public boolean hasNext() {
				getterCalled();
				return it.hasNext();
			}

			public boolean hasPrevious() {
				getterCalled();
				return it.hasPrevious();
			}

			public Object next() {
				getterCalled();
				Object result = lastReturned = detailProperty.getValue(it
						.next());
				haveIterated = true;
				return result;
			}

			public int nextIndex() {
				getterCalled();
				return it.nextIndex();
			}

			public Object previous() {
				getterCalled();
				Object result = lastReturned = detailProperty.getValue(it
						.previous());
				haveIterated = true;
				return result;
			}

			public int previousIndex() {
				getterCalled();
				return it.previousIndex();
			}

			public void remove() {
				throw new UnsupportedOperationException();
			}

			public void set(Object o) {
				checkRealm();
				if (!haveIterated)
					throw new IllegalStateException();
				// if listeners are registered, the value property listener will
				// cause the list change event to fire. otherwise it doesn't
				// matter because noone is listening
				detailProperty.setValue(lastReturned, o);
			}
		};
	}

	public Object remove(int index) {
		throw new UnsupportedOperationException();
	}

	public Object set(int index, Object o) {
		checkRealm();
		Object masterElement = masterList.get(index);
		Object oldValue = detailProperty.getValue(masterElement);
		detailProperty.setValue(masterElement, o);
		return oldValue;
	}

	public Object getObserved() {
		return masterList;
	}

	public synchronized void dispose() {
		if (masterList != null) {
			masterList.removeListChangeListener(masterListener);
			masterList = null;
			masterListener = null;
		}
		if (knownMasterElements != null) {
			knownMasterElements.clear();
			knownMasterElements.dispose();
			knownMasterElements = null;
			detailListener = null;
		}
		detailProperty = null;
		disposed = true;

		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property;

/**
 * Marker interface for all listener types in the properties framework.
 * 
 * @noimplement This interface is not intended to be implemented by clients.
 * 
 * @since 1.2
 */
public interface IPropertyChangeListener {

}




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

package org.eclipse.core.internal.databinding.property;

import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.AbstractObservableSet;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.ISetPropertyChangeListener;
import org.eclipse.core.databinding.property.SetPropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class PropertyObservableSet extends AbstractObservableSet implements
		IPropertyObservable {
	private Object source;
	private ISetProperty property;

	private boolean updating = false;

	private boolean disposed = false;

	private transient volatile int modCount = 0;

	private ISetPropertyChangeListener listener = new ISetPropertyChangeListener() {
		public void handleSetPropertyChange(final SetPropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						getRealm().exec(new Runnable() {
							public void run() {
								modCount++;
								fireSetChange(event.diff);
							}
						});
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableSet(Realm realm, Object source,
			ISetProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addSetChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeSetChangeListener(source, listener);
		}
	}

	protected Set getWrappedSet() {
		return property.getSet(source);
	}

	public Object getElementType() {
		return property.getElementType();
	}

	// Queries

	protected int doGetSize() {
		return property.size(source);
	}

	// Single change operations

	public boolean add(Object o) {
		checkRealm();
		return property.add(source, o);
	}

	public Iterator iterator() {
		getterCalled();
		return new Iterator() {
			int expectedModCount = modCount;
			Iterator delegate = new HashSet(property.getSet(source)).iterator();
			Object last = null;

			public boolean hasNext() {
				getterCalled();
				checkForComodification();
				return delegate.hasNext();
			}

			public Object next() {
				getterCalled();
				checkForComodification();
				Object next = delegate.next();
				last = next;
				return next;
			}

			public void remove() {
				checkRealm();
				checkForComodification();

				delegate.remove(); // stay in sync

				property.remove(source, last);

				last = null;
				expectedModCount = modCount;
			}

			private void checkForComodification() {
				if (expectedModCount != modCount)
					throw new ConcurrentModificationException();
			}
		};
	}

	public boolean remove(Object o) {
		getterCalled();
		return property.remove(source, o);
	}

	// Bulk change operations

	public boolean addAll(Collection c) {
		getterCalled();
		return property.addAll(source, c);
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		return property.removeAll(source, c);
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		return property.retainAll(source, c);
	}

	public void clear() {
		getterCalled();
		property.clear(source);
	}

	public boolean equals(Object o) {
		return property.equals(source, o);
	}

	public int hashCode() {
		return property.hashCode(source);
	}

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeSetChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property;

import java.util.Collection;

/**
 * Abstract implementation of ICollectionProperty.
 * 
 * @since 1.2
 */
public abstract class CollectionProperty extends Property implements
		ICollectionProperty {
	abstract Collection getCollection(Object source);

	public boolean contains(Object source, Object o) {
		return getCollection(source).contains(o);
	}

	public boolean containsAll(Object source, Collection c) {
		return getCollection(source).containsAll(c);
	}

	public boolean equals(Object source, Object o) {
		return getCollection(source).equals(o);
	}

	public int hashCode(Object source) {
		return getCollection(source).hashCode();
	}

	public boolean isEmpty(Object source) {
		return getCollection(source).isEmpty();
	}

	public int size(Object source) {
		return getCollection(source).size();
	}

	public Object[] toArray(Object source, Object[] array) {
		return getCollection(source).toArray(array);
	}

	public Object[] toArray(Object source) {
		return getCollection(source).toArray();
	}
}




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

package org.eclipse.core.internal.databinding.property;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IObserving;
import org.eclipse.core.databinding.observable.map.ComputedObservableMap;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;

/**
 * @since 3.3
 * 
 */
public class SetValuePropertyObservableMap extends ComputedObservableMap
		implements IObserving {
	private IValueProperty property;

	private boolean disposed = false;

	private IValuePropertyChangeListener listener = new IValuePropertyChangeListener() {
		public void handleValuePropertyChange(
				final ValuePropertyChangeEvent event) {
			if (!disposed) {
				getRealm().exec(new Runnable() {
					public void run() {
						Object key = event.getSource();
						Object oldValue = event.diff.getOldValue();
						Object newValue = event.diff.getNewValue();
						fireMapChange(Diffs.createMapDiffSingleChange(key,
								oldValue, newValue));
					}
				});
			}
		}
	};

	/**
	 * @param keySet
	 * @param valueProperty
	 */
	public SetValuePropertyObservableMap(IObservableSet keySet,
			IValueProperty valueProperty) {
		super(keySet);
		this.property = valueProperty;
	}

	protected Object doGet(Object key) {
		return property.getValue(key);
	}

	protected Object doPut(Object key, Object value) {
		Object result = property.getValue(key);
		property.setValue(key, value);
		return result;
	}

	protected void hookListener(Object addedKey) {
		if (!disposed)
			property.addValueChangeListener(addedKey, listener);
	}

	protected void unhookListener(Object removedKey) {
		if (!disposed)
			property.removeValueChangeListener(removedKey, listener);
	}

	public Object getObserved() {
		return keySet();
	}

	public synchronized void dispose() {
		super.dispose();

		if (!disposed) {
			disposed = true;
			property = null;
			listener = null;
		}
	}
}




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

package org.eclipse.core.internal.databinding.property;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.property.IProperty;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.IValuePropertyChangeListener;
import org.eclipse.core.databinding.property.ValuePropertyChangeEvent;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 1.2
 * 
 */
public class PropertyObservableValue extends AbstractObservableValue implements
		IPropertyObservable {
	private Object source;
	private IValueProperty property;

	private boolean updating = false;

	private boolean disposed = false;

	private IValuePropertyChangeListener listener = new IValuePropertyChangeListener() {
		public void handleValuePropertyChange(
				final ValuePropertyChangeEvent event) {
			if (!disposed && !updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						fireValueChange(event.diff);
					}
				});
			}
		}
	};

	/**
	 * @param realm
	 * @param source
	 * @param property
	 */
	public PropertyObservableValue(Realm realm, Object source,
			IValueProperty property) {
		super(realm);
		this.source = source;
		this.property = property;
	}

	protected void firstListenerAdded() {
		if (!disposed) {
			property.addValueChangeListener(source, listener);
		}
	}

	protected void lastListenerRemoved() {
		if (!disposed) {
			property.removeValueChangeListener(source, listener);
		}
	}

	protected Object doGetValue() {
		return property.getValue(source);
	}

	protected void doSetValue(Object value) {
		Object oldValue = doGetValue();

		updating = true;
		try {
			property.setValue(source, value);
		} finally {
			updating = false;
		}

		Object newValue = doGetValue();
		if (!Util.equals(oldValue, newValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}

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

	public Object getObserved() {
		return source;
	}

	public IProperty getProperty() {
		return property;
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeValueChangeListener(source, listener);
			property = null;
			source = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.internal.databinding.Util;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;

/**
 * Abstract IValueProperty implementation.
 * <p>
 * This class automatically fires value change events when changes are initiated
 * through a call to {@link #setValue(Object, Object)}.
 * 
 * @since 1.2
 */
public abstract class BasicValueProperty extends ValueProperty {
	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	/**
	 * Returns whether this property is currently being updated on the source.
	 * Implementors should query this value to avoid unnecessary calculations,
	 * such as computing a diff.
	 * 
	 * @param source
	 *            the property source
	 * @return whether this property is currently being updated on the source.
	 */
	protected boolean isUpdating(Object source) {
		return updateHelper.isUpdating(source);
	}

	/**
	 * Sets the value property on the source to the specified value, then fires
	 * a value change.
	 * 
	 * @param source
	 *            the property source
	 * @param value
	 *            the new value
	 */
	public void setValue(Object source, Object value) {
		Object oldValue = getValue(source);

		updateHelper.setUpdating(source, true);
		try {
			doSetValue(source, value);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			Object newValue = getValue(source);
			if (!Util.equals(oldValue, newValue)) {
				fireValueChange(source, Diffs.createValueDiff(oldValue,
						newValue));
			}
		}
	}

	protected void fireValueChange(Object source, ValueDiff diff) {
		if (!isUpdating(source))
			super.fireValueChange(source, diff);
	}

	/**
	 * Sets the value property on the source to the specified list.
	 * 
	 * @param source
	 *            the property source
	 * @param value
	 *            the new value
	 */
	protected abstract void doSetValue(Object source, Object value);

	public synchronized void dispose() {
		if (updateHelper != null) {
			updateHelper.dispose();
			updateHelper = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.property;

/**
 * Listener for changes to list properties on a property source
 * 
 * @since 1.2
 */
public interface IListPropertyChangeListener extends IPropertyChangeListener {
	/**
	 * Handle a change to a list property on a specific property source.
	 * 
	 * @param event
	 *            an event describing the list change that occured.
	 */
	public void handleListPropertyChange(ListPropertyChangeEvent event);
}




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

package org.eclipse.core.databinding.property;

/**
 * Abstract implementation of IProperty
 * 
 * @since 1.2
 */
public abstract class Property implements IProperty {
	private PropertyChangeSupport changeSupport;

	synchronized PropertyChangeSupport getChangeSupport() {
		if (changeSupport == null)
			changeSupport = new PropertyChangeSupport(this);
		return changeSupport;
	}

	/**
	 * Notifies the property that the first listener has been added for the
	 * given source object. Implementers should register a listener on the
	 * source object which fires an appropriate change event when a property
	 * change is observed on the source.
	 * 
	 * @param source
	 *            the source object to observe for property changes.
	 * @see #removeListenerFrom(Object)
	 */
	protected abstract void addListenerTo(Object source);

	/**
	 * Notifies the property that the last listener has been removed for the
	 * given source object. Implementers should unregister any previously
	 * registered listeners from the source.
	 * 
	 * @param source
	 *            the source object to stop observing for property changes.
	 * @see #addListenerTo(Object)
	 */
	protected abstract void removeListenerFrom(Object source);

	/**
	 * Returns whether this property has listeners registered for the given
	 * property source
	 * 
	 * @param source
	 *            the property source
	 * @return whether this property has listeners registered for the given
	 *         property source
	 */
	protected boolean hasListeners(Object source) {
		return changeSupport != null && changeSupport.hasListeners(source);
	}

	public synchronized void dispose() {
		if (changeSupport != null) {
			changeSupport.dispose();
			changeSupport = null;
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Listener;

/**
 * @since 3.2
 * 
 */
public class ListObservableValue extends AbstractSWTObservableValue {

	private final List list;

	private boolean updating = false;

	private String currentValue;

	private Listener listener;

	/**
	 * @param list
	 */
	public ListObservableValue(List list) {
		super(list);
		this.list = list;
		this.currentValue = (String) doGetValue();

		if ((list.getStyle() & SWT.MULTI) > 0)
			throw new IllegalArgumentException(
					"SWT.SINGLE support only for a List selection"); //$NON-NLS-1$

		listener = new Listener() {

			public void handleEvent(Event event) {
				if (!updating) {
					Object oldValue = currentValue;
					currentValue = (String) doGetValue();
					fireValueChange(Diffs.createValueDiff(oldValue,
							currentValue));
				}
			}

		};
		list.addListener(SWT.Selection, listener);
	}

	public void doSetValue(Object value) {
		String oldValue = null;
		if (list.getSelection() != null && list.getSelection().length > 0)
			oldValue = list.getSelection()[0];
		try {
			updating = true;
			String items[] = list.getItems();
			int index = -1;
			if (items != null && value != null) {
				for (int i = 0; i < items.length; i++) {
					if (value.equals(items[i])) {
						index = i;
						break;
					}
				}
				list.select(index); // -1 will not "unselect"
			}
			currentValue = (String) value;
		} finally {
			updating = false;
		}
		fireValueChange(Diffs.createValueDiff(oldValue, value));
	}

	public Object doGetValue() {
		int index = list.getSelectionIndex();
		if (index >= 0)
			return list.getItem(index);
		return null;
	}

	public Object getValueType() {
		return String.class;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		if (listener != null && !list.isDisposed()) {
			list.removeListener(SWT.Selection, listener);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;

/**
 * @since 1.0
 *
 */
public class CComboSingleSelectionObservableValue extends
		SingleSelectionObservableValue {

	private SelectionListener selectionListener;

	/**
	 * @param combo
	 */
	public CComboSingleSelectionObservableValue(CCombo combo) {
		super(combo);
	}
	
	/**
	 * @param realm
	 * @param combo
	 */
	public CComboSingleSelectionObservableValue(Realm realm, CCombo combo) {
		super(realm, combo);
	}

	private CCombo getCCombo() {
		return (CCombo) getWidget();
	}

	protected void doAddSelectionListener(final Runnable runnable) {
		selectionListener = new SelectionListener() {
			public void widgetDefaultSelected(SelectionEvent e) {
				runnable.run();
			}

			public void widgetSelected(SelectionEvent e) {
				runnable.run();
			}
		};
		getCCombo().addSelectionListener(selectionListener);
	}

	protected int doGetSelectionIndex() {
		return getCCombo().getSelectionIndex();
	}

	protected void doSetSelectionIndex(int index) {
		getCCombo().setText(getCCombo().getItem(index));
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		if (selectionListener != null && !getCCombo().isDisposed()) {
			getCCombo().removeSelectionListener(selectionListener);
		}

	}
}




/*******************************************************************************
 * Copyright (c) 2007 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 207844)
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bug 212235
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.widgets.Shell;

/**
 * An {@link IObservableValue} that tracks the text of a Shell.
 * 
 * @since 1.2
 */
public class ShellObservableValue extends AbstractSWTObservableValue {

	private final Shell shell;

	/**
	 * Constructs a ShellObservableValue which tracks the text of the given
	 * Shell.
	 * 
	 * @param shell
	 *            the shell to track
	 */
	public ShellObservableValue(Shell shell) {
		super(shell);
		this.shell = shell;
	}

	/**
	 * Constructs a ShellObservableValue belonging to the given realm, which
	 * tracks the text of the given shell.
	 * 
	 * @param realm
	 *            the realm of the constructed observable
	 * @param shell
	 *            the shell to track
	 */
	public ShellObservableValue(Realm realm, Shell shell) {
		super(realm, shell);
		this.shell = shell;
	}

	protected void doSetValue(final Object value) {
		String oldValue = shell.getText();
		String newValue = value == null ? "" : value.toString(); //$NON-NLS-1$
		shell.setText(newValue);

		if (!newValue.equals(oldValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}

	protected Object doGetValue() {
		return shell.getText();
	}

	public Object getValueType() {
		return String.class;
	}
}




/*******************************************************************************
 * 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
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.custom.CCombo;

/**
 * @since 3.2
 * 
 */
public class CComboObservableList extends SWTObservableList {

	private final CCombo ccombo;

	/**
	 * @param ccombo
	 */
	public CComboObservableList(CCombo ccombo) {
		super(SWTObservables.getRealm(ccombo.getDisplay()));
		this.ccombo = ccombo;
	}

	protected int getItemCount() {
		return ccombo.getItemCount();
	}

	protected void setItems(String[] newItems) {
		ccombo.setItems(newItems);
	}

	protected String[] getItems() {
		return ccombo.getItems();
	}

	protected String getItem(int index) {
		return ccombo.getItem(index);
	}

	protected void setItem(int index, String string) {
		ccombo.setItem(index, string);
	}
}




/*******************************************************************************
 * 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
 *     Peter Centgraf - bug 175763
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Scale;

/**
 * @since 1.0
 * 
 */
public class ScaleObservableValue extends AbstractSWTObservableValue {

	private final Scale scale;

	private final String attribute;

	private boolean updating = false;

	private int currentSelection;
	
	private SelectionListener listener;

	/**
	 * @param scale
	 * @param attribute
	 */
	public ScaleObservableValue(Scale scale, String attribute) {
		super(scale);
		this.scale = scale;
		this.attribute = attribute;
		init();
	}
	
	/**
	 * @param realm
	 * @param scale
	 * @param attribute
	 */
	public ScaleObservableValue(Realm realm, Scale scale, String attribute) {
		super(realm, scale);
		this.scale = scale;
		this.attribute = attribute;
		init();
	}
	
	private void init() {		
		if (attribute.equals(SWTProperties.SELECTION)) {
			currentSelection = scale.getSelection();
			scale.addSelectionListener(listener = new SelectionAdapter() {
				public void widgetSelected(SelectionEvent e) {
					if (!updating) {
						int newSelection = ScaleObservableValue.this.scale
						.getSelection();
						notifyIfChanged(currentSelection, newSelection);
						currentSelection = newSelection;
					}
				}
			});
		} else if (!attribute.equals(SWTProperties.MIN)
				&& !attribute.equals(SWTProperties.MAX)) {
			throw new IllegalArgumentException(
					"Attribute name not valid: " + attribute); //$NON-NLS-1$
		}
	}

	public void doSetValue(final Object value) {
		int oldValue;
		int newValue;
		try {
			updating = true;
			newValue = ((Integer) value).intValue();
			if (attribute.equals(SWTProperties.SELECTION)) {
				oldValue = scale.getSelection();
				scale.setSelection(newValue);
				currentSelection = newValue;
			} else if (attribute.equals(SWTProperties.MIN)) {
				oldValue = scale.getMinimum();
				scale.setMinimum(newValue);
			} else if (attribute.equals(SWTProperties.MAX)) {
				oldValue = scale.getMaximum();
				scale.setMaximum(newValue);
			} else {
				Assert.isTrue(false, "invalid attribute name:" + attribute); //$NON-NLS-1$
				return;
			}
			
			notifyIfChanged(oldValue, newValue);
		} finally {
			updating = false;
		}
	}

	public Object doGetValue() {
		int value = 0;
		if (attribute.equals(SWTProperties.SELECTION)) {
			value = scale.getSelection();
		} else if (attribute.equals(SWTProperties.MIN)) {
			value = scale.getMinimum();
		} else if (attribute.equals(SWTProperties.MAX)) {
			value = scale.getMaximum();
		}
		return new Integer(value);
	}

	public Object getValueType() {
		return Integer.TYPE;
	}

	/**
	 * @return attribute being observed
	 */
	public String getAttribute() {
		return attribute;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		
		if (listener != null && !scale.isDisposed()) {
			scale.removeSelectionListener(listener);
		}
		listener = null;
	}
	
	private void notifyIfChanged(int oldValue, int newValue) {
		if (oldValue != newValue) {
			fireValueChange(Diffs.createValueDiff(new Integer(oldValue),
					new Integer(newValue)));
		}
	}
}




package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IStaleListener;
import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.StaleEvent;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.IVetoableValue;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
import org.eclipse.core.databinding.observable.value.ValueChangingEvent;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.jface.util.Util;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;

 * 
 * @since 1.2
 */
public class DelayedObservableValue extends SWTObservableValueDecorator {
	class ValueUpdater implements Runnable {
		private final Object oldValue;


		}
	}

	private IStaleListener staleListener = new IStaleListener() {
		public void handleStale(StaleEvent staleEvent) {
			if (!updating)
				fireStale();
		}
	};

	private IValueChangeListener valueChangeListener = new IValueChangeListener() {
		public void handleValueChange(ValueChangeEvent event) {
			if (!updating)
				makeDirty();
		}
	};

	private Listener focusOutListener = new Listener() {
		public void handleEvent(Event event) {
			// Force update on focus out

	};

	private final int delay;
	private Widget widget;
	private Control control;

	private boolean dirty = true;
	private Object cachedValue = null;

	 */
	public DelayedObservableValue(int delayMillis,
			ISWTObservableValue observable) {
		super(observable, observable.getWidget());
		this.delay = delayMillis;
		this.observable = observable;

		widget = observable.getWidget();
		observable.addStaleListener(staleListener);
		Widget widget = observable.getWidget();
		if (widget instanceof Control) {
			widget.addListener(SWT.FocusOut, focusOutListener);
			control.addListener(SWT.FocusOut, focusOutListener);
		}

		cachedValue = observable.getValue();
	}

	protected void handleValueChange(ValueChangeEvent event) {
		if (!updating)
			makeDirty();
	}

	protected void handleStaleEvent(StaleEvent event) {
		if (!updating)
			super.handleStaleEvent(event);
	}

	public Object getValue() {
		getterCalled();

		if (!hasListeners())
			return super.getValue();

		if (dirty) {
			cachedValue = super.getValue();
			dirty = false;

			if (updater != null && !updater.running) {

		return cachedValue;
	}

	public void setValue(Object value) {
		checkRealm();

		updating = true;
		try {
			// Principle of least surprise: setValue overrides any pending

			cancelScheduledUpdate();

			Object oldValue = cachedValue;
			super.setValue(value);
			// Bug 215297 - target observable could veto or override value
			// passed to setValue(). Make sure we cache whatever is set.
			Object newValue = cachedValue = super.getValue();

			if (hasListeners() && !Util.equals(oldValue, newValue))
				fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		} finally {
			updating = false;
		}
	}

	protected boolean hasListeners() {
		return super.hasListeners();
		return (dirty && updater != null) || observable.isStale();
	}

	public boolean isStale() {
		getterCalled();
		return (dirty && updater != null) || super.isStale();
	 * 
	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
	 */
	public Object getValueType() {
		return observable.getValueType();
	}

	public void dispose() {
		cancelScheduledUpdate();
		if (widget instanceof Control) {
			widget.removeListener(SWT.FocusOut, focusOutListener);
			widget = null;
			observable.removeStaleListener(staleListener);
			observable = null;
		}
		if (control != null) {
			control.removeListener(SWT.FocusOut, focusOutListener);
			control = null;
		}
		super.dispose();
	}


	private void scheduleUpdate() {
		updater = new ValueUpdater(cachedValue);
		widget.getDisplay().timerExec(delay, updater);
	}

	private void internalFireValueChange(final Object oldValue) {




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *     Matthew Hall - bug 118516
 *     Eric Rizzo - bug 134884
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;

/**
 * @since 3.2
 * 
 */
public class CComboObservableValue extends AbstractSWTObservableValue {

	/**
	 * 
	 */

	private final CCombo ccombo;

	private final String attribute;

	private boolean updating = false;

	private String currentValue;

	private ModifyListener modifyListener;

	/**
	 * @param ccombo
	 * @param attribute
	 */
	public CComboObservableValue(CCombo ccombo, String attribute) {
		super(ccombo);
		this.ccombo = ccombo;
		this.attribute = attribute;
		init();
	}

	/**
	 * @param realm
	 * @param ccombo
	 * @param attribute
	 */
	public CComboObservableValue(Realm realm, CCombo ccombo, String attribute) {
		super(realm, ccombo);
		this.ccombo = ccombo;
		this.attribute = attribute;
		init();
	}
	
	private void init() {		
		if (attribute.equals(SWTProperties.SELECTION)
				|| attribute.equals(SWTProperties.TEXT)) {
			this.currentValue = ccombo.getText();
			modifyListener = new ModifyListener() {

				public void modifyText(ModifyEvent e) {
					if (!updating) {
						String oldValue = currentValue;
						currentValue = CComboObservableValue.this.ccombo
								.getText();
						
						notifyIfChanged(oldValue, currentValue);
					}
				}
			};
			ccombo.addModifyListener(modifyListener);
		} else
			throw new IllegalArgumentException();
	}

	public void doSetValue(final Object value) {
		String oldValue = ccombo.getText();
		try {
			updating = true;
			if (attribute.equals(SWTProperties.TEXT)) {
				String stringValue = value != null ? value.toString() : ""; //$NON-NLS-1$
				ccombo.setText(stringValue);
			} else if (attribute.equals(SWTProperties.SELECTION)) {
				String items[] = ccombo.getItems();
				int index = -1;
				if (value == null) {
					ccombo.select(-1);
				} else if (items != null) {
					for (int i = 0; i < items.length; i++) {
						if (value.equals(items[i])) {
							index = i;
							break;
						}
					}
					if (index == -1) {
						ccombo.setText((String) value);
					} else {
						ccombo.select(index); // -1 will not "unselect"
					}
				}
			}
		} finally {
			updating = false;
			currentValue = ccombo.getText();
		}
		
		notifyIfChanged(oldValue, currentValue);
	}

	public Object doGetValue() {
		if (attribute.equals(SWTProperties.TEXT))
			return ccombo.getText();

		Assert.isTrue(attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		// The problem with a ccombo, is that it changes the text and
		// fires before it update its selection index
		return ccombo.getText();
	}

	public Object getValueType() {
		Assert.isTrue(attribute.equals(SWTProperties.TEXT)
				|| attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		return String.class;
	}

	/**
	 * @return attribute being observed
	 */
	public String getAttribute() {
		return attribute;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (modifyListener != null && !ccombo.isDisposed()) {
			ccombo.removeModifyListener(modifyListener);
		}
	}
	
	private void notifyIfChanged(String oldValue, String newValue) {
		if (!oldValue.equals(newValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, ccombo.getText()));			
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Table;

/**
 * @since 1.0
 * 
 */
public class TableSingleSelectionObservableValue extends
		SingleSelectionObservableValue {

	private SelectionListener selectionListener;

	/**
	 * @param table
	 */
	public TableSingleSelectionObservableValue(Table table) {
		super(table);
	}
	
	/**
	 * @param realm
	 * @param table
	 */
	public TableSingleSelectionObservableValue(Realm realm, Table table) {
		super(realm, table);
	}

	private Table getTable() {
		return (Table) getWidget();
	}

	protected void doAddSelectionListener(final Runnable runnable) {
		selectionListener = new SelectionListener() {
			public void widgetDefaultSelected(SelectionEvent e) {
				runnable.run();
			}

			public void widgetSelected(SelectionEvent e) {
				runnable.run();
			}
		};
		getTable().addSelectionListener(selectionListener);
	}

	protected int doGetSelectionIndex() {
		return getTable().getSelectionIndex();
	}

	protected void doSetSelectionIndex(int index) {
		getTable().setSelection(index);
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		if (selectionListener != null && !getTable().isDisposed()) {
			getTable().removeSelectionListener(selectionListener);
		}
	}
}




/*******************************************************************************
 * 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 208858
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

import org.eclipse.core.databinding.BindingException;
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;

/**
 * Abstract base class of CComboObservableList, ComboObservableList, and
 * ListObservableList.
 * 
 * @since 3.2
 * 
 */
public abstract class SWTObservableList extends AbstractObservableList {

	/**
	 * 
	 */
	public SWTObservableList() {
		super();
	}

	/**
	 * @param realm
	 */
	public SWTObservableList(Realm realm) {
		super(realm);
	}

	public void add(int index, Object element) {
		int size = doGetSize();
		if (index < 0 || index > size)
			index = size;
		String[] newItems = new String[size + 1];
		System.arraycopy(getItems(), 0, newItems, 0, index);
		newItems[index] = (String) element;
		System.arraycopy(getItems(), index, newItems, index + 1, size - index);
		setItems(newItems);
		fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(index,
				true, element)));
	}

	public int doGetSize() {
		return getItemCount();
	}

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

	public Object getElementType() {
		return String.class;
	}

	/**
	 * @param index
	 * @return the item at the given index
	 */
	protected abstract String getItem(int index);

	/**
	 * @return the item count
	 */
	protected abstract int getItemCount();

	/**
	 * @return the items
	 */
	protected abstract String[] getItems();

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

	public Object remove(int index) {
		getterCalled();
		int size = doGetSize();
		if (index < 0 || index > size - 1)
			throw new BindingException(
					"Request to remove an element out of the collection bounds"); //$NON-NLS-1$

		String[] newItems = new String[size - 1];
		String oldElement = getItem(index);
		if (newItems.length > 0) {
			System.arraycopy(getItems(), 0, newItems, 0, index);
			if (size - 1 > index) {
				System.arraycopy(getItems(), index + 1, newItems, index, size
						- index - 1);
			}
		}
		setItems(newItems);
		fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(index,
				false, oldElement)));
		return oldElement;
	}

	public Object set(int index, Object element) {
		String oldElement = getItem(index);
		setItem(index, (String) element);
		fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(index,
				false, oldElement), Diffs.createListDiffEntry(index, true,
				element)));
		return oldElement;
	}

	public Object move(int oldIndex, int newIndex) {
		checkRealm();
		if (oldIndex == newIndex)
			return get(oldIndex);
		int size = doGetSize();
		if (oldIndex < 0 || oldIndex >= size)
			throw new IndexOutOfBoundsException(
					"oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
		if (newIndex < 0 || newIndex >= size)
			throw new IndexOutOfBoundsException(
					"newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$

		String[] items = getItems();
		String[] newItems = new String[size];
		String element = items[oldIndex];
		if (newItems.length > 0) {
			System.arraycopy(items, 0, newItems, 0, size);
			if (oldIndex < newIndex) {
				System.arraycopy(items, oldIndex + 1, newItems, oldIndex,
						newIndex - oldIndex);
			} else {
				System.arraycopy(items, newIndex, newItems, newIndex + 1,
						oldIndex - newIndex);
			}
			newItems[newIndex] = element;
		}
		setItems(newItems);
		fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(oldIndex,
				false, element), Diffs.createListDiffEntry(newIndex, true,
				element)));
		return element;
	}

	public boolean removeAll(Collection c) {
		checkRealm();
		List oldItems = Arrays.asList(getItems());
		List newItems = new ArrayList(oldItems);
		boolean removedAll = newItems.removeAll(c);
		if (removedAll) {
			setItems((String[]) newItems.toArray(new String[newItems.size()]));
			fireListChange(Diffs.computeListDiff(oldItems, newItems));
		}
		return removedAll;
	}

	public boolean retainAll(Collection c) {
		checkRealm();
		List oldItems = Arrays.asList(getItems());
		List newItems = new ArrayList(oldItems);
		boolean retainedAll = newItems.retainAll(c);
		if (retainedAll) {
			setItems((String[]) newItems.toArray(new String[newItems.size()]));
			fireListChange(Diffs.computeListDiff(oldItems, newItems));
		}
		return retainedAll;
	}

	/**
	 * @param index
	 * @param string
	 */
	protected abstract void setItem(int index, String string);

	/**
	 * @param newItems
	 */
	protected abstract void setItems(String[] newItems);

}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.widgets.Text;

/**
 * Observable value for the editable property of a Text.
 * 
 * @since 1.1
 */
public class TextEditableObservableValue extends AbstractSWTObservableValue {
	private Text text;
	
	/**
	 * @param text
	 */
	public TextEditableObservableValue(Text text) {
		super(text);	
		this.text = text;
	}
	
	/**
	 * @param realm
	 * @param text
	 */
	public TextEditableObservableValue(Realm realm, Text text) {
		super(realm, text);
		this.text = text;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
	 */
	protected Object doGetValue() {
		return (text.getEditable()) ? Boolean.TRUE : Boolean.FALSE;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
	 */
	public Object getValueType() {
		return Boolean.TYPE;
	}
	
	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
	 */
	protected void doSetValue(Object value) {
		if (value == null) {
			throw new IllegalArgumentException("Parameter value was null."); //$NON-NLS-1$
		}
		
		Boolean oldValue = new Boolean(text.getEditable());
		Boolean newValue = (Boolean) value;
		
		text.setEditable(newValue.booleanValue());
		
		if (!oldValue.equals(newValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}
}




/*******************************************************************************
 * 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
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.2
 * 
 */
public class ComboObservableList extends SWTObservableList {

	private final Combo combo;

	/**
	 * @param combo
	 */
	public ComboObservableList(Combo combo) {
		super(SWTObservables.getRealm(combo.getDisplay()));
		this.combo = combo;
	}

	protected int getItemCount() {
		return combo.getItemCount();
	}

	protected void setItems(String[] newItems) {
		combo.setItems(newItems);
	}

	protected String[] getItems() {
		return combo.getItems();
	}

	protected String getItem(int index) {
		return combo.getItem(index);
	}

	protected void setItem(int index, String string) {
		combo.setItem(index, string);
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds (bug 135446)
 *     Brad Reynolds - bug 164653
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTVetoableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Text;

/**
 * {@link IObservable} implementation that wraps a {@link Text} widget. The time
 * at which listeners should be notified about changes to the text is specified
 * on construction.
 * 
 * <dl>
 * <dt>Events:</dt>
 * <dd> If the update event type (specified on construction) is
 * <code>SWT.Modify</code> a value change event will be fired on every key
 * stroke. If the update event type is <code>SWT.FocusOut</code> a value
 * change event will be fired on focus out. When in either mode if the user is
 * entering text and presses [Escape] the value will be reverted back to the
 * last value set using doSetValue(). Regardless of the update event type a
 * value changing event will fire on verify to enable vetoing of changes.</dd>
 * </dl>
 * 
 * @since 1.0
 */
public class TextObservableValue extends AbstractSWTVetoableValue {

	/**
	 * {@link Text} widget that this is being observed.
	 */
	private final Text text;

	/**
	 * Flag to track when the model is updating the widget. When
	 * <code>true</code> the handlers for the SWT events should not process
	 * the event as this would cause an infinite loop.
	 */
	private boolean updating = false;

	/**
	 * SWT event that on firing this observable will fire change events to its
	 * listeners.
	 */
	private final int updateEventType;

	/**
	 * Valid types for the {@link #updateEventType}.
	 */
	private static final int[] validUpdateEventTypes = new int[] { SWT.Modify,
			SWT.FocusOut, SWT.None };

	/**
	 * Previous value of the Text.
	 */
	private String oldValue;

	private Listener updateListener = new Listener() {
		public void handleEvent(Event event) {
			if (!updating) {
				String newValue = text.getText();

				if (!newValue.equals(oldValue)) {
					fireValueChange(Diffs.createValueDiff(oldValue, newValue));					
					oldValue = newValue;
				}
			}
		}
	};

	private VerifyListener verifyListener;

	/**
	 * Constructs a new instance bound to the given <code>text</code> widget
	 * and configured to fire change events to its listeners at the time of the
	 * <code>updateEventType</code>.
	 * 
	 * @param text
	 * @param updateEventType
	 *            SWT event constant as to what SWT event to update the model in
	 *            response to. Appropriate values are: <code>SWT.Modify</code>,
	 *            <code>SWT.FocusOut</code>, <code>SWT.None</code>.
	 * @throws IllegalArgumentException
	 *             if <code>updateEventType</code> is an incorrect type.
	 */
	public TextObservableValue(final Text text, int updateEventType) {
		this(SWTObservables.getRealm(text.getDisplay()), text, updateEventType);
	}
	
	/**
	 * Constructs a new instance.
	 * 
	 * @param realm can not be <code>null</code>
	 * @param text
	 * @param updateEventType
	 */
	public TextObservableValue(final Realm realm, Text text, int updateEventType) {
		super(realm, text);
		
		boolean eventValid = false;
		for (int i = 0; !eventValid && i < validUpdateEventTypes.length; i++) {
			eventValid = (updateEventType == validUpdateEventTypes[i]);
		}
		if (!eventValid) {
			throw new IllegalArgumentException(
					"UpdateEventType [" + updateEventType + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}
		this.text = text;
		this.updateEventType = updateEventType;
		if (updateEventType != SWT.None) {
			text.addListener(updateEventType, updateListener);
		}
		
		oldValue = text.getText();
		
		verifyListener = new VerifyListener() {
			public void verifyText(VerifyEvent e) {
				if (!updating) {
					String currentText = TextObservableValue.this.text
							.getText();
					String newText = currentText.substring(0, e.start) + e.text
							+ currentText.substring(e.end);
					if (!fireValueChanging(Diffs.createValueDiff(currentText,
							newText))) {
						e.doit = false;
					}
				}
			}
		};
		text.addVerifyListener(verifyListener);
	}

	/**
	 * Sets the bound {@link Text Text's} text to the passed <code>value</code>.
	 * 
	 * @param value
	 *            new value, String expected
	 * @see org.eclipse.core.databinding.observable.value.AbstractVetoableValue#doSetApprovedValue(java.lang.Object)
	 * @throws ClassCastException
	 *             if the value is anything other than a String
	 */
	protected void doSetApprovedValue(final Object value) {
		try {
			updating = true;
			text.setText(value == null ? "" : value.toString()); //$NON-NLS-1$
			oldValue = text.getText();
		} finally {
			updating = false;
		}
	}

	/**
	 * Returns the current value of the {@link Text}.
	 * 
	 * @see org.eclipse.core.databinding.observable.value.AbstractVetoableValue#doGetValue()
	 */
	public Object doGetValue() {
		return oldValue = text.getText();
	}

	/**
	 * Returns the type of the value from {@link #doGetValue()}, i.e.
	 * String.class
	 * 
	 * @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
	 */
	public Object getValueType() {
		return String.class;
	}

	public void dispose() {
		if (!text.isDisposed()) {
			if (updateEventType != SWT.None) {
				text.removeListener(updateEventType, updateListener);
			}
			text.removeVerifyListener(verifyListener);
		}
		super.dispose();
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *     Matthew Hall - bug 118516
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.widgets.Spinner;

/**
 * @since 1.0
 * 
 */
public class SpinnerObservableValue extends AbstractSWTObservableValue {

	private final Spinner spinner;

	private final String attribute;

	private boolean updating = false;

	private int currentSelection;

	private ModifyListener modifyListener;

	/**
	 * @param spinner
	 * @param attribute
	 */
	public SpinnerObservableValue(Spinner spinner, String attribute) {
		super(spinner);
		this.spinner = spinner;
		this.attribute = attribute;
		init();
	}
	
	/**
	 * @param realm
	 * @param spinner
	 * @param attribute
	 */
	public SpinnerObservableValue(Realm realm, Spinner spinner, String attribute) {
		super(realm, spinner);
		this.spinner = spinner;
		this.attribute = attribute;
		init();
	}
	
	private void init() {		
		if (attribute.equals(SWTProperties.SELECTION)) {
			currentSelection = spinner.getSelection();
			modifyListener = new ModifyListener() {
				public void modifyText(ModifyEvent e) {
					if (!updating) {
						int newSelection = SpinnerObservableValue.this.spinner
						.getSelection();
						notifyIfChanged(currentSelection, newSelection);
						currentSelection = newSelection;
					}
				}
			};
			spinner.addModifyListener(modifyListener);
		} else if (!attribute.equals(SWTProperties.MIN)
				&& !attribute.equals(SWTProperties.MAX)) {
			throw new IllegalArgumentException(
					"Attribute name not valid: " + attribute); //$NON-NLS-1$
		}
	}

	public void doSetValue(final Object value) {
		int oldValue;
		int newValue;
		try {
			updating = true;
			newValue = ((Integer) value).intValue();
			if (attribute.equals(SWTProperties.SELECTION)) {
				oldValue = spinner.getSelection();
				spinner.setSelection(newValue);
				currentSelection = newValue;
			} else if (attribute.equals(SWTProperties.MIN)) {
				oldValue = spinner.getMinimum();
				spinner.setMinimum(newValue);
			} else if (attribute.equals(SWTProperties.MAX)) {
				oldValue = spinner.getMaximum();
				spinner.setMaximum(newValue);
			} else {
				Assert.isTrue(false, "invalid attribute name:" + attribute); //$NON-NLS-1$
				return;
			}
			notifyIfChanged(oldValue, newValue);
		} finally {
			updating = false;
		}
	}

	public Object doGetValue() {
		int value = 0;
		if (attribute.equals(SWTProperties.SELECTION)) {
			value = spinner.getSelection();
		} else if (attribute.equals(SWTProperties.MIN)) {
			value = spinner.getMinimum();
		} else if (attribute.equals(SWTProperties.MAX)) {
			value = spinner.getMaximum();
		}
		return new Integer(value);
	}

	public Object getValueType() {
		return Integer.TYPE;
	}

	/**
	 * @return attribute being observed
	 */
	public String getAttribute() {
		return attribute;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		if (modifyListener != null && !spinner.isDisposed()) {
			spinner.removeModifyListener(modifyListener);
		}
	}
	
	private void notifyIfChanged(int oldValue, int newValue) {
		if (oldValue != newValue) {
			fireValueChange(Diffs.createValueDiff(new Integer(oldValue),
					new Integer(newValue)));
		}
	}
}




/*******************************************************************************
 * 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
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.List;

/**
 * @since 3.2
 * 
 */
public class ListObservableList extends SWTObservableList {

	private final List list;

	/**
	 * @param list
	 */
	public ListObservableList(List list) {
		super(SWTObservables.getRealm(list.getDisplay()));
		this.list = list;
	}

	protected int getItemCount() {
		return list.getItemCount();
	}

	protected void setItems(String[] newItems) {
		list.setItems(newItems);
	}

	protected String[] getItems() {
		return list.getItems();
	}

	protected String getItem(int index) {
		return list.getItem(index);
	}

	protected void setItem(int index, String string) {
		list.setItem(index, string);
	}
}




/*******************************************************************************
 * 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
 *     Matt Carter - bug 170668
 *     Brad Reynolds - bug 170848
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

/**
 * Constants used to describe properties of SWT controls.
 * 
 * @since 1.0
 *
 */
public interface SWTProperties {

	/**
	 * Applies to Control
	 */
	public static final String ENABLED = "enabled"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String VISIBLE = "visible"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String TOOLTIP_TEXT = "tooltip"; //$NON-NLS-1$	
	/**
	 * Applies to
	 */
	public static final String ITEMS = "items"; //$NON-NLS-1$
	/**
	 * Applies to Spinner
	 */
	public static final String MAX = "max"; //$NON-NLS-1$
	/**
	 * Applies to Spinner
	 */
	public static final String MIN = "min"; //$NON-NLS-1$
	/**
	 * Applies to Spinner, Button
	 */
	public static final String SELECTION = "selection"; //$NON-NLS-1$
	/**
	 * Applies to Spinner, Button
	 */
	public static final String SELECTION_INDEX = "index"; //$NON-NLS-1$
	/**
	 * Applies to Text, Label, Combo
	 */
	public static final String TEXT = "text"; //$NON-NLS-1$
	
	/**
	 * Applies to Label, CLabel.
	 */
	public static final String IMAGE = "image"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String FOREGROUND = "foreground"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String BACKGROUND = "background"; //$NON-NLS-1$
	/**
	 * Applies to Control
	 */
	public static final String FONT = "font"; //$NON-NLS-1$

}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Matt Carter - bug 170668
 *     Brad Reynolds - bug 170848
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;

/**
 * @since 1.0
 * 
 */
public class ControlObservableValue extends AbstractSWTObservableValue {

	private final Control control;

	private final String attribute;

	private Object valueType;
	
	private static final Map SUPPORTED_ATTRIBUTES = new HashMap();
	static {
		SUPPORTED_ATTRIBUTES.put(SWTProperties.ENABLED, Boolean.TYPE);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.VISIBLE, Boolean.TYPE);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.TOOLTIP_TEXT, String.class);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.FOREGROUND, Color.class);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.BACKGROUND, Color.class);
		SUPPORTED_ATTRIBUTES.put(SWTProperties.FONT, Font.class);
	}
	
	/**
	 * @param control
	 * @param attribute
	 */
	public ControlObservableValue(Control control, String attribute) {
		super(control);
		this.control = control;
		this.attribute = attribute;
		if (SUPPORTED_ATTRIBUTES.keySet().contains(attribute)) {
			this.valueType = SUPPORTED_ATTRIBUTES.get(attribute); 
		} else {
			throw new IllegalArgumentException();
		}
	}

	public void doSetValue(Object value) {
		Object oldValue = doGetValue();
		if (attribute.equals(SWTProperties.ENABLED)) {
			control.setEnabled(((Boolean) value).booleanValue());
		} else if (attribute.equals(SWTProperties.VISIBLE)) {
			control.setVisible(((Boolean) value).booleanValue());
		} else if (attribute.equals(SWTProperties.TOOLTIP_TEXT)) {
			control.setToolTipText((String) value);
		} else if (attribute.equals(SWTProperties.FOREGROUND)) {
			control.setForeground((Color) value);
		} else if (attribute.equals(SWTProperties.BACKGROUND)) {
			control.setBackground((Color) value);
		} else if (attribute.equals(SWTProperties.FONT)) {
			control.setFont((Font) value);
		}
		fireValueChange(Diffs.createValueDiff(oldValue, value));
	}

	public Object doGetValue() {
		if (attribute.equals(SWTProperties.ENABLED)) {
			return control.getEnabled() ? Boolean.TRUE : Boolean.FALSE;
		}
		if (attribute.equals(SWTProperties.VISIBLE)) {
			return control.getVisible() ? Boolean.TRUE : Boolean.FALSE;
		}
		if (attribute.equals(SWTProperties.TOOLTIP_TEXT)) {
			return control.getToolTipText();			
		}
		if (attribute.equals(SWTProperties.FOREGROUND))	 {
			return control.getForeground();
		}
		if (attribute.equals(SWTProperties.BACKGROUND)) {
			return control.getBackground();
		}
		if (attribute.equals(SWTProperties.FONT)) {
			return control.getFont();
		}
		
		return null;
	}

	public Object getValueType() {
		return valueType;
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.custom.CLabel;

/**
 * @since 1.0
 * 
 */
public class CLabelObservableValue extends AbstractSWTObservableValue {

	private final CLabel label;

	/**
	 * @param label
	 */
	public CLabelObservableValue(CLabel label) {
		super(label);
		this.label = label;
	}
	
	/**
	 * @param realm
	 * @param label
	 */
	public CLabelObservableValue(Realm realm, CLabel label) {
		super(realm, label);
		this.label = label;
	}

	public void doSetValue(final Object value) {
		String oldValue = label.getText();
		String newValue = value == null ? "" : value.toString();  //$NON-NLS-1$
		label.setText(newValue);

		if (!newValue.equals(oldValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}

	public Object doGetValue() {
		return label.getText();
	}

	public Object getValueType() {
		return String.class;
	}

}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.widgets.Control;

/**
 * @since 1.0
 * 
 */
abstract public class SingleSelectionObservableValue extends
		AbstractSWTObservableValue {

	private boolean updating = false;

	private int currentSelection;

	/**
	 * @param control
	 *            the control
	 */
	public SingleSelectionObservableValue(Control control) {
		super(control);
		init();
	}
	
	/**
	 * @param realm
	 * @param control
	 */
	public SingleSelectionObservableValue(Realm realm, Control control) {
		super(realm, control);
		init();
	}
	
	private void init() {		
		currentSelection = doGetSelectionIndex();
		doAddSelectionListener(new Runnable(){
			public void run() {
				if (!updating) {
					int newSelection = doGetSelectionIndex();
					notifyIfChanged(currentSelection, newSelection);
					currentSelection = newSelection;
				}
			}
		});
	}

	/**
	 * @param runnable
	 */
	protected abstract void doAddSelectionListener(Runnable runnable);

	public void doSetValue(Object value) {
		try {
			updating = true;
			int intValue = ((Integer) value).intValue();
			doSetSelectionIndex(intValue);
			notifyIfChanged(currentSelection, intValue);
			currentSelection = intValue;
		} finally {
			updating = false;
		}
	}

	/**
	 * @param intValue
	 *            the selection index
	 */
	protected abstract void doSetSelectionIndex(int intValue);

	public Object doGetValue() {
		return new Integer(doGetSelectionIndex());
	}

	/**
	 * @return the selection index
	 */
	protected abstract int doGetSelectionIndex();

	public Object getValueType() {
		return Integer.TYPE;
	}

	private void notifyIfChanged(int oldValue, int newValue) {
		if (oldValue != newValue) {
			fireValueChange(Diffs.createValueDiff(new Integer(
					oldValue), new Integer(newValue)));
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;

/**
 * @since 1.0
 * 
 */
public class ButtonObservableValue extends AbstractSWTObservableValue {

	private final Button button;

	private boolean selectionValue;

	private Listener updateListener = new Listener() {
		public void handleEvent(Event event) {
			boolean oldSelectionValue = selectionValue;
			selectionValue = button.getSelection();
						
			notifyIfChanged(oldSelectionValue, selectionValue);
		}
	};

	/**
	 * @param button
	 */
	public ButtonObservableValue(Button button) {
		super(button);
		this.button = button;
		init();
	}
	
	/**
	 * @param realm
	 * @param button
	 */
	public ButtonObservableValue(Realm realm, Button button) {
		super(realm, button);
		this.button = button;
		init();
	}
	
	private void init() {
		button.addListener(SWT.Selection, updateListener);
		button.addListener(SWT.DefaultSelection, updateListener);
		this.selectionValue = button.getSelection();
	}

	public void doSetValue(final Object value) {
		boolean oldSelectionValue = selectionValue;
		selectionValue = value == null ? false : ((Boolean) value)
				.booleanValue();
		
		button.setSelection(selectionValue);
		notifyIfChanged(oldSelectionValue, selectionValue);
	}

	public Object doGetValue() {
		return button.getSelection() ? Boolean.TRUE : Boolean.FALSE;
	}

	public Object getValueType() {
		return Boolean.TYPE;
	}
	
	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (!button.isDisposed()) {
			button.removeListener(SWT.Selection, updateListener);
			button.removeListener(SWT.DefaultSelection, updateListener);
		}
	}

	/**
	 * Notifies consumers with a value change event only if a change occurred.
	 * 
	 * @param oldValue
	 * @param newValue
	 */
	private void notifyIfChanged(boolean oldValue, boolean newValue) {
		if (oldValue != newValue) {
			fireValueChange(Diffs.createValueDiff(oldValue ? Boolean.TRUE : Boolean.FALSE,
					newValue ? Boolean.TRUE : Boolean.FALSE));
		}		
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *     Matthew Hall - bug 118516
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.2
 * 
 */
public class ComboObservableValue extends AbstractSWTObservableValue {

	private final Combo combo;
	private final String attribute;
	private boolean updating = false;
	private String currentValue;
	private ModifyListener modifyListener;

	/**
	 * @param combo
	 * @param attribute
	 */
	public ComboObservableValue(Combo combo, String attribute) {
		super(combo);
		this.combo = combo;
		this.attribute = attribute;
		init();
	}
		
	/**
	 * @param realm
	 * @param combo
	 * @param attribute
	 */
	public ComboObservableValue(Realm realm, Combo combo, String attribute) {
		super(realm, combo);
		this.combo = combo;
		this.attribute = attribute;
		init();
	}
	
	private void init() {		
		if (attribute.equals(SWTProperties.SELECTION)
				|| attribute.equals(SWTProperties.TEXT)) {
			this.currentValue = combo.getText();
			modifyListener = new ModifyListener() {

				public void modifyText(ModifyEvent e) {
					if (!updating) {
						String oldValue = currentValue;
						currentValue = ComboObservableValue.this.combo
								.getText();
						
						notifyIfChanged(oldValue, currentValue);
					}
				}
			};
			combo.addModifyListener(modifyListener);
		} else
			throw new IllegalArgumentException();
	}

	public void doSetValue(final Object value) {
		String oldValue = combo.getText();
		try {
			updating = true;
			if (attribute.equals(SWTProperties.TEXT)) {
				String stringValue = value != null ? value.toString() : ""; //$NON-NLS-1$
				combo.setText(stringValue);
			} else if (attribute.equals(SWTProperties.SELECTION)) {
				String items[] = combo.getItems();
				int index = -1;
				if (items != null && value != null) {
					for (int i = 0; i < items.length; i++) {
						if (value.equals(items[i])) {
							index = i;
							break;
						}
					}
					if (index == -1) {
						combo.setText((String) value);
					} else {
						combo.select(index); // -1 will not "unselect"
					}
				}
			}
		} finally {
			updating = false;
			currentValue = combo.getText();
		}
		
		notifyIfChanged(oldValue, currentValue);
	}

	public Object doGetValue() {
		if (attribute.equals(SWTProperties.TEXT))
			return combo.getText();

		Assert.isTrue(attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		// The problem with a ccombo, is that it changes the text and
		// fires before it update its selection index
		return combo.getText();
	}

	public Object getValueType() {
		Assert.isTrue(attribute.equals(SWTProperties.TEXT)
				|| attribute.equals(SWTProperties.SELECTION),
				"unexpected attribute: " + attribute); //$NON-NLS-1$
		return String.class;
	}

	/**
	 * @return attribute being observed
	 */
	public String getAttribute() {
		return attribute;
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();

		if (modifyListener != null && !combo.isDisposed()) {
			combo.removeModifyListener(modifyListener);
		}
	}
	
	private void notifyIfChanged(String oldValue, String newValue) {
		if (!oldValue.equals(newValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.widgets.Label;

/**
 * @since 3.3
 * 
 */
public class LabelObservableValue extends AbstractSWTObservableValue {

	private final Label label;

	/**
	 * @param label
	 */
	public LabelObservableValue(Label label) {
		super(label);
		this.label = label;
	}
	
	/**
	 * @param realm
	 * @param label
	 */
	public LabelObservableValue(Realm realm, Label label) {
		super(realm, label);
		this.label = label;
	}

	public void doSetValue(final Object value) {
		String oldValue = label.getText();
		String newValue = value == null ? "" : value.toString(); //$NON-NLS-1$
		label.setText(newValue);
		
		if (!newValue.equals(oldValue)) {
			fireValueChange(Diffs.createValueDiff(oldValue, newValue));
		}
	}

	public Object doGetValue() {
		return label.getText();
	}

	public Object getValueType() {
		return String.class;
	}

}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bugs 198903, 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.Combo;

/**
 * @since 1.0
 *
 */
public class ComboSingleSelectionObservableValue extends
		SingleSelectionObservableValue {

	private SelectionListener selectionListener;

	/**
	 * @param combo
	 */
	public ComboSingleSelectionObservableValue(Combo combo) {
		super(combo);
	}

	private Combo getCombo() {
		return (Combo) getWidget();
	}

	protected void doAddSelectionListener(final Runnable runnable) {
		selectionListener = new SelectionListener() {
			public void widgetDefaultSelected(SelectionEvent e) {
				runnable.run();
			}

			public void widgetSelected(SelectionEvent e) {
				runnable.run();
			}
		};
		getCombo().addSelectionListener(selectionListener);
	}

	protected int doGetSelectionIndex() {
		return getCombo().getSelectionIndex();
	}

	protected void doSetSelectionIndex(int index) {
		getCombo().select(index);
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		if (selectionListener != null && !getCombo().isDisposed()) {
			getCombo().removeSelectionListener(selectionListener);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Ashley Cambrell - bug 198904
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.widgets.List;

/**
 * @since 1.0
 * 
 */
public class ListSingleSelectionObservableValue extends
		SingleSelectionObservableValue {

	private SelectionListener selectionListener;

	/**
	 * @param combo
	 */
	public ListSingleSelectionObservableValue(List combo) {
		super(combo);
	}

	private List getList() {
		return (List) getWidget();
	}

	protected void doAddSelectionListener(final Runnable runnable) {
		selectionListener = new SelectionListener() {
			public void widgetDefaultSelected(SelectionEvent e) {
				runnable.run();
			}

			public void widgetSelected(SelectionEvent e) {
				runnable.run();
			}
		};
		getList().addSelectionListener(selectionListener);
	}

	protected int doGetSelectionIndex() {
		return getList().getSelectionIndex();
	}

	protected void doSetSelectionIndex(int index) {
		getList().setSelection(index);
	}

	/*
	 * (non-Javadoc)
	 *
	 * @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
	 */
	public synchronized void dispose() {
		super.dispose();
		if (selectionListener != null && !getList().isDisposed()) {
			getList().removeSelectionListener(selectionListener);
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2008 Michael Krauter, Catuno GmbH 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:
 *     Michael Krauter, Catuno GmbH - initial API and implementation (bug 180223)
 *******************************************************************************/
package org.eclipse.jface.internal.databinding.internal.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
import org.eclipse.swt.widgets.Link;

/**
 * @since 1.2
 * 
 */
public class LinkObservableValue extends AbstractSWTObservableValue {

	private final Link link;

	/**
	 * @param link
	 */
	public LinkObservableValue(Link link) {
		super(link);
		this.link = link;
	}

	public void doSetValue(final Object value) {
		String oldValue = link.getText();
		link.setText(value == null ? "" : value.toString()); //$NON-NLS-1$
		fireValueChange(Diffs.createValueDiff(oldValue, link.getText()));
	}

	public Object doGetValue() {
		return link.getText();
	}

	public Object getValueType() {
		return String.class;
	}

}




/*******************************************************************************
 * Copyright (c) 2006 The Pampered Chef, Inc. 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:
 *     The Pampered Chef, Inc. - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.internal.databinding.provisional.swt;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Widget;

/**
 * NON-API - An abstract superclass for observable values that gurantees that the 
 * observable will be disposed when the control to which it is attached is
 * disposed.
 * 
 * @since 1.1
 */
public abstract class AbstractSWTObservableValue extends AbstractObservableValue implements ISWTObservableValue {

	private final Widget widget;

	/**
	 * Standard constructor for an SWT ObservableValue.  Makes sure that
	 * the observable gets disposed when the SWT widget is disposed.
	 * 
	 * @param widget
	 */
	protected AbstractSWTObservableValue(Widget widget) {
		this(SWTObservables.getRealm(widget.getDisplay()), widget);
	}
	
	/**
	 * Constructor that allows for the setting of the realm. Makes sure that the
	 * observable gets disposed when the SWT widget is disposed.
	 * 
	 * @param realm
	 * @param widget
	 * @since 1.2
	 */
	protected AbstractSWTObservableValue(Realm realm, Widget widget) {
		super(realm);
		this.widget = widget;
		widget.addDisposeListener(disposeListener);
	}
	
	private DisposeListener disposeListener = new DisposeListener() {
		public void widgetDisposed(DisposeEvent e) {
			AbstractSWTObservableValue.this.dispose();
		}
	};

	/**
	 * @return Returns the widget.
	 */
	public Widget getWidget() {
		return widget;
	}
}




/*******************************************************************************
 * Copyright (c) 2006 The Pampered Chef, Inc. 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:
 *     The Pampered Chef, Inc. - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.internal.databinding.provisional.swt;

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.AbstractVetoableValue;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Widget;

/**
 * NON-API - An abstract superclass for vetoable values that gurantees that the 
 * observable will be disposed when the control to which it is attached is
 * disposed.
 * 
 * @since 1.1
 */
public abstract class AbstractSWTVetoableValue extends AbstractVetoableValue implements ISWTObservableValue {

	private final Widget widget;

	/**
	 * Standard constructor for an SWT VetoableValue.  Makes sure that
	 * the observable gets disposed when the SWT widget is disposed.
	 * 
	 * @param widget
	 */
	protected AbstractSWTVetoableValue(Widget widget) {
		this(SWTObservables.getRealm(widget.getDisplay()), widget);
	}
	
	/**
	 * Constructs a new instance for the provided <code>realm</code> and <code>widget</code>.
	 * 
	 * @param realm
	 * @param widget
	 * @since 1.2
	 */
	protected AbstractSWTVetoableValue(Realm realm, Widget widget) {
		super(realm);
		this.widget = widget;
		if (widget == null) {
			throw new IllegalArgumentException("The widget parameter is null."); //$NON-NLS-1$
		}
		widget.addDisposeListener(disposeListener);
	}
	
	private DisposeListener disposeListener = new DisposeListener() {
		public void widgetDisposed(DisposeEvent e) {
			AbstractSWTVetoableValue.this.dispose();
		}
	};

	/**
	 * @return Returns the widget.
	 */
	public Widget getWidget() {
		return widget;
	}
}





import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionObservableValue;
import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;
import org.eclipse.jface.internal.databinding.swt.ComboObservableList;
import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;
import org.eclipse.jface.internal.databinding.internal.swt.LinkObservableValue;
import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionObservableValue;
import org.eclipse.jface.internal.databinding.swt.ControlObservableValue;
import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;
import org.eclipse.jface.internal.databinding.swt.SWTObservableListDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTVetoableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionObservableValue;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
import org.eclipse.jface.internal.databinding.swt.ShellObservableValue;
import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;
import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionObservableValue;
import org.eclipse.jface.internal.databinding.swt.TextEditableObservableValue;
import org.eclipse.jface.internal.databinding.swt.TextObservableValue;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.widgets.Button;


	/**
	 * Returns an observable which delays notification of value change events
	 * from <code>observable</code> until <code>delay</code> milliseconds have
	 * passed since the last change event, or until a FocusOut event is received
	 * from the underlying widget (whichever happens earlier). This class helps
	 * to delay validation until the user stops typing. To notify about pending
	 * changes, the returned observable value will fire a stale event when the
	 * wrapped observable value fires a change event, but this change is being
	 * delayed.
	 * 
	 * @param delay
	 * @param observable

	 * 
	 * @since 1.2
	 */
	public static ISWTObservableValue observeDelayedValue(int delay,
			ISWTObservableValue observable) {
		return new DelayedObservableValue(delay, observable);
	}

	private static ISWTObservableValue observeControl(Control control,
			IValueProperty property) {
		return new SWTObservableValueDecorator(
				PropertyObservables.observeValue(
						getRealm(control.getDisplay()), control, property),
				control);
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeEnabled(Control control) {
		return observeControl(control, ControlProperties.enablement());
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeVisible(Control control) {
		return observeControl(control, ControlProperties.visible());
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeTooltipText(Control control) {
		return observeControl(control, ControlProperties.toolTipText());
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeSelection(Control control) {
		IValueProperty property;
		if (control instanceof Spinner) {
			property = SpinnerProperties.selection();
					SWTProperties.SELECTION);
		} else if (control instanceof Button) {
			property = ButtonProperties.selection();
		} else if (control instanceof Combo) {
			property = ComboProperties.selection();
					SWTProperties.SELECTION);
		} else if (control instanceof CCombo) {
			property = CComboProperties.selection();
					SWTProperties.SELECTION);
		} else if (control instanceof List) {
			property = ListProperties.selection();
		} else if (control instanceof Scale) {
			property = ScaleProperties.selection();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControl(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeMin(Control control) {
		IValueProperty property;
		if (control instanceof Spinner) {
			property = SpinnerProperties.minimum();
					SWTProperties.MIN);
		} else if (control instanceof Scale) {
			property = ScaleProperties.minimum();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControl(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeMax(Control control) {
		IValueProperty property;
		if (control instanceof Spinner) {
			property = SpinnerProperties.maximum();
					SWTProperties.MAX);
		} else if (control instanceof Scale) {
			property = ScaleProperties.maximum();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControl(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 * </ul>
	 * 
	 * <li>org.eclipse.swt.widgets.Label</li>
	 * 
	 * @param control
	 * @param event
	 *            event type to register for change events
	 * @return observable value
	 * @throws IllegalArgumentException
	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeText(Control control, int event) {
		if (control instanceof Text) {
			return new SWTVetoableValueDecorator(PropertyObservables
					.observeValue(control, TextProperties.text(event)), control);
		}

		throw new IllegalArgumentException(

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeText(Control control) {
		IValueProperty property;
		if (control instanceof Label) {
			property = LabelProperties.text();
		} else if (control instanceof Link) {
			property = LinkProperties.text();
		} else if (control instanceof CLabel) {
			property = CLabelProperties.text();
		} else if (control instanceof Combo) {
			property = ComboProperties.text();
		} else if (control instanceof CCombo) {
			property = CComboProperties.text();
					SWTProperties.TEXT);
		} else if (control instanceof Shell) {
			property = ShellProperties.text();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControl(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 *             if <code>control</code> type is unsupported
	 */
	public static IObservableList observeItems(Control control) {
		IListProperty property;
		if (control instanceof Combo) {
			property = ComboProperties.items();
		} else if (control instanceof CCombo) {
			property = CComboProperties.items();
		} else if (control instanceof List) {
			property = ListProperties.items();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return new SWTObservableListDecorator(PropertyObservables.observeList(
				control, property), control);
	}

	/**

	 */
	public static ISWTObservableValue observeSingleSelectionIndex(
			Control control) {
		IValueProperty property;
		if (control instanceof Table) {
			property = TableProperties.singleSelectionIndex();
		} else if (control instanceof Combo) {
			property = ComboProperties.singleSelectionIndex();
		} else if (control instanceof CCombo) {
			property = CComboProperties.singleSelectionIndex();
		} else if (control instanceof List) {
			property = ListProperties.singleSelectionIndex();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControl(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	/**

	 *         control
	 */
	public static ISWTObservableValue observeForeground(Control control) {
		return observeControl(control, ControlProperties.foreground());
	}

	/**
	 * Returns an observable value tracking the background color of the given
	 * control
	 * 
	 * @param control
	 *            the control to observe
	 * @return an observable value tracking the background color of the given
	 *         control
	 */
	public static ISWTObservableValue observeBackground(Control control) {
		return observeControl(control, ControlProperties.background());
	}

	/**
	 * Returns an observable value tracking the font of the given control.
	 * 
	 * @param control
	 *            the control to observe
	 * @return an observable value tracking the font of the given control
	 */
	public static ISWTObservableValue observeFont(Control control) {
		return observeControl(control, ControlProperties.font());
	}

	/**
	 * Returns an observable observing the editable attribute of the provided
	 * <code>control</code>. The supported types are:
	 * <ul>
	 * <li>org.eclipse.swt.widgets.Text</li>
	 * </ul>

	 *             if <code>control</code> type is unsupported
	 */
	public static ISWTObservableValue observeEditable(Control control) {
		IValueProperty property;
		if (control instanceof Text) {
			property = TextProperties.editable();
		} else {
			throw new IllegalArgumentException(
					"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
		}

		return observeControl(control, property);
				"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
	}

	private static class DisplayRealm extends Realm {




/*******************************************************************************
 * Copyright (c) 2006 The Pampered Chef, Inc. 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:
 *     The Pampered Chef, Inc. - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.list.DecoratingObservableList;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;

/**
 * @since 3.3
 * 
 */
public class SWTObservableListDecorator extends DecoratingObservableList
		implements ISWTObservable {
	private Widget widget;

	/**
	 * @param decorated
	 * @param widget
	 */
	public SWTObservableListDecorator(IObservableList decorated, Widget widget) {
		super(decorated, true);
		this.widget = widget;
		widget.addListener(SWT.Dispose, disposeListener);
	}

	private Listener disposeListener = new Listener() {
		public void handleEvent(Event event) {
			SWTObservableListDecorator.this.dispose();
		}
	};

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

	/**
	 * @return Returns the widget.
	 */
	public Widget getWidget() {
		return widget;
	}
}




/*******************************************************************************
 * All rights reserved. This program and the accompanying materials
 * Copyright (c) 2008 IBM Corporation and others.
 * 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.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ButtonSelectionProperty;

/**
 * A factory for creating properties of SWT Buttons.
 * 
 * @since 1.3
 */
public class ButtonProperties {
	/**
	 * Returns a value property for the selection state of a SWT Button.
	 * 
	 * @return a value property for the selection state of a SWT Button.
	 */
	public static IValueProperty selection() {
		return new ButtonSelectionProperty();
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.CLabelTextProperty;

/**
 * A factory for creating properties of SWT Labels.
 * 
 * @since 1.3
 */
public class CLabelProperties {
	/**
	 * Returns a value property for the text of a SWT Label.
	 * 
	 * @return a value property for the text of a SWT Label.
	 */
	public static IValueProperty text() {
		return new CLabelTextProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlEnabledProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ControlEnabledProperty() {
		super(Boolean.TYPE);
	}

	public Object doGetValue(Control control) {
		return Boolean.valueOf(control.getEnabled());
	}

	public void doSetValue(Control control, Object value) {
		control.setEnabled(((Boolean) value).booleanValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlToolTipTextProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ControlToolTipTextProperty() {
		super(String.class);
	}

	public Object doGetValue(Control control) {
		return control.getToolTipText();
	}

	public void doSetValue(Control control, Object value) {
		control.setToolTipText((String) value);
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleSelectionProperty;

/**
 * A factory for creating properties of SWT Scales.
 * 
 * @since 1.3
 */
public class ScaleProperties {
	/**
	 * Returns a value property for the selected value of a SWT Scale.
	 * 
	 * @return a value property for the selected value of a SWT Scale.
	 */
	public static IValueProperty selection() {
		return new ScaleSelectionProperty();
	}

	/**
	 * Returns a value property for the minimum value of a SWT Scale.
	 * 
	 * @return a value property for the minimum value of a SWT Scale.
	 */
	public static IValueProperty minimum() {
		return new ScaleMinimumProperty();
	}

	/**
	 * Returns a value property for the maximum value of a SWT Scale.
	 * 
	 * @return a value property for the maximum value of a SWT Scale.
	 */
	public static IValueProperty maximum() {
		return new ScaleMaximumProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class ButtonSelectionProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ButtonSelectionProperty() {
		super(SWT.Selection, Boolean.TYPE);
	}

	Object doGetValue(Control control) {
		return Boolean.valueOf(((Button) control).getSelection());
	}

	void doSetValue(Control control, Object value) {
		if (value == null)
			value = Boolean.FALSE;
		((Button) control).setSelection(((Boolean) value).booleanValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlFontProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ControlFontProperty() {
		super(Font.class);
	}

	public Object doGetValue(Control control) {
		return control.getFont();
	}

	public void doSetValue(Control control, Object value) {
		control.setFont((Font) value);
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Scale;

/**
 * @since 3.3
 * 
 */
public class ScaleMaximumProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ScaleMaximumProperty() {
		super(Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Scale) control).getMaximum());
	}

	void doSetValue(Control control, Object value) {
		((Scale) control).setMaximum(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.List;

/**
 * @since 3.3
 * 
 */
public class ListSelectionProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ListSelectionProperty() {
		super(SWT.Selection, String.class);
	}

	Object doGetValue(Control control) {
		List list = (List) control;
		int index = list.getSelectionIndex();
		if (index >= 0)
			return list.getItem(index);
		return null;
	}

	void doSetValue(Control control, Object value) {
		List list = (List) control;
		String items[] = list.getItems();
		int index = -1;
		if (items != null && value != null) {
			for (int i = 0; i < items.length; i++) {
				if (value.equals(items[i])) {
					index = i;
					break;
				}
			}
			list.select(index);
		}
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Link;

/**
 * @since 3.3
 * 
 */
public class LinkTextProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public LinkTextProperty() {
		super(String.class);
	}

	Object doGetValue(Control control) {
		return ((Link) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((Link) control).setText(value == null ? "" : (String) value); //$NON-NLS-1$
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ControlBackgroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlEnabledProperty;
import org.eclipse.jface.internal.databinding.swt.ControlFontProperty;
import org.eclipse.jface.internal.databinding.swt.ControlForegroundProperty;
import org.eclipse.jface.internal.databinding.swt.ControlVisibleProperty;
import org.eclipse.jface.internal.databinding.swt.ControlToolTipTextProperty;

/**
 * A factory for creating properties of SWT controls.
 * 
 * @since 1.3
 */
public class ControlProperties {
	/**
	 * Returns a value property for the enablement state of a SWT Control.
	 * 
	 * @return a value property for the enablement state of a SWT Control.
	 */
	public static IValueProperty enablement() {
		return new ControlEnabledProperty();
	}

	/**
	 * Returns a value property for the visibility state of a SWT Control.
	 * 
	 * @return a value property for the visibility state of a SWT Control.
	 */
	public static IValueProperty visible() {
		return new ControlVisibleProperty();
	}

	/**
	 * Returns a value property for the tooltip text of a SWT Control.
	 * 
	 * @return a value property for the tooltip text of a SWT Control.
	 */
	public static IValueProperty toolTipText() {
		return new ControlToolTipTextProperty();
	}

	/**
	 * Returns a value property for the foreground color of a SWT Control.
	 * 
	 * @return a value property for the foreground color of a SWT Control.
	 */
	public static IValueProperty foreground() {
		return new ControlForegroundProperty();
	}

	/**
	 * Returns a value property for the background color of a SWT Control.
	 * 
	 * @return a value property for the background color of a SWT Control.
	 */
	public static IValueProperty background() {
		return new ControlBackgroundProperty();
	}

	/**
	 * Returns a value property for the font of a SWT Control.
	 * 
	 * @return a value property for the font of a SWT Control.
	 */
	public static IValueProperty font() {
		return new ControlFontProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlBackgroundProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ControlBackgroundProperty() {
		super(Color.class);
	}

	public Object doGetValue(Control control) {
		return control.getBackground();
	}

	public void doSetValue(Control control, Object value) {
		control.setBackground((Color) value);
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ComboSelectionProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ComboSelectionProperty() {
		super(SWT.Modify, String.class);
	}

	Object doGetValue(Control control) {
		return ((Combo)control).getText();
	}

	void doSetValue(Control control, Object value) {
		Combo combo = (Combo) control;
		String items[] = combo.getItems();
		int index = -1;
		if (items != null && value != null) {
			for (int i = 0; i < items.length; i++) {
				if (value.equals(items[i])) {
					index = i;
					break;
				}
			}
			if (index == -1) {
				combo.setText((String) value);
			} else {
				combo.select(index); // -1 will not "unselect"
			}
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2006 The Pampered Chef, Inc. 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:
 *     The Pampered Chef, Inc. - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.value.DecoratingObservableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;

/**
 * @since 3.3
 * 
 */
public class SWTObservableValueDecorator extends DecoratingObservableValue
		implements ISWTObservableValue {
	private Widget widget;

	/**
	 * @param decorated
	 * @param widget
	 */
	public SWTObservableValueDecorator(IObservableValue decorated, Widget widget) {
		super(decorated, true);
		this.widget = widget;
		widget.addListener(SWT.Dispose, disposeListener);
	}

	private Listener disposeListener = new Listener() {
		public void handleEvent(Event event) {
			SWTObservableValueDecorator.this.dispose();
		}
	};

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

	/**
	 * @return Returns the widget.
	 */
	public Widget getWidget() {
		return widget;
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class CLabelTextProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public CLabelTextProperty() {
		super(String.class);
	}

	Object doGetValue(Control control) {
		return ((CLabel) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((CLabel) control).setText(value == null ? "" : (String) value); //$NON-NLS-1$
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerSelectionProperty;

/**
 * A factory for creating properties of SWT Spinners.
 * 
 * @since 1.3
 */
public class SpinnerProperties {
	/**
	 * Returns a value property for the selected value of a SWT Spinner.
	 * 
	 * @return a value property for the selected value of a SWT Spinner.
	 */
	public static IValueProperty selection() {
		return new SpinnerSelectionProperty();
	}

	/**
	 * Returns a value property for the minimum value of a SWT Spinner.
	 * 
	 * @return a value property for the minimum value of a SWT Spinner.
	 */
	public static IValueProperty minimum() {
		return new SpinnerMinimumProperty();
	}

	/**
	 * Returns a value property for the maximum value of a SWT Spinner.
	 * 
	 * @return a value property for the maximum value of a SWT Spinner.
	 */
	public static IValueProperty maximum() {
		return new SpinnerMaximumProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import java.util.Arrays;
import java.util.List;

import org.eclipse.swt.custom.CCombo;

/**
 * @since 3.3
 * 
 */
public class CComboItemsProperty extends ControlListProperty {
	public Object getElementType() {
		return String.class;
	}

	protected void doSetList(Object source, List list) {
		String[] items = (String[]) list.toArray(new String[list.size()]);
		((CCombo) source).setItems(items);
	}

	public List getList(Object source) {
		return Arrays.asList(((CCombo) source).getItems());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class ComboSingleSelectionIndexProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ComboSingleSelectionIndexProperty() {
		super(new int[] { SWT.Selection, SWT.DefaultSelection }, Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Combo) control).getSelectionIndex());
	}

	void doSetValue(Control control, Object value) {
		((Combo) control).select(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TextEditableProperty;
import org.eclipse.jface.internal.databinding.swt.TextTextProperty;
import org.eclipse.swt.SWT;

/**
 * A factory for creating properties of SWT Texts.
 * 
 * @since 1.3
 */
public class TextProperties {
	/**
	 * Returns a value property for the text of a SWT Text.
	 * 
	 * @param event
	 *            the SWT event type to register for change events. May be
	 *            {@link SWT#None}, {@link SWT#Modify} or {@link SWT#FocusOut}.
	 * 
	 * @return a value property for the text of a SWT Text.
	 */
	public static IValueProperty text(int event) {
		return new TextTextProperty(event);
	}

	/**
	 * Returns a value property for the editable state of a SWT Text.
	 * @return a value property for the editable state of a SWT Text.
	 */
	public static IValueProperty editable() {
		return new TextEditableProperty();
	}
}




/*******************************************************************************
 * Copyright (c) 2006 The Pampered Chef, Inc. 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:
 *     The Pampered Chef, Inc. - initial API and implementation
 ******************************************************************************/

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.IDecoratingObservable;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IStaleListener;
import org.eclipse.core.databinding.observable.ObservableTracker;
import org.eclipse.core.databinding.observable.StaleEvent;
import org.eclipse.core.databinding.observable.value.AbstractVetoableValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.IValueChangeListener;
import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;

/**
 * @since 3.3
 * 
 */
public class SWTVetoableValueDecorator extends AbstractVetoableValue implements
		ISWTObservableValue, IDecoratingObservable {

	private IObservableValue decorated;
	private Widget widget;

	private IValueChangeListener valueListener = new IValueChangeListener() {
		public void handleValueChange(ValueChangeEvent event) {
			fireValueChange(event.diff);
		}
	};

	private IStaleListener staleListener = new IStaleListener() {
		public void handleStale(StaleEvent staleEvent) {
			fireStale();
		}
	};

	private Listener verifyListener = new Listener() {
		public void handleEvent(Event event) {
			String currentText = (String) decorated.getValue();
			String newText = currentText.substring(0, event.start) + event.text
					+ currentText.substring(event.end);
			if (!fireValueChanging(Diffs.createValueDiff(currentText, newText))) {
				event.doit = false;
			}
		}
	};

	private Listener disposeListener = new Listener() {
		public void handleEvent(Event event) {
			SWTVetoableValueDecorator.this.dispose();
		}
	};

	/**
	 * @param decorated
	 * @param widget
	 */
	public SWTVetoableValueDecorator(IObservableValue decorated, Widget widget) {
		super(decorated.getRealm());
		this.decorated = decorated;
		this.widget = widget;
		Assert
				.isTrue(decorated.getValueType().equals(String.class),
						"SWTVetoableValueDecorator can only decorate observable values of String type"); //$NON-NLS-1$
		widget.addListener(SWT.Dispose, disposeListener);
		widget.addListener(SWT.Verify, verifyListener);
	}

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

	protected void firstListenerAdded() {
		decorated.addValueChangeListener(valueListener);
		decorated.addStaleListener(staleListener);
	}

	protected void lastListenerRemoved() {
		decorated.removeValueChangeListener(valueListener);
		decorated.removeStaleListener(staleListener);
	}

	protected void doSetApprovedValue(Object value) {
		checkRealm();
		decorated.setValue(value);
	}

	protected Object doGetValue() {
		getterCalled();
		return decorated.getValue();
	}

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

	public boolean isStale() {
		getterCalled();
		return decorated.isStale();
	}

	public void dispose() {
		if (decorated != null) {
			decorated.dispose();
			decorated = null;
		}
		this.widget = null;
		super.dispose();
	}

	public Widget getWidget() {
		return widget;
	}

	public IObservable getDecorated() {
		return decorated;
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ShellTextProperty;

/**
 * A factory for creating properties of SWT Shells.
 * 
 * @since 1.3
 */
public class ShellProperties {
	/**
	 * Returns a value property for the text of a SWT Shell.
	 * 
	 * @return a value property for the text of a SWT Shell.
	 */
	public static IValueProperty text() {
		return new ShellTextProperty();
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.LinkTextProperty;

/**
 * A factory for creating properties of SWT Links.
 * 
 * @since 1.3
 */
public class LinkProperties {
	/**
	 * Returns a value property for the text of a SWT Link.
	 * 
	 * @return a value property for the text of a SWT Link.
	 */
	public static IValueProperty text() {
		return new LinkTextProperty();
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.CComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;

/**
 * A factory for creating properties of SWT CCombos
 * 
 * @since 1.3
 */
public class CComboProperties {
	/**
	 * Returns a value property for the selection text of a SWT CCombo.
	 * 
	 * @return a value property for the selection text of a SWT CCombo.
	 */
	public static IValueProperty selection() {
		return new CComboSelectionProperty();
	}

	/**
	 * Returns a value property for the text of a SWT CCombo.
	 * 
	 * @return a value property for the text of a SWT CCombo.
	 */
	public static IValueProperty text() {
		return new CComboTextProperty();
	}

	/**
	 * Returns a list property for the items of a SWT CCombo.
	 * 
	 * @return a list property for the items of a SWT CCombo.
	 */
	public static IListProperty items() {
		return new CComboItemsProperty();
	}

	/**
	 * Returns a value property for the single selection index of a SWT Combo.
	 * 
	 * @return a value property for the single selection index of a SWT Combo.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new CComboSingleSelectionIndexProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlVisibleProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ControlVisibleProperty() {
		super(Boolean.TYPE);
	}

	public Object doGetValue(Control control) {
		return Boolean.valueOf(control.getVisible());
	}

	public void doSetValue(Control control, Object value) {
		control.setVisible(((Boolean) value).booleanValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.List;

/**
 * @since 3.3
 * 
 */
public class ListSingleSelectionIndexProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ListSingleSelectionIndexProperty() {
		super(new int[] { SWT.Selection, SWT.DefaultSelection }, Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((List) control).getSelectionIndex());
	}

	void doSetValue(Control control, Object value) {
		((List) control).setSelection(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class CComboSelectionProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public CComboSelectionProperty() {
		super(SWT.Modify, String.class);
	}

	Object doGetValue(Control control) {
		return ((CCombo) control).getText();
	}

	void doSetValue(Control control, Object value) {
		CCombo ccombo = (CCombo) control;
		String items[] = ccombo.getItems();
		int index = -1;
		if (value == null) {
			ccombo.select(-1);
		} else if (items != null) {
			for (int i = 0; i < items.length; i++) {
				if (value.equals(items[i])) {
					index = i;
					break;
				}
			}
			if (index == -1) {
				ccombo.setText((String) value);
			} else {
				ccombo.select(index); // -1 will not "unselect"
			}
		}
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionIndexProperty;

/**
 * A factory for creating properties of SWT Tables.
 * 
 * @since 1.3
 */
public class TableProperties {
	/**
	 * Returns a value property for the single selection index of a SWT Table.
	 * 
	 * @return a value property for the single selection index of a SWT Table.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new TableSingleSelectionIndexProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Spinner;

/**
 * @since 3.3
 * 
 */
public class SpinnerSelectionProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public SpinnerSelectionProperty() {
		super(SWT.Modify, Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Spinner) control).getSelection());
	}

	void doSetValue(Control control, Object value) {
		((Spinner) control).setSelection(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.property.ValueProperty;
import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;
import org.eclipse.jface.util.Util;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Widget;

abstract class ControlValueProperty extends ValueProperty implements Listener {
	private Map controlToValue = new HashMap();

	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();

	private int[] events;
	private Object valueType;

	ControlValueProperty(Object valueType) {
		this(null, valueType);
	}

	ControlValueProperty(int event, Object valueType) {
		this(new int[] { event }, valueType);
	}

	ControlValueProperty(int[] events, Object valueType) {
		this.events = events;
		this.valueType = valueType;
	}

	protected final void addListenerTo(Object source) {
		controlToValue.put(source, doGetValue((Control) source));
		if (events != null) {
			for (int i = 0; i < events.length; i++) {
				int event = events[i];
				if (event != SWT.None) {
					((Widget) source).addListener(event, this);
				}
			}
		}
	}

	protected final void removeListenerFrom(Object source) {
		controlToValue.remove(source);
		Widget widget = (Widget) source;
		if (events != null) {
			for (int i = 0; i < events.length; i++) {
				int event = events[i];
				if (event != SWT.None && !widget.isDisposed())
					widget.removeListener(event, this);
			}
		}
	}

	public void handleEvent(Event event) {
		if (!updateHelper.isUpdating(event.widget)) {
			Object source = event.widget;
			Object oldValue = controlToValue.get(source);
			Object newValue = doGetValue((Control) source);
			controlToValue.put(source, newValue);
			if (!Util.equals(oldValue, newValue))
				fireValueChange(source, Diffs.createValueDiff(oldValue,
						newValue));
		}
	}

	public final Object getValueType() {
		return valueType;
	}

	public Object getValue(Object source) {
		Object oldValue = controlToValue.get(source);
		Object currentValue = doGetValue((Control) source);

		if (hasListeners(source)) {
			controlToValue.put(source, currentValue);
			if (!Util.equals(oldValue, currentValue)) {
				fireValueChange(source, Diffs.createValueDiff(oldValue,
						currentValue));
			}
		}
		return currentValue;
	}

	public void setValue(Object source, Object value) {
		Object oldValue = getValue(source);

		updateHelper.setUpdating(source, true);
		try {
			doSetValue((Control) source, value);
		} finally {
			updateHelper.setUpdating(source, false);
		}

		if (hasListeners(source)) {
			Object newValue = getValue(source);
			if (!Util.equals(oldValue, newValue)) {
				controlToValue.put(source, newValue);
				fireValueChange(source, Diffs.createValueDiff(oldValue,
						newValue));
			}
		}
	}

	abstract Object doGetValue(Control control);

	abstract void doSetValue(Control control, Object value);
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ComboItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;

/**
 * A factory for creating properties of SWT Combos.
 * 
 * @since 1.3
 */
public class ComboProperties {
	/**
	 * Returns a value property for the selection text of a SWT Combo.
	 * 
	 * @return a value property for the selection text of a SWT Combo.
	 */
	public static IValueProperty selection() {
		return new ComboSelectionProperty();
	}

	/**
	 * Returns a value property for the text of a SWT Combo.
	 * 
	 * @return a value property for the text of a SWT Combo.
	 */
	public static IValueProperty text() {
		return new ComboTextProperty();
	}

	/**
	 * Returns a list property for the items of a SWT Combo.
	 * 
	 * @return a list property for the items of a SWT Combo.
	 */
	public static IListProperty items() {
		return new ComboItemsProperty();
	}

	/**
	 * Returns a value property for the single selection index of a SWT Combo.
	 * 
	 * @return a value property for the single selection index of a SWT Combo.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new ComboSingleSelectionIndexProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class ComboTextProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ComboTextProperty() {
		super(SWT.Modify, String.class);
	}

	Object doGetValue(Control control) {
		return ((Combo) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((Combo) control).setText(value != null ? (String) value : ""); //$NON-NLS-1$
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;

/**
 * @since 3.3
 * 
 */
public class TextTextProperty extends ControlValueProperty {
	/**
	 * @param event
	 */
	public TextTextProperty(int event) {
		super(checkEvent(event), String.class);
	}

	private static int checkEvent(int event) {
		switch (event) {
		case SWT.None:
		case SWT.Modify:
		case SWT.FocusOut:
			return event;
		default:
			throw new IllegalArgumentException("UpdateEventType [" //$NON-NLS-1$
					+ event + "] is not supported."); //$NON-NLS-1$
		}
	}

	Object doGetValue(Control control) {
		return ((Text) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((Text) control).setText(value == null ? "" : (String) value); //$NON-NLS-1$
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.LabelTextProperty;

/**
 * A factory for creating properties of SWT Labels.
 * 
 * @since 1.3
 */
public class LabelProperties {
	/**
	 * Returns a value property for the text of a SWT Label.
	 * 
	 * @return a value property for the text of a SWT Label.
	 */
	public static IValueProperty text() {
		return new LabelTextProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;

/**
 * @since 3.3
 * 
 */
public class LabelTextProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public LabelTextProperty() {
		super(String.class);
	}

	Object doGetValue(Control control) {
		return ((Label) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((Label) control).setText(value == null ? "" : (String) value); //$NON-NLS-1$
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Spinner;

/**
 * @since 3.3
 * 
 */
public class SpinnerMaximumProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public SpinnerMaximumProperty() {
		super(Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Spinner) control).getMaximum());
	}

	void doSetValue(Control control, Object value) {
		((Spinner) control).setMaximum(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.databinding.swt;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.jface.internal.databinding.swt.ListItemsProperty;
import org.eclipse.jface.internal.databinding.swt.ListSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionIndexProperty;

/**
 * A factory for creating properties of SWT List controls.
 * 
 * @since 1.3
 */
public class ListProperties {
	/**
	 * Returns a value property for observing the selection text of a SWT List.
	 * 
	 * @return a value property for observing the selection text of a SWT List.
	 */
	public static IValueProperty selection() {
		return new ListSelectionProperty();
	}

	/**
	 * Returns a list property for observing the items in a SWT List.
	 * 
	 * @return a list property for observing the items in a SWT List.
	 */
	public static IListProperty items() {
		return new ListItemsProperty();
	}

	/**
	 * Returns a value property for the single selection index of a SWT List.
	 * 
	 * @return a value property for the single selection index of a SWT List.
	 */
	public static IValueProperty singleSelectionIndex() {
		return new ListSingleSelectionIndexProperty();
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import java.util.Arrays;
import java.util.List;

import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.3
 * 
 */
public class ComboItemsProperty extends ControlListProperty {
	public Object getElementType() {
		return String.class;
	}

	protected void doSetList(Object source, List list) {
		String[] items = (String[]) list.toArray(new String[list.size()]);
		((Combo) source).setItems(items);
	}

	public List getList(Object source) {
		return Arrays.asList(((Combo) source).getItems());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import java.util.Arrays;

import org.eclipse.swt.widgets.List;

/**
 * @since 3.3
 * 
 */
public class ListItemsProperty extends ControlListProperty {
	public Object getElementType() {
		return String.class;
	}

	protected void doSetList(Object source, java.util.List list) {
		String[] items = (String[]) list.toArray(new String[list.size()]);
		((List) source).setItems(items);
	}

	public java.util.List getList(Object source) {
		return Arrays.asList(((List) source).getItems());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class CComboSingleSelectionIndexProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public CComboSingleSelectionIndexProperty() {
		super(new int[] { SWT.Selection, SWT.DefaultSelection }, Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((CCombo) control).getSelectionIndex());
	}

	void doSetValue(Control control, Object value) {
		((CCombo)control).select(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 *
 */
public class ControlForegroundProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ControlForegroundProperty() {
		super(Color.class);
	}

	public Object doGetValue(Control control) {
		return control.getForeground();
	}

	public void doSetValue(Control control, Object value) {
		control.setForeground((Color) value);
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Scale;

/**
 * @since 3.3
 * 
 */
public class ScaleMinimumProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ScaleMinimumProperty() {
		super(Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Scale) control).getMinimum());
	}

	void doSetValue(Control control, Object value) {
		((Scale) control).setMinimum(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Spinner;

/**
 * @since 3.3
 * 
 */
public class SpinnerMinimumProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public SpinnerMinimumProperty() {
		super(Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Spinner) control).getMinimum());
	}

	void doSetValue(Control control, Object value) {
		((Spinner) control).setMinimum(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Scale;

/**
 * @since 3.3
 * 
 */
public class ScaleSelectionProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ScaleSelectionProperty() {
		super(SWT.Selection, Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Scale) control).getSelection());
	}

	void doSetValue(Control control, Object value) {
		((Scale) control).setSelection(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.core.databinding.property.BasicListProperty;

abstract class ControlListProperty extends BasicListProperty {
	protected void addListenerTo(Object source) {
		// no-op
	}

	protected void removeListenerFrom(Object source) {
		// no-op
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;

/**
 * @since 3.3
 *
 */
public class TextEditableProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public TextEditableProperty() {
		super(Boolean.TYPE);
	}

	public Object doGetValue(Control control) {
		return Boolean.valueOf(((Text)control).getEditable());
	}

	public void doSetValue(Control control, Object value) {
		((Text)control).setEditable(((Boolean) value).booleanValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;

/**
 * @since 3.3
 * 
 */
public class ShellTextProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public ShellTextProperty() {
		super(String.class);
	}

	Object doGetValue(Control control) {
		return ((Shell) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((Shell) control).setText(value == null ? "" : (String) value); //$NON-NLS-1$
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Table;

/**
 * @since 3.3
 * 
 */
public class TableSingleSelectionIndexProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public TableSingleSelectionIndexProperty() {
		super(new int[] { SWT.Selection, SWT.DefaultSelection }, Integer.TYPE);
	}

	Object doGetValue(Control control) {
		return new Integer(((Table) control).getSelectionIndex());
	}

	void doSetValue(Control control, Object value) {
		((Table) control).setSelection(((Integer) value).intValue());
	}
}




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

package org.eclipse.jface.internal.databinding.swt;

import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Control;

/**
 * @since 3.3
 * 
 */
public class CComboTextProperty extends ControlValueProperty {
	/**
	 * 
	 */
	public CComboTextProperty() {
		super(SWT.Modify, String.class);
	}

	Object doGetValue(Control control) {
		return ((CCombo) control).getText();
	}

	void doSetValue(Control control, Object value) {
		((CCombo) control).setText(value != null ? (String) value : ""); //$NON-NLS-1$
	}
}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.ScaleProperties;
import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Scale;

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ScaleObservableValueMaxTest.class
				.toString());
		suite.addTestSuite(ScaleObservableValueMaxTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, scale,
					ScaleProperties.maximum());
		}

		public void change(IObservable observable) {




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.TableProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

/**
 * @since 3.2
 */
public class TableSingleSelectionObservableValueTest extends
		ObservableDelegateTest {
	private Delegate delegate;
	private IObservableValue observable;
	private Table table;

	public TableSingleSelectionObservableValueTest() {
		this(null);
	}

	public TableSingleSelectionObservableValueTest(String testName) {
		super(testName, new Delegate());
	}

	protected void setUp() throws Exception {
		super.setUp();

		observable = (IObservableValue) getObservable();
		delegate = (Delegate) getObservableContractDelegate();
		table = delegate.table;
	}

	protected IObservable doCreateObservable() {
		Delegate delegate = (Delegate) getObservableContractDelegate();
		return delegate.createObservableValue(SWTObservables.getRealm(Display
				.getDefault()));
	}

	public void testSetValue() throws Exception {
		// preconditions
		assertEquals(-1, table.getSelectionIndex());
		assertEquals(-1, ((Integer) observable.getValue()).intValue());


				.getSelectionIndex());
		assertEquals("observable value", value, observable.getValue());
	}

	public void testGetValue() throws Exception {
		int value = 1;
		table.setSelection(value);

		assertEquals("table selection index", value, table.getSelectionIndex());
		assertEquals("observable value", new Integer(value), observable
				.getValue());
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(
				TableSingleSelectionObservableValueTest.class.toString());
		suite.addTestSuite(TableSingleSelectionObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, table,
					TableProperties.singleSelectionIndex());
		}

		public Object getValueType(IObservableValue observable) {




package org.eclipse.jface.tests.internal.databinding.swt;

import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Spinner;

public class SpinnerObservableValueTest extends AbstractSWTTestCase {
	public void testDispose() throws Exception {
		Spinner spinner = new Spinner(getShell(), SWT.NONE);
		ISWTObservableValue observableValue = SWTObservables.observeSelection(spinner);
				spinner, SWTProperties.SELECTION);
		ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();
		observableValue.addValueChangeListener(testCounterValueChangeListener);





import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.CLabelProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.widgets.Display;

	private Delegate delegate;
	private IObservableValue observable;
	private CLabel label;

	protected void setUp() throws Exception {
		super.setUp();

		delegate = new Delegate();
		delegate.setUp();
		label = delegate.label;
		observable = delegate.createObservableValue(SWTObservables
				.getRealm(Display.getDefault()));
	}

	protected void tearDown() throws Exception {
		super.tearDown();

		delegate.tearDown();
		observable.dispose();
	}

	public void testSetValue() throws Exception {
		// preconditions
		assertEquals(null, label.getText());
		assertEquals(null, observable.getValue());

		String value = "value";
		observable.setValue(value);
		assertEquals("label text", value, label.getText());
		assertEquals("observable value", value, observable.getValue());
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(CLabelObservableValueTest.class
				.getName());
		suite.addTestSuite(CLabelObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, label,
					CLabelProperties.text());
		}

		public void change(IObservable observable) {
			IObservableValue value = (IObservableValue) observable;
			value.setValue(value.getValue() + "a");
		}

		public Object getValueType(IObservableValue observable) {
			return String.class;
		}

		public Object createValue(IObservableValue observable) {
			return observable.getValue() + "a";
		}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.ScaleProperties;
import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Scale;

	public ScaleObservableValueSelectionTest() {
		this(null);
	}

	public ScaleObservableValueSelectionTest(String testName) {
		super(testName, new Delegate());
	}

	protected void setUp() throws Exception {
		super.setUp();


	}

	protected IObservable doCreateObservable() {
		return getObservableContractDelegate().createObservable(
				SWTObservables.getRealm(Display.getDefault()));
	}

	public void testGetValue() throws Exception {

		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, scale,
					ScaleProperties.selection());
		}

		public void change(IObservable observable) {




/*******************************************************************************
 * Copyright (c) 2007 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 208858)
 *     Matthew Hall - bug 213145
 ******************************************************************************/

package org.eclipse.jface.tests.internal.databinding.swt;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.internal.databinding.swt.SWTObservableList;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;

/**
 * @since 3.3
 */
public class SWTObservableListTest extends AbstractDefaultRealmTestCase {
	SWTObservableListStub list;

	protected void setUp() throws Exception {
		super.setUp();
		list = new SWTObservableListStub(Realm.getDefault(), 0);
	}

	public void testMove_ForwardAndBackward() {
		String element0 = "element0";
		String element1 = "element1";

		list.add(element0);
		list.add(element1);

		// move forward
		assertEquals(element0, list.move(0, 1));
		assertEquals(element1, list.move(0, 1));

		// move backward
		assertEquals(element1, list.move(1, 0));
		assertEquals(element0, list.move(1, 0));
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(SWTObservableListTest.class.toString());
		suite.addTestSuite(SWTObservableListTest.class);
		suite.addTest(MutableObservableListContractTest.suite(new Delegate()));
		return suite;
	}

	static class Delegate extends AbstractObservableCollectionContractDelegate {
		public IObservableCollection createObservableCollection(Realm realm,
				int elementCount) {
			return new SWTObservableListStub(realm, elementCount);
		}

		private int counter;

		public Object createElement(IObservableCollection collection) {
			return "Item" + counter++;
		}

		public Object getElementType(IObservableCollection collection) {
			return String.class;
		}

		public void change(IObservable observable) {
			((SWTObservableListStub) observable).fireChange();
		}
	}

	static class SWTObservableListStub extends SWTObservableList {
		String[] items;

		public SWTObservableListStub(Realm realm, int elementCount) {
			super(realm);
			items = new String[elementCount];
			for (int i = 0; i < items.length; i++)
				items[i] = Integer.toString(i);
		}

		protected String getItem(int index) {
			return items[index];
		}

		protected int getItemCount() {
			return items.length;
		}

		protected String[] getItems() {
			return items;
		}

		protected void setItem(int index, String string) {
			items[index] = string;
		}

		protected void setItems(String[] newItems) {
			items = newItems;
		}

		protected void fireChange() {
			super.fireChange();
		}
	}
}

Lines 18-29 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/DelayedObservableValueTest.java (-5 / +20 lines)
18	import org.eclipse.core.databinding.observable.Diffs;	18	import org.eclipse.core.databinding.observable.Diffs;
19	import org.eclipse.core.databinding.observable.IObservable;	19	import org.eclipse.core.databinding.observable.IObservable;
20	import org.eclipse.core.databinding.observable.Realm;	20	import org.eclipse.core.databinding.observable.Realm;
		21	import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	22	import org.eclipse.core.databinding.observable.value.IObservableValue;
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
		25	import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
24	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	26	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
		27	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
25	import org.eclipse.jface.databinding.swt.SWTObservables;	28	import org.eclipse.jface.databinding.swt.SWTObservables;
26	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
27	import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;	29	import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;
28	import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;	30	import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
29	import org.eclipse.swt.SWT;	31	import org.eclipse.swt.SWT;
Lines 55-60 Link Here
55	newValue = new Object();	57	newValue = new Object();
56	target.setValue(oldValue);	58	target.setValue(oldValue);
57	delayed = new DelayedObservableValue(1, target);	59	delayed = new DelayedObservableValue(1, target);
		60
		61	// force listeners to be added to target
		62	ChangeEventTracker.observe(delayed);
58	}	63	}
59		64
60	protected void tearDown() throws Exception {	65	protected void tearDown() throws Exception {
Lines 193-206 Link Here
193	assertEquals(newValue, tracker.event.diff.getNewValue());	198	assertEquals(newValue, tracker.event.diff.getNewValue());
194	}	199	}
195		200
196	static class SWTObservableValueStub extends AbstractSWTObservableValue {	201	static class SWTObservableValueStub extends AbstractObservableValue
		202	implements ISWTObservableValue {
		203	private Widget widget;
		204
197	private Object value;	205	private Object value;
198	private boolean stale;	206	private boolean stale;
199		207
200	Object overrideValue;	208	Object overrideValue;
201		209
202	public SWTObservableValueStub(Realm realm, Widget widget) {	210	public SWTObservableValueStub(Realm realm, Widget widget) {
203	super(realm, widget);	211	super(realm);
		212	this.widget = widget;
204	}	213	}
205		214
206	protected Object doGetValue() {	215	protected Object doGetValue() {
Lines 228-239 Link Here
228	public boolean isStale() {	237	public boolean isStale() {
229	return stale;	238	return stale;
230	}	239	}
		240
		241	public Widget getWidget() {
		242	return widget;
		243	}
231	}	244	}
232		245
233	public static Test suite() {	246	public static Test suite() {
234	TestSuite suite = new TestSuite(DelayedObservableValueTest.class.getName());	247	TestSuite suite = new TestSuite(DelayedObservableValueTest.class
		248	.getName());
235	suite.addTestSuite(DelayedObservableValueTest.class);	249	suite.addTestSuite(DelayedObservableValueTest.class);
236	suite.addTest(SWTMutableObservableValueContractTest.suite(new Delegate()));	250	suite.addTest(SWTMutableObservableValueContractTest
		251	.suite(new Delegate()));
237	return suite;	252	return suite;
238	}	253	}
239		254





package org.eclipse.jface.tests.internal.databinding.swt;

import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Table;

public class TableObservableValueTest extends AbstractSWTTestCase {
	public void testDispose() throws Exception {
		Table table = new Table(getShell(), SWT.NONE);
		IObservableValue observableValue = SWTObservables
				.observeSingleSelectionIndex(table);

		TableItem item1 = new TableItem(table, SWT.NONE);
		item1.setText("Item1");

Lines 19-27 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/TextObservableValueFocusOutTest.java (-7 / +11 lines)
19	import org.eclipse.core.databinding.observable.IObservable;	19	import org.eclipse.core.databinding.observable.IObservable;
20	import org.eclipse.core.databinding.observable.Realm;	20	import org.eclipse.core.databinding.observable.Realm;
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	21	import org.eclipse.core.databinding.observable.value.IObservableValue;
		22	import org.eclipse.core.databinding.property.PropertyObservables;
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.internal.databinding.swt.TextObservableValue;	25	import org.eclipse.jface.databinding.swt.TextProperties;
25	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.widgets.Shell;	27	import org.eclipse.swt.widgets.Shell;
27	import org.eclipse.swt.widgets.Text;	28	import org.eclipse.swt.widgets.Text;
Lines 31-38 Link Here
31	*/	32	*/
32	public class TextObservableValueFocusOutTest extends TestCase {	33	public class TextObservableValueFocusOutTest extends TestCase {
33	public static Test suite() {	34	public static Test suite() {
34	TestSuite suite = new TestSuite(TextObservableValueFocusOutTest.class.toString());	35	TestSuite suite = new TestSuite(TextObservableValueFocusOutTest.class
35	suite.addTest(SWTMutableObservableValueContractTest.suite(new Delegate()));	36	.toString());
		37	suite.addTest(SWTMutableObservableValueContractTest
		38	.suite(new Delegate()));
36	return suite;	39	return suite;
37	}	40	}
38		41
Lines 41-47 Link Here
41	private Shell shell;	44	private Shell shell;
42		45
43	private Text text;	46	private Text text;
44		47
45	public void setUp() {	48	public void setUp() {
46	shell = new Shell();	49	shell = new Shell();
47	text = new Text(shell, SWT.NONE);	50	text = new Text(shell, SWT.NONE);
Lines 52-58 Link Here
52	}	55	}
53		56
54	public IObservableValue createObservableValue(Realm realm) {	57	public IObservableValue createObservableValue(Realm realm) {
55	return new TextObservableValue(realm, text, SWT.FocusOut);	58	return PropertyObservables.observeValue(realm, text, TextProperties
		59	.text(SWT.FocusOut));
56	}	60	}
57		61
58	public Object getValueType(IObservableValue observable) {	62	public Object getValueType(IObservableValue observable) {
Lines 61-70 Link Here
61		65
62	public void change(IObservable observable) {	66	public void change(IObservable observable) {
63	text.setFocus();	67	text.setFocus();
64		68
65	IObservableValue observableValue = (IObservableValue) observable;	69	IObservableValue observableValue = (IObservableValue) observable;
66	text.setText((String) createValue(observableValue));	70	text.setText((String) createValue(observableValue));
67		71
68	text.notifyListeners(SWT.FocusOut, null);	72	text.notifyListeners(SWT.FocusOut, null);
69	}	73	}
70		74





package org.eclipse.jface.tests.internal.databinding.swt;

import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
import org.eclipse.swt.SWT;


	protected void setUp() throws Exception {
		super.setUp();

		shell = new Shell();
	}


	}

	public void testSetValueEnabled() throws Exception {
		ISWTObservableValue observableValue = SWTObservables
				.observeEnabled(shell);
		Boolean value = Boolean.FALSE;
		observableValue.setValue(value);
		assertFalse(shell.isEnabled());
	}

	public void testGetValueEnabled() throws Exception {
		ISWTObservableValue value = SWTObservables.observeEnabled(shell);
				SWTProperties.ENABLED);
		shell.setEnabled(false);
		assertEquals(Boolean.FALSE, value.getValue());
	}

	public void testGetValueTypeEnabled() throws Exception {
		ISWTObservableValue value = SWTObservables.observeEnabled(shell);
				SWTProperties.ENABLED);
		assertEquals(boolean.class, value.getValueType());
	}

	public void testSetValueVisible() throws Exception {
		ISWTObservableValue value = SWTObservables.observeVisible(shell);
				SWTProperties.VISIBLE);
		value.setValue(Boolean.FALSE);
		assertFalse(shell.isVisible());
	}

	public void testGetValueVisible() throws Exception {
		ISWTObservableValue value = SWTObservables.observeVisible(shell);
				SWTProperties.VISIBLE);
		shell.setVisible(false);
		assertEquals(Boolean.FALSE, value.getValue());
	}

	public void testGetValueTypeVisible() throws Exception {
		ISWTObservableValue value = SWTObservables.observeVisible(shell);
				SWTProperties.VISIBLE);
		assertEquals(Boolean.TYPE, value.getValueType());
	}

	public void testSetValueForeground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeForeground(shell);
				SWTProperties.FOREGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);


	}

	public void testGetValueForeground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeForeground(shell);
				SWTProperties.FOREGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);
		shell.setForeground(color);

	}

	public void testGetValueTypeForgroundColor() throws Exception {
		ISWTObservableValue value = SWTObservables.observeForeground(shell);
				SWTProperties.FOREGROUND);
		assertEquals(Color.class, value.getValueType());
	}

	public void testGetValueBackground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeBackground(shell);
				SWTProperties.BACKGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);
		shell.setBackground(color);

	}

	public void testSetValueBackground() throws Exception {
		ISWTObservableValue value = SWTObservables.observeBackground(shell);
				SWTProperties.BACKGROUND);

		Color color = shell.getDisplay().getSystemColor(SWT.COLOR_BLACK);


	}

	public void testGetValueTypeBackgroundColor() throws Exception {
		ISWTObservableValue value = SWTObservables.observeBackground(shell);
				SWTProperties.BACKGROUND);
		assertEquals(Color.class, value.getValueType());
	}

	public void testGetValueTypeTooltip() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		assertEquals(String.class, value.getValueType());
	}

	public void testSetValueFont() throws Exception {
		ISWTObservableValue value = SWTObservables.observeFont(shell);
				SWTProperties.FONT);

		Font font = JFaceResources.getDialogFont();


	}

	public void testGetValueFont() throws Exception {
		ISWTObservableValue value = SWTObservables.observeFont(shell);
				SWTProperties.FONT);

		Font font = JFaceResources.getDialogFont();
		shell.setFont(font);

	}

	public void testGetValueTypeFont() throws Exception {
		ISWTObservableValue value = SWTObservables.observeFont(shell);
				SWTProperties.FONT);
		assertEquals(Font.class, value.getValueType());
	}

	public void testSetValueTooltipText() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		String text = "text";
		value.setValue(text);
		assertEquals(text, shell.getToolTipText());
	}

	public void testGetValueTooltipText() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		String text = "text";
		shell.setToolTipText(text);
		assertEquals(text, value.getValue());
	}

	public void testGetValueTypeTooltipText() throws Exception {
		ISWTObservableValue value = SWTObservables.observeTooltipText(shell);
				SWTProperties.TOOLTIP_TEXT);
		assertEquals(String.class, value.getValueType());
	}
}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.TextProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;

/**
 * @since 1.1
 */
public class TextEditableObservableValueTest extends ObservableDelegateTest {

	
	private Delegate delegate;
	private Text text;
	private IObservableValue observable;

	public TextEditableObservableValueTest() {
		this(null);
	}

	public TextEditableObservableValueTest(String testName) {
		super(testName, new Delegate());
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see
	 * org.eclipse.jface.conformance.databinding.ObservableDelegateTest#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();

		delegate = (Delegate) getObservableContractDelegate();
		observable = (IObservableValue) getObservable();
		text = delegate.text;
	}

	protected IObservable doCreateObservable() {
		return super.doCreateObservable();
	}

	public void testGetValue() throws Exception {
		text.setEditable(false);
		assertEquals(Boolean.valueOf(text.getEditable()), observable.getValue());

		text.setEditable(true);
		assertEquals(Boolean.valueOf(text.getEditable()), observable.getValue());
	}

	public void testSetValue() throws Exception {
		text.setEditable(false);
		observable.setValue(Boolean.TRUE);
		assertEquals(Boolean.TRUE, Boolean.valueOf(text.getEditable()));

		observable.setValue(Boolean.FALSE);
		assertEquals(Boolean.FALSE, Boolean.valueOf(text.getEditable()));
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(TextEditableObservableValueTest.class
				.toString());
		suite.addTestSuite(TextEditableObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}

	/* package */static class Delegate extends
			AbstractObservableValueContractDelegate {
		private Shell shell;
		Text text;

		public void setUp() {
			shell = new Shell();
			text = new Text(shell, SWT.NONE);
		}

		public void tearDown() {
			shell.dispose();
		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, text, TextProperties
					.editable());
		}

		public Object getValueType(IObservableValue observable) {
			return Boolean.TYPE;
		}

		public void change(IObservable observable) {
			IObservableValue observableValue = (IObservableValue) observable;
			observableValue.setValue(createValue(observableValue));
		}

		public Object createValue(IObservableValue observable) {
			return (Boolean.TRUE.equals(observable.getValue()) ? Boolean.FALSE
					: Boolean.TRUE);
		}
	}
}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.LabelProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;

	private Delegate delegate;
	private IObservableValue observable;
	private Label label;

	public LabelObservableValueTest() {
		this(null);
	}

	public LabelObservableValueTest(String testName) {
		super(testName, new Delegate());
	}

	protected void setUp() throws Exception {
		super.setUp();

		delegate = (Delegate) getObservableContractDelegate();
		observable = (IObservableValue) getObservable();
		label = delegate.label;
	}

	protected IObservable doCreateObservable() {
		return getObservableContractDelegate().createObservable(
				SWTObservables.getRealm(Display.getDefault()));
	}

	public void testSetValue() throws Exception {
		// preconditions
		assertEquals("", label.getText());
		assertEquals("", observable.getValue());

		String value = "value";
		observable.setValue(value);
		assertEquals("label text", value, label.getText());
		assertEquals("observable value", value, observable.getValue());
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(LabelObservableValueTest.class
				.toString());
		suite.addTestSuite(LabelObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}

	/* package */static class Delegate extends

		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, label,
					LabelProperties.text());
		}

		public void change(IObservable observable) {
			IObservableValue value = (IObservableValue) observable;
			value.setValue(value.getValue() + "a");
		}

		public Object getValueType(IObservableValue observable) {
			return String.class;
		}

		public Object createValue(IObservableValue observable) {
			return observable.getValue() + "a";
		}

Lines 14-21 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/TextObservableValueTest.java (-16 / +26 lines)
14		14
15	package org.eclipse.jface.tests.internal.databinding.swt;	15	package org.eclipse.jface.tests.internal.databinding.swt;
16		16
		17	import org.eclipse.core.databinding.observable.value.IObservableValue;
		18	import org.eclipse.core.databinding.property.PropertyObservables;
17	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	19	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
18	import org.eclipse.jface.internal.databinding.swt.TextObservableValue;	20	import org.eclipse.jface.databinding.swt.TextProperties;
19	import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;	21	import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
20	import org.eclipse.swt.SWT;	22	import org.eclipse.swt.SWT;
21	import org.eclipse.swt.widgets.Shell;	23	import org.eclipse.swt.widgets.Shell;
Lines 35-41 Link Here
35		37
36	Shell shell = new Shell();	38	Shell shell = new Shell();
37	text = new Text(shell, SWT.NONE);	39	text = new Text(shell, SWT.NONE);
38		40
39	listener = new ValueChangeEventTracker();	41	listener = new ValueChangeEventTracker();
40	}	42	}
41		43
Lines 45-92 Link Here
45	*/	47	*/
46	public void testConstructorUpdateEventTypes() {	48	public void testConstructorUpdateEventTypes() {
47	try {	49	try {
48	new TextObservableValue(text, SWT.NONE);	50	TextProperties.text(SWT.None);
49	new TextObservableValue(text, SWT.FocusOut);	51	TextProperties.text(SWT.FocusOut);
50	new TextObservableValue(text, SWT.Modify);	52	TextProperties.text(SWT.Modify);
51	assertTrue(true);	53	assertTrue(true);
52	} catch (IllegalArgumentException e) {	54	} catch (IllegalArgumentException e) {
53	fail();	55	fail();
54	}	56	}
55		57
56	try {	58	try {
57	new TextObservableValue(text, SWT.Verify);	59	TextProperties.text(SWT.Verify);
58	fail();	60	fail();
59	} catch (IllegalArgumentException e) {	61	} catch (IllegalArgumentException e) {
60	assertTrue(true);	62	assertTrue(true);
61	}	63	}
62	}	64	}
63		65
64	/**	66	/**
65	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=171132	67	* https://bugs.eclipse.org/bugs/show_bug.cgi?id=171132
66	*	68	*
67	* @throws Exception	69	* @throws Exception
68	*/	70	*/
69	public void testGetValueBeforeFocusOutChangeEventsFire() throws Exception {	71	public void testGetValueBeforeFocusOutChangeEventsFire() throws Exception {
70	TextObservableValue observableValue = new TextObservableValue(text, SWT.FocusOut);	72	IObservableValue observableValue = PropertyObservables.observeValue(
		73	text, TextProperties.text(SWT.FocusOut));
71	observableValue.addValueChangeListener(listener);	74	observableValue.addValueChangeListener(listener);
72		75
73	String a = "a";	76	String a = "a";
74	String b = "b";	77	String b = "b";
75		78
76	text.setText(a);	79	text.setText(a);
77	assertEquals(a, observableValue.getValue()); //fetch the value updating the buffered value	80
78		81	assertEquals(0, listener.count);
		82	assertEquals(a, observableValue.getValue()); // fetch the value updating
		83	// the buffered value
		84	assertEquals(1, listener.count);
		85
79	text.setText(b);	86	text.setText(b);
80	text.notifyListeners(SWT.FocusOut, null);	87
81
82	assertEquals(1, listener.count);	88	assertEquals(1, listener.count);
		89
		90	text.notifyListeners(SWT.FocusOut, null);
		91
		92	assertEquals(2, listener.count);
83	assertEquals(a, listener.event.diff.getOldValue());	93	assertEquals(a, listener.event.diff.getOldValue());
84	assertEquals(b, listener.event.diff.getNewValue());	94	assertEquals(b, listener.event.diff.getNewValue());
85	}	95	}
86		96
87	public void testDispose() throws Exception {	97	public void testDispose() throws Exception {
88	TextObservableValue observableValue = new TextObservableValue(text,	98	IObservableValue observableValue = PropertyObservables.observeValue(
89	SWT.Modify);	99	text, TextProperties.text(SWT.Modify));
90	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();	100	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();
91	observableValue.addValueChangeListener(testCounterValueChangeListener);	101	observableValue.addValueChangeListener(testCounterValueChangeListener);
92		102




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;

/**
 * @since 3.2
 */
public class CComboSingleSelectionObservableValueTest extends
		AbstractSWTTestCase {
	public void testSetValue() throws Exception {
		CCombo combo = new CCombo(getShell(), SWT.NONE);
		IObservableValue observableValue = SWTObservables
				.observeSingleSelectionIndex(combo);
		combo.add("Item1");
		combo.add("Item2");


	}

	public static Test suite() {
		TestSuite suite = new TestSuite(
				CComboSingleSelectionObservableValueTest.class.getName());
		suite.addTestSuite(CComboSingleSelectionObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, combo,
					CComboProperties.singleSelectionIndex());
		}

		public void change(IObservable observable) {
			IObservableValue value = (IObservableValue)observable;
			value.setValue(createValue(value));
			combo.notifyListeners(SWT.Selection, null);
		}

		public Object getValueType(IObservableValue observable) {

		public Object createValue(IObservableValue observable) {
			return new Integer(_createValue(observable));
		}

		private int _createValue(IObservableValue observable) {
			CCombo combo = ((CCombo) ((ISWTObservable) observable).getWidget());
			int value = Math.max(0, combo.getSelectionIndex());

			// returns either 0 or 1 depending upon current value
			return Math.abs(value - 1);
		}
	}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.SpinnerProperties;
import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

	public SpinnerObservableValueMinTest(String testName) {
		super(testName, new Delegate());
	}

	protected void setUp() throws Exception {
		super.setUp();

		delegate = (Delegate) getObservableContractDelegate();
		observable = (IObservableValue) getObservable();
		spinner = delegate.spinner;
	}

	protected IObservable doCreateObservable() {
		return getObservableContractDelegate().createObservable(
				SWTObservables.getRealm(Display.getDefault()));
	}

	public void testGetValue() throws Exception {

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(SpinnerObservableValueMinTest.class
				.toString());
		suite.addTestSuite(SpinnerObservableValueMinTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, spinner,
					SpinnerProperties.minimum());
		}

		public void change(IObservable observable) {




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.SpinnerProperties;
import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

	public SpinnerObservableValueMaxTest(String testName) {
		super(testName, new Delegate());
	}

	protected void setUp() throws Exception {
		super.setUp();


		observable = (IObservableValue) getObservable();
		spinner = delegate.spinner;
	}

	protected IObservable doCreateObservable() {
		return getObservableContractDelegate().createObservable(
				SWTObservables.getRealm(Display.getDefault()));
	}

	public void testGetValue() throws Exception {

		observable.setValue(new Integer(max));
		assertEquals(max, spinner.getMaximum());
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(SpinnerObservableValueMaxTest.class
				.toString());
		suite.addTestSuite(SpinnerObservableValueMaxTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, spinner,
					SpinnerProperties.maximum());
		}

		public void change(IObservable observable) {




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ButtonProperties;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;

 */
public class ButtonObservableValueTest extends AbstractSWTTestCase {
	private Button button;
	private ISWTObservableValue observableValue;
	private ValueChangeEventTracker listener;

	/* (non-Javadoc)
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();

		Shell shell = getShell();
		button = new Button(shell, SWT.CHECK);
		observableValue = SWTObservables.observeSelection(button);
				button);
		listener = new ValueChangeEventTracker();
	}

	public void testSelection_ChangeNotifiesObservable() throws Exception {
		observableValue.addValueChangeListener(listener);
		button.setSelection(true);

		assertEquals("Selection event should notify observable.", 1,
				listener.count);
	}

	public void testSelection_NoChange() throws Exception {
		button.setSelection(true);
		button.notifyListeners(SWT.Selection, null);
		observableValue.addValueChangeListener(listener);

		// precondition
		assertEquals(0, listener.count);

		button.notifyListeners(SWT.Selection, null);
		assertEquals(
				"Value did not change.  Listeners should not have been notified.",
				0, listener.count);
	}

	public void testSetValue_NullConvertedToFalse() {
		button.setSelection(true);
		assertEquals(Boolean.TRUE, observableValue.getValue());

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ButtonObservableValueTest.class
				.getName());
		suite.addTestSuite(ButtonObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, button,
					ButtonProperties.selection());
		}

		public Object getValueType(IObservableValue observable) {

		}

		public void change(IObservable observable) {
			((IObservableValue) observable).setValue(Boolean
					.valueOf(changeValue(button)));
		}

		public Object createValue(IObservableValue observable) {
			return Boolean.valueOf(changeValue(button));
		}

		private boolean changeValue(Button button) {
			return !button.getSelection();
		}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.ScaleProperties;
import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Scale;

		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, scale, ScaleProperties.minimum());
		}

		public void change(IObservable observable) {





package org.eclipse.jface.tests.internal.databinding.swt;

import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.List;

/**
 * @since 3.2
 * 
 */
public class ListSingleSelectionObservableValueTest extends AbstractSWTTestCase {
	public void testSetValue() throws Exception {
		List list = new List(getShell(), SWT.NONE);
		IObservableValue observableValue = SWTObservables
				.observeSingleSelectionIndex(list);
		list.add("Item1");

		assertEquals(-1, list.getSelectionIndex());


	public void testDispose() throws Exception {
		List list = new List(getShell(), SWT.NONE);
		IObservableValue observableValue = SWTObservables
				.observeSingleSelectionIndex(list);
		list.add("Item1");
		list.add("Item2");





import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.ShellProperties;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
import org.eclipse.swt.widgets.Shell;


	String oldValue;
	String newValue;
	Shell shell;
	IObservableValue observable;
	ValueChangeEventTracker tracker;

	protected void setUp() throws Exception {
		super.setUp();
		shell = new Shell();
		observable = SWTObservables.observeText(shell);
		oldValue = "old";
		newValue = "new";
		shell.setText(oldValue);

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ShellObservableValueTest.class
				.toString());
		suite.addTestSuite(ShellObservableValueTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, shell,
					ShellProperties.text());
		}

		public Object getValueType(IObservableValue observable) {




 ******************************************************************************/
package org.eclipse.jface.tests.internal.databinding.swt;

import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;

/**
 * @since 3.2
 * 
 */
public class ComboSingleSelectionObservableValueTest extends
		AbstractSWTTestCase {
	public void testSetValue() throws Exception {
		Combo combo = new Combo(getShell(), SWT.NONE);
		IObservableValue observableValue = SWTObservables
				.observeSingleSelectionIndex(combo);
		combo.add("Item1");
		combo.add("Item2");





import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Display;

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(CComboObservableValueTextTest.class
				.getName());
		suite.addTestSuite(CComboObservableValueTextTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(
					PropertyObservables.observeValue(realm, combo,
							CComboProperties.text()), combo);
		}

		public void change(IObservable observable) {
			IObservableValue ov = (IObservableValue) observable;
			ov.setValue(createValue(ov));
		}

		public Object getValueType(IObservableValue observable) {




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ComboProperties;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Display;

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ComboObservableValueTextTest.class
				.toString());
		suite.addTestSuite(ComboObservableValueTextTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(
					PropertyObservables.observeValue(realm, combo,
							ComboProperties.text()), combo);
		}

		public void change(IObservable observable) {
			((IObservableValue) observable)
					.setValue(createValue((IObservableValue) observable));
		}

		public Object getValueType(IObservableValue observable) {




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.ObservableDelegateTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.swt.SpinnerProperties;
import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;

	private Spinner spinner;

	private IObservableValue observable;

	public SpinnerObservableValueSelectionTest() {
		this(null);
	}

	}

	protected IObservable doCreateObservable() {
		return getObservableContractDelegate().createObservable(
				SWTObservables.getRealm(Display.getDefault()));
	}

	public void testGetValue() throws Exception {

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(
				SpinnerObservableValueSelectionTest.class.toString());
		suite.addTestSuite(SpinnerObservableValueSelectionTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return PropertyObservables.observeValue(realm, spinner,
					SpinnerProperties.selection());
		}

		public void change(IObservable observable) {
			spinner.setSelection(createIntegerValue(
					(IObservableValue) observable).intValue());
							(IObservableValue) observable).intValue());
			spinner.notifyListeners(SWT.Selection, null);
		}


Lines 12-20 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/ComboObservableValueTest.java (-16 / +21 lines)
12		12
13	package org.eclipse.jface.tests.internal.databinding.swt;	13	package org.eclipse.jface.tests.internal.databinding.swt;
14		14
		15	import org.eclipse.core.databinding.observable.value.IObservableValue;
		16	import org.eclipse.core.databinding.property.IValueProperty;
		17	import org.eclipse.core.databinding.property.PropertyObservables;
15	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	18	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
16	import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;	19	import org.eclipse.jface.databinding.swt.ComboProperties;
17	import org.eclipse.jface.internal.databinding.swt.SWTProperties;	20	import org.eclipse.jface.databinding.swt.SWTObservables;
		21	import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
		22	import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
18	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;	23	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
19	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
20	import org.eclipse.swt.widgets.Combo;	25	import org.eclipse.swt.widgets.Combo;
Lines 26-33 Link Here
26	public class ComboObservableValueTest extends AbstractSWTTestCase {	31	public class ComboObservableValueTest extends AbstractSWTTestCase {
27	public void testDispose() throws Exception {	32	public void testDispose() throws Exception {
28	Combo combo = new Combo(getShell(), SWT.NONE);	33	Combo combo = new Combo(getShell(), SWT.NONE);
29	ComboObservableValue observableValue = new ComboObservableValue(combo,	34	IObservableValue observableValue = SWTObservables.observeText(combo);
30	SWTProperties.TEXT);
31	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();	35	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();
32	observableValue.addValueChangeListener(testCounterValueChangeListener);	36	observableValue.addValueChangeListener(testCounterValueChangeListener);
33		37
Lines 51-75 Link Here
51	}	55	}
52		56
53	public void testSetValueWithNull() {	57	public void testSetValueWithNull() {
54	testSetValueWithNull(SWTProperties.TEXT);	58	testSetValueWithNull(ComboProperties.text());
55	testSetValueWithNull(SWTProperties.SELECTION);	59	testSetValueWithNull(ComboProperties.selection());
56	}	60	}
57		61
58	protected void testSetValueWithNull(String observableMode) {	62	protected void testSetValueWithNull(IValueProperty property) {
59	Combo combo = new Combo(getShell(), SWT.NONE);	63	Combo combo = new Combo(getShell(), SWT.NONE);
60	combo.setItems(new String[] {"one", "two", "three"});	64	combo.setItems(new String[] { "one", "two", "three" });
61	ComboObservableValue observable = new ComboObservableValue(	65	IObservableValue observable = PropertyObservables.observeValue(combo,
62	combo, observableMode);	66	property);
63		67
64	observable.doSetValue("two");	68	observable.setValue("two");
65	assertEquals("two", combo.getText());	69	assertEquals("two", combo.getText());
66	if (observableMode.equals(SWTProperties.SELECTION)) {	70	if (property instanceof ComboSelectionProperty) {
67	assertEquals("expect selection at index 1 in mode " + observableMode, 1, combo.getSelectionIndex());	71	assertEquals("expect selection at index 1 in selection mode", 1,
		72	combo.getSelectionIndex());
68	}	73	}
69		74
70	if (observableMode.equals(SWTProperties.TEXT)) {	75	if (property instanceof ComboTextProperty) {
71	observable.doSetValue(null);	76	observable.setValue(null);
72	assertEquals("expect empty text in mode " + observableMode, "", combo.getText());	77	assertEquals("expect empty text in text mode", "", combo.getText());
73	}	78	}
74	}	79	}
75	}	80	}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.CComboProperties;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.widgets.Display;

		IObservableValue observable = (IObservableValue) delegate
				.createObservable(SWTObservables.getRealm(Display.getDefault()));

		ValueChangeEventTracker listener = ValueChangeEventTracker
				.observe(observable);
		combo.select(0);

		assertEquals("Observable was not notified.", 1, listener.count);
	}

	public static Test suite() {
		TestSuite suite = new TestSuite(
				CComboObservableValueSelectionTest.class.getName());
		suite.addTestSuite(CComboObservableValueSelectionTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(PropertyObservables
					.observeValue(realm, combo, CComboProperties
							.selection()), combo);
		}

		public void change(IObservable observable) {
			IObservableValue ov = (IObservableValue) observable;
			ov.setValue(createValue(ov));

			combo.select(index);
		}

		public Object getValueType(IObservableValue observable) {

Lines 13-21 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/CComboObservableValueTest.java (-12 / +15 lines)
13		13
14	package org.eclipse.jface.tests.internal.databinding.swt;	14	package org.eclipse.jface.tests.internal.databinding.swt;
15		15
		16	import org.eclipse.core.databinding.observable.value.IObservableValue;
		17	import org.eclipse.core.databinding.property.IValueProperty;
		18	import org.eclipse.core.databinding.property.PropertyObservables;
16	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;	19	import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
17	import org.eclipse.jface.internal.databinding.swt.CComboObservableValue;	20	import org.eclipse.jface.databinding.swt.CComboProperties;
18	import org.eclipse.jface.internal.databinding.swt.SWTProperties;	21	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
		22	import org.eclipse.jface.databinding.swt.SWTObservables;
19	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;	23	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
20	import org.eclipse.swt.SWT;	24	import org.eclipse.swt.SWT;
21	import org.eclipse.swt.custom.CCombo;	25	import org.eclipse.swt.custom.CCombo;
Lines 26-33 Link Here
26	public class CComboObservableValueTest extends AbstractSWTTestCase {	30	public class CComboObservableValueTest extends AbstractSWTTestCase {
27	public void testDispose() throws Exception {	31	public void testDispose() throws Exception {
28	CCombo combo = new CCombo(getShell(), SWT.NONE);	32	CCombo combo = new CCombo(getShell(), SWT.NONE);
29	CComboObservableValue observableValue = new CComboObservableValue(	33	ISWTObservableValue observableValue = SWTObservables.observeText(combo);
30	combo, SWTProperties.TEXT);
31		34
32	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();	35	ValueChangeEventTracker testCounterValueChangeListener = new ValueChangeEventTracker();
33	observableValue.addValueChangeListener(testCounterValueChangeListener);	36	observableValue.addValueChangeListener(testCounterValueChangeListener);
Lines 52-72 Link Here
52	}	55	}
53		56
54	public void testSetValueWithNull() {	57	public void testSetValueWithNull() {
55	testSetValueWithNull(SWTProperties.TEXT);	58	testSetValueWithNull(CComboProperties.text());
56	testSetValueWithNull(SWTProperties.SELECTION);	59	testSetValueWithNull(CComboProperties.selection());
57	}	60	}
58		61
59	protected void testSetValueWithNull(String observableMode) {	62	protected void testSetValueWithNull(IValueProperty property) {
60	CCombo combo = new CCombo(getShell(), SWT.NONE);	63	CCombo combo = new CCombo(getShell(), SWT.NONE);
61	combo.setItems(new String[] {"one", "two", "three"});	64	combo.setItems(new String[] { "one", "two", "three" });
62	CComboObservableValue observable = new CComboObservableValue(	65	IObservableValue observable = PropertyObservables.observeValue(
63	combo, observableMode);	66	combo, property);
64		67
65	observable.doSetValue("two");	68	observable.setValue("two");
66	assertEquals("two", combo.getText());	69	assertEquals("two", combo.getText());
67	assertEquals(1, combo.getSelectionIndex());	70	assertEquals(1, combo.getSelectionIndex());
68		71
69	observable.doSetValue(null);	72	observable.setValue(null);
70	assertEquals("", combo.getText());	73	assertEquals("", combo.getText());
71	assertEquals(-1, combo.getSelectionIndex());	74	assertEquals(-1, combo.getSelectionIndex());
72	}	75	}

Lines 19-27 Link Here

(-)src/org/eclipse/jface/tests/internal/databinding/swt/TextObservableValueModifyTest.java (-6 / +10 lines)
19	import org.eclipse.core.databinding.observable.IObservable;	19	import org.eclipse.core.databinding.observable.IObservable;
20	import org.eclipse.core.databinding.observable.Realm;	20	import org.eclipse.core.databinding.observable.Realm;
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	21	import org.eclipse.core.databinding.observable.value.IObservableValue;
		22	import org.eclipse.core.databinding.property.PropertyObservables;
22	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;	23	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
23	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;	24	import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
24	import org.eclipse.jface.internal.databinding.swt.TextObservableValue;	25	import org.eclipse.jface.databinding.swt.TextProperties;
25	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.widgets.Shell;	27	import org.eclipse.swt.widgets.Shell;
27	import org.eclipse.swt.widgets.Text;	28	import org.eclipse.swt.widgets.Text;
Lines 31-38 Link Here
31	*/	32	*/
32	public class TextObservableValueModifyTest extends TestCase {	33	public class TextObservableValueModifyTest extends TestCase {
33	public static Test suite() {	34	public static Test suite() {
34	TestSuite suite = new TestSuite(TextObservableValueModifyTest.class.toString());	35	TestSuite suite = new TestSuite(TextObservableValueModifyTest.class
35	suite.addTest(SWTMutableObservableValueContractTest.suite(new Delegate()));	36	.toString());
		37	suite.addTest(SWTMutableObservableValueContractTest
		38	.suite(new Delegate()));
36	return suite;	39	return suite;
37	}	40	}
38		41
Lines 41-47 Link Here
41	private Shell shell;	44	private Shell shell;
42		45
43	private Text text;	46	private Text text;
44		47
45	public void setUp() {	48	public void setUp() {
46	shell = new Shell();	49	shell = new Shell();
47	text = new Text(shell, SWT.NONE);	50	text = new Text(shell, SWT.NONE);
Lines 52-58 Link Here
52	}	55	}
53		56
54	public IObservableValue createObservableValue(Realm realm) {	57	public IObservableValue createObservableValue(Realm realm) {
55	return new TextObservableValue(realm, text, SWT.Modify);	58	return PropertyObservables.observeValue(realm, text, TextProperties
		59	.text(SWT.Modify));
56	}	60	}
57		61
58	public Object getValueType(IObservableValue observable) {	62	public Object getValueType(IObservableValue observable) {
Lines 61-67 Link Here
61		65
62	public void change(IObservable observable) {	66	public void change(IObservable observable) {
63	text.setFocus();	67	text.setFocus();
64		68
65	IObservableValue observableValue = (IObservableValue) observable;	69	IObservableValue observableValue = (IObservableValue) observable;
66	text.setText((String) createValue(observableValue));	70	text.setText((String) createValue(observableValue));
67	}	71	}




import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.swt.SWTMutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.util.ValueChangeEventTracker;
import org.eclipse.jface.databinding.swt.ComboProperties;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
import org.eclipse.jface.internal.databinding.swt.SWTProperties;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Display;


/**
 * @since 3.2
 * 
 */
public class ComboObservableValueSelectionTest extends TestCase {
	private Delegate delegate;

	}

	public static Test suite() {
		TestSuite suite = new TestSuite(ComboObservableValueSelectionTest.class
				.toString());
		suite.addTestSuite(ComboObservableValueSelectionTest.class);
		suite.addTest(SWTMutableObservableValueContractTest
				.suite(new Delegate()));
		return suite;
	}


		}

		public IObservableValue createObservableValue(Realm realm) {
			return new SWTObservableValueDecorator(PropertyObservables
					.observeValue(realm, combo, ComboProperties
							.selection()), combo);
		}

		public void change(IObservable observable) {
			int index = combo
					.indexOf((String) createValue((IObservableValue) observable));

			((IObservableValue) observable).setValue(combo.getItem(index));
			combo.notifyListeners(SWT.Selection, null);
		}

		public Object getValueType(IObservableValue observable) {





package org.eclipse.jface.tests.databinding.swt;

import org.eclipse.core.databinding.observable.IDecoratingObservable;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.property.IPropertyObservable;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
import org.eclipse.jface.databinding.conformance.util.RealmTester;
import org.eclipse.jface.databinding.swt.ISWTObservable;
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;
import org.eclipse.jface.internal.databinding.swt.CLabelTextProperty;
import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
import org.eclipse.jface.internal.databinding.swt.LabelTextProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.ScaleSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMaximumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerMinimumProperty;
import org.eclipse.jface.internal.databinding.swt.SpinnerSelectionProperty;
import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionIndexProperty;
import org.eclipse.jface.internal.databinding.swt.TextEditableProperty;
import org.eclipse.jface.internal.databinding.swt.TextTextProperty;
import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;


	protected void setUp() throws Exception {
		super.setUp();

		shell = getShell();
		RealmTester.setDefault(SWTObservables.getRealm(shell.getDisplay()));
	}

	protected void tearDown() throws Exception {
		super.tearDown();

		RealmTester.setDefault(null);
	}


		Spinner spinner = new Spinner(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(spinner);
		assertNotNull(value);
		assertTrue(value.getWidget() == spinner);

		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof SpinnerSelectionProperty);
	}

	public void testObserveSelectionOfButton() throws Exception {
		Button button = new Button(shell, SWT.PUSH);
		ISWTObservableValue value = SWTObservables.observeSelection(button);
		assertNotNull(value);
		assertTrue(value.getWidget() == button);
	}

	public void testObserveSelectionOfCombo() throws Exception {
		Combo combo = new Combo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof ComboSelectionProperty);
	}

	public void testObserveSelectionOfCCombo() throws Exception {
		CCombo combo = new CCombo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		IPropertyObservable property = getPropertyObservable(value);
		assertTrue(property.getProperty() instanceof CComboSelectionProperty);
	}

	public void testObserveSelectionOfList() throws Exception {
		List list = new List(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(list);
		assertNotNull(value);
		assertTrue(value.getWidget() == list);
	}

	public void testObserveSelectionOfScale() throws Exception {
		Scale scale = new Scale(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeSelection(scale);
		assertNotNull(value);
		assertTrue(value.getWidget() == scale);

		IPropertyObservable property = getPropertyObservable(value);
		assertTrue(property.getProperty() instanceof ScaleSelectionProperty);
	}

	public void testObserveSelectionOfUnsupportedControl() throws Exception {

		ISWTObservableValue value = SWTObservables.observeText(text,
				SWT.FocusOut);
		assertNotNull(value);
		assertTrue(value.getWidget() == text);
		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof TextTextProperty);

		assertFalse(text.isListening(SWT.FocusOut));
		ChangeEventTracker.observe(value);
		assertTrue(text.isListening(SWT.FocusOut));
	}


		Label label = new Label(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeText(label);
		assertNotNull(label);
		assertTrue(value.getWidget() == label);
		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof LabelTextProperty);
	}

	public void testObserveTextOfCLabel() throws Exception {
		CLabel label = new CLabel(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeText(label);
		assertNotNull(label);
		assertTrue(value.getWidget() == label);
		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof CLabelTextProperty);
	}

	public void testObserveTextOfCombo() throws Exception {
		Combo combo = new Combo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeText(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		assertTrue(getPropertyObservable(value).getProperty() instanceof ComboTextProperty);
	}

	/**
	 * @param observable
	 * @return
	 */
	private IPropertyObservable getPropertyObservable(
			ISWTObservableValue observable) {
		IDecoratingObservable decoratingObservable = (IDecoratingObservable) observable;
		IPropertyObservable propertyObservable = (IPropertyObservable) decoratingObservable
				.getDecorated();
		return propertyObservable;
	}

	public void testObserveTextOfCCombo() throws Exception {
		CCombo combo = new CCombo(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeText(combo);
		assertNotNull(value);
		assertTrue(value.getWidget() == combo);

		IDecoratingObservable decorating = (IDecoratingObservable) value;
		IPropertyObservable property = (IPropertyObservable) decorating
				.getDecorated();
		assertTrue(property.getProperty() instanceof CComboTextProperty);
	}

	public void testObserveTextOfUnsupportedControl() throws Exception {

		Combo combo = new Combo(shell, SWT.NONE);
		IObservableList list = SWTObservables.observeItems(combo);
		assertNotNull(list);
		assertTrue(list instanceof ISWTObservable);
		assertTrue(((ISWTObservable) list).getWidget() == combo);
	}

	public void testObserveItemsOfCCombo() throws Exception {
		CCombo ccombo = new CCombo(shell, SWT.NONE);
		IObservableList list = SWTObservables.observeItems(ccombo);
		assertNotNull(list);
		ISWTObservable swtObservable = (ISWTObservable) list;
		assertTrue(swtObservable.getWidget() == ccombo);
	}

	public void testObserveItemsOfList() throws Exception {
		List list = new List(shell, SWT.NONE);
		IObservableList observableList = SWTObservables.observeItems(list);
		assertNotNull(observableList);
		ISWTObservable swtObservable = (ISWTObservable) observableList;
		assertTrue(swtObservable.getWidget() == list);
	}

	public void testObserveItemsOfUnsupportedControl() throws Exception {

		ISWTObservableValue value = SWTObservables
				.observeSingleSelectionIndex(table);
		assertNotNull(value);
		assertTrue(value.getWidget() == table);
		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof TableSingleSelectionIndexProperty);
	}

	public void testObserveSingleSelectionIndexOfUnsupportedControl()


		}
	}

	public void testObserveMinOfSpinner() throws Exception {
		Spinner spinner = new Spinner(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMin(spinner);
		assertNotNull(value);
		assertTrue(value.getWidget() == spinner);

		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof SpinnerMinimumProperty);
	}

	public void testObserveMinOfScale() throws Exception {
		Scale scale = new Scale(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMin(scale);
		assertNotNull(value);
		assertTrue(value.getWidget() == scale);

		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof ScaleMinimumProperty);
	}

	public void testObserveMinOfUnsupportedControl() throws Exception {

		try {
			SWTObservables.observeMin(text);
			fail("Exception should have been thrown");
		} catch (IllegalArgumentException e) {
		}
	}

	public void testObserveMaxOfSpinner() throws Exception {
		Spinner spinner = new Spinner(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMax(spinner);
		assertNotNull(value);
		assertTrue(value.getWidget() == spinner);

		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof SpinnerMaximumProperty);
	}

	public void testObserveMaxOfScale() throws Exception {
		Scale scale = new Scale(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeMax(scale);
		assertNotNull(value);
		assertTrue(value.getWidget() == scale);

		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof ScaleMaximumProperty);
	}

	public void testObserveMaxOfUnsupportedControl() throws Exception {
		Text text = new Text(shell, SWT.NONE);
		try {

		} catch (IllegalArgumentException e) {
		}
	}

	public void testObserveEditableOfText() throws Exception {
		Text text = new Text(shell, SWT.NONE);
		ISWTObservableValue value = SWTObservables.observeEditable(text);
		assertNotNull(value);
		assertTrue(value.getWidget() == text);
		IPropertyObservable propertyObservable = getPropertyObservable(value);
		assertTrue(propertyObservable.getProperty() instanceof TextEditableProperty);
	}

	public void testObserveEditableOfUnsupportedControl() throws Exception {
		Label label = new Label(shell, SWT.NONE);
		try {




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 221351, 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListChangeEvent;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker;

 */
public class JavaBeanObservableArrayBasedListTest extends
		AbstractDefaultRealmTestCase {
	private IObservableList list;
	private IBeanObservable beanObservable;

	private PropertyDescriptor propertyDescriptor;


		super.setUp();

		propertyName = "array";
		propertyDescriptor = ((IBeanProperty) BeanProperties.listProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		bean = new Bean(new Object[0]);

		list = BeansObservables.observeList(SWTObservables.getRealm(Display
				.getDefault()), bean, propertyName);
		beanObservable = (IBeanObservable) list;
	}

	public void testGetObserved() throws Exception {
		assertSame(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testRegistersListenerAfterFirstListenerIsAdded()

	}

	public void testRemoveAll() throws Exception {
		list.addAll(Arrays.asList(new String[] { "1", "2", "3", "4" }));
		list.addAll(elements);
		list.addAll(elements);

		assertEquals(4, bean.getArray().length);

		list.removeAll(Arrays.asList(new String[] { "2", "4" }));

		assertEquals(2, bean.getArray().length);
		assertEquals("1", bean.getArray()[0]);
		assertEquals("3", bean.getArray()[1]);
	}

	public void testRemoveAllListChangeEvent() throws Exception {

		PropertyChangeEvent event = listener.evt;
		assertEquals("event did not fire", 1, listener.count);
		assertEquals("array", event.getPropertyName());
		assertTrue("old value", Arrays.equals(old, (Object[]) event
				.getOldValue()));
		assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event
				.getNewValue()));
		assertFalse("lists are equal", Arrays.equals(bean.getArray(), old));
	}



		PropertyChangeEvent evt;

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
		 */
		public void propertyChange(PropertyChangeEvent evt) {
			count++;
			this.evt = evt;

		public IObservableCollection createObservableCollection(Realm realm,
				int elementCount) {
			String propertyName = "array";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
			Object bean = new Bean(new Object[0]);

			IObservableList list = BeansObservables.observeList(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				list.add(createElement(list));
			return list;




import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.swt.SWTObservables;

public class BeanObservableListDecoratorTest extends TestCase {
	private Bean bean;
	private PropertyDescriptor propertyDescriptor;
	private IObservableList observableList;
	private BeanObservableListDecorator decorator;

	/*
	 * (non-Javadoc)
	 * 
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();
		
		bean = new Bean();
		propertyDescriptor = new PropertyDescriptor(
				"list", Bean.class,"getList","setList");
		observableList = BeansObservables.observeList(
				SWTObservables.getRealm(Display.getDefault()), bean, "list");
				propertyDescriptor, Bean.class);
		decorator = new BeanObservableListDecorator(observableList, propertyDescriptor);
	}

	public void testGetDelegate() throws Exception {
		assertSame(observableList, decorator.getDecorated());
	}

	public void testGetObserved() throws Exception {
		assertSame(bean, decorator.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertSame(propertyDescriptor, decorator.getPropertyDescriptor());
	}

	public static Test suite() {




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 221351, 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListChangeEvent;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;

 * @since 1.1
 */
public class JavaBeanObservableListTest extends AbstractDefaultRealmTestCase {
	private IObservableList list;
	private IBeanObservable beanObservable;

	private PropertyDescriptor propertyDescriptor;


		super.setUp();

		propertyName = "list";
		propertyDescriptor = ((IBeanProperty) BeanProperties.listProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		bean = new Bean(new ArrayList());

		list = BeansObservables.observeList(SWTObservables.getRealm(Display
				.getDefault()), bean, propertyName);
		beanObservable = (IBeanObservable) list;
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testRegistersListenerAfterFirstListenerIsAdded()

	}

	public void testRemoveAll() throws Exception {
		list.addAll(Arrays.asList(new String[] { "1", "2", "3", "4" }));
		list.addAll(elements);
		list.addAll(elements);

		assertEquals(4, bean.getList().size());

		list.removeAll(Arrays.asList(new String[] { "2", "4" }));

		assertEquals(2, bean.getList().size());
		assertEquals("1", bean.getList().get(0));
		assertEquals("3", bean.getList().get(1));
	}

	public void testRemoveAllListChangeEvent() throws Exception {


	public void testConstructor_RegistersListener() throws Exception {
		Bean bean = new Bean();
		IObservableList observable = BeansObservables.observeList(Realm
				.getDefault(), bean, "list");
				new PropertyDescriptor("list", Bean.class), Bean.class);

		assertFalse(bean.hasListeners("list"));
		ChangeEventTracker.observe(observable);


	public void testConstructor_SkipsRegisterListener() throws Exception {
		Bean bean = new Bean();
		IObservableList observable = PojoObservables.observeList(Realm
				.getDefault(), bean, "list");
				new PropertyDescriptor("list", Bean.class), Bean.class, false);

		assertFalse(bean.hasListeners("list"));
		ChangeEventTracker.observe(observable);


		PropertyChangeEvent evt;

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
		 */
		public void propertyChange(PropertyChangeEvent evt) {
			count++;
			this.evt = evt;

		public IObservableCollection createObservableCollection(Realm realm,
				int elementCount) {
			String propertyName = "list";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
			Object bean = new Bean(new ArrayList());

			IObservableList list = BeansObservables.observeList(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				list.add(createElement(list));
			return list;





import java.beans.PropertyDescriptor;

import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
import org.eclipse.swt.widgets.Display;

/**
 * @since 3.3
 */
public class BeanObservableValueDecoratorTest extends
		AbstractDefaultRealmTestCase {
	private Bean bean;
	private IObservableValue observableValue;
	private BeanObservableValueDecorator decorator;
	private PropertyDescriptor propertyDescriptor;

	/*
	 * (non-Javadoc)
	 * 
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();

		bean = new Bean();
		propertyDescriptor = new PropertyDescriptor("value", Bean.class);
		observableValue = BeansObservables.observeValue(SWTObservables
				.getRealm(Display.getDefault()), bean, "value");
		decorator = new BeanObservableValueDecorator(observableValue,
				propertyDescriptor);
		decorator = new BeanObservableValueDecorator(
				observableValue, observableValue
						.getPropertyDescriptor());
	}

	public void testGetDelegate() throws Exception {
		assertSame(observableValue, decorator.getDecorated());
	}

	public void testGetObserved() throws Exception {
		assertSame(bean, decorator.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertSame(propertyDescriptor, decorator.getPropertyDescriptor());
	}
}




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Matthew Hall - bugs 213145, 241585, 194734
 *******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.IMapChangeListener;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.map.MapChangeEvent;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.observable.set.WritableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.tests.databinding.observable.ThreadRealm;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
import org.eclipse.jface.databinding.conformance.util.CurrentRealm;


	private PropertyDescriptor propertyDescriptor;

	private IObservableMap map;
	private IBeanObservable beanObservable;

	protected void setUp() throws Exception {
		ThreadRealm realm = new ThreadRealm();

		set.add(model1);
		set.add(model2);

		String propertyName = "value";
		propertyDescriptor = ((IBeanProperty) BeanProperties.valueProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		map = BeansObservables.observeMap(set, Bean.class, propertyName);
		beanObservable = (IBeanObservable) map;
	}

	public void testGetValue() throws Exception {

	}
	
	public void testGetObserved() throws Exception {
		assertEquals(set, beanObservable.getObserved());
	}
	
	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}
	
	public void testConstructor_SkipRegisterListeners() throws Exception {

		Bean bean = new Bean();
		set.add(bean);
		
		IObservableMap observable = PojoObservables.observeMap(set, Bean.class,
				"value");
		assertFalse(bean.hasListeners("value"));
		ChangeEventTracker.observe(observable);

		assertFalse(bean.hasListeners("value"));

		Bean bean = new Bean();
		set.add(bean);
		
		IObservableMap observable = BeansObservables.observeMap(set,
				Bean.class, "value");
		assertFalse(bean.hasListeners("value"));
		ChangeEventTracker.observe(observable);

		assertTrue(bean.hasListeners("value"));




 *     Brad Reynolds - initial API and implementation
 *     Brad Reynolds - bug 171616
 *     Katarzyna Marszalek - test case for bug 198519
 *     Matthew Hall - bugs 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.ChangeEvent;
import org.eclipse.core.databinding.observable.IChangeListener;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.ComputedValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.jface.databinding.conformance.MutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;

 */
public class JavaBeanObservableValueTest extends AbstractDefaultRealmTestCase {
	private Bean bean;
	private IObservableValue observableValue;
	private IBeanObservable beanObservable;
	private PropertyDescriptor propertyDescriptor;
	private String propertyName;

	/* (non-Javadoc)
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();
		
		bean = new Bean();
		propertyName = "value";
		propertyDescriptor = ((IBeanProperty) BeanProperties.valueProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		observableValue = BeansObservables.observeValue(bean, propertyName);
		beanObservable = (IBeanObservable) observableValue;
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
    	assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testSetValueThrowsExceptionThrownByBean() throws Exception {
		ThrowsSetException temp = new ThrowsSetException();
		IObservableValue observable = BeansObservables.observeValue(temp,
				"value");
				new PropertyDescriptor("value", ThrowsSetException.class));

		try {
			observable.setValue("");

	
	public void testGetValueThrowsExceptionThrownByBean() throws Exception {
		ThrowsGetException temp = new ThrowsGetException();
		IObservableValue observable = BeansObservables.observeValue(temp,
				"value");
				new PropertyDescriptor("value", ThrowsGetException.class));

		try {
			observable.getValue();

	}

	public void testConstructor_RegistersListeners() throws Exception {
		IObservableValue observable = BeansObservables.observeValue(bean,
				propertyName);
		ChangeEventTracker.observe(observable);
		
		assertTrue(bean.hasListeners(propertyName));
	}
	
	public void testConstructor_SkipRegisterListeners() throws Exception {
		IObservableValue observable = PojoObservables.observeValue(bean,
				propertyName);
		ChangeEventTracker.observe(observable);
		
		assertFalse(bean.hasListeners(propertyName));

		}
		
		public IObservableValue createObservableValue(Realm realm) {
			return BeansObservables.observeValue(realm, bean, "value");
				PropertyDescriptor propertyDescriptor = new PropertyDescriptor("value", Bean.class);
				return new JavaBeanObservableValue(realm, bean,
						propertyDescriptor);					
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
		}
		
		public void change(IObservable observable) {




 *
 * Contributors:
 *     Brad Reynolds - initial API and implementation
 *     Matthew Hall - bugs 221351, 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.util.Arrays;
import java.util.HashSet;

import junit.framework.TestCase;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.ISetChangeListener;
import org.eclipse.core.databinding.observable.set.SetChangeEvent;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.jface.databinding.conformance.MutableObservableSetContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;

 * @since 3.3
 */
public class JavaBeanObservableSetTest extends TestCase {
	private IObservableSet observableSet;
	private IBeanObservable beanObservable;
	private Bean bean;
	private PropertyDescriptor propertyDescriptor;
	private String propertyName;
	private SetChangeListener listener;

	/*
	 * (non-Javadoc)
	 * 
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		bean = new Bean();
		propertyName = "set";
		propertyDescriptor = ((IBeanProperty) BeanProperties.setProperty(
				Bean.class, propertyName)).getPropertyDescriptor();

		observableSet = BeansObservables
				.observeSet(SWTObservables.getRealm(Display.getDefault()),
						bean, propertyName, Bean.class);
		beanObservable = (IBeanObservable) observableSet;
		listener = new SetChangeListener();
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}
	
	public void testGetElementType() throws Exception {

	public void testConstructor_RegisterListeners() throws Exception {
		bean = new Bean();

		observableSet = BeansObservables.observeSet(new CurrentRealm(true),
				bean, propertyName);
		assertFalse(bean.hasListeners(propertyName));
		ChangeEventTracker.observe(observableSet);
		assertTrue(bean.hasListeners(propertyName));

	public void testConstructor_SkipsRegisterListeners() throws Exception {
		bean = new Bean();

		observableSet = PojoObservables.observeSet(new CurrentRealm(true),
				bean, propertyName);
		assertFalse(bean.hasListeners(propertyName));
		ChangeEventTracker.observe(observableSet);
		assertFalse(bean.hasListeners(propertyName));

				int elementCount) {
			Bean bean = new Bean();
			String propertyName = "set";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}

			IObservableSet set = BeansObservables.observeSet(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				set.add(createElement(set));
			return set;





import junit.framework.TestCase;

import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Display;


 */
public class BeanObservableSetDecoratorTest extends TestCase {
	private PropertyDescriptor propertyDescriptor;
	private IObservableSet observableSet;
	private BeanObservableSetDecorator decorator;
	private Bean bean;

	/*
	 * (non-Javadoc)
	 * 
	 * @see junit.framework.TestCase#setUp()
	 */
	protected void setUp() throws Exception {
		super.setUp();

		bean = new Bean();
		propertyDescriptor = new PropertyDescriptor("set", Bean.class);
		observableSet = BeansObservables.observeSet(SWTObservables
				.getRealm(Display.getDefault()), bean, "set");
		decorator = new BeanObservableSetDecorator(observableSet,
				propertyDescriptor);
		decorator = new BeanObservableSetDecorator(
				observableSet, propertyDescriptor);
	}

	public void testGetDecorated() throws Exception {
		assertSame(observableSet, decorator.getDecorated());
	}

	public void testGetObserved() throws Exception {
		assertSame(bean, decorator.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertSame(propertyDescriptor, decorator.getPropertyDescriptor());
	}
}




 * Contributors:
 *     Matthew Hall - initial API and implementation (bug 221351)
 *     Brad Reynolds - through JavaBeanObservableArrayBasedListTest.java
 *     Matthew Hall - bugs 213145, 194734
 ******************************************************************************/

package org.eclipse.core.tests.internal.databinding.beans;

import java.beans.IntrospectionException;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;

import junit.framework.Test;
import junit.framework.TestSuite;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.IObservable;
import org.eclipse.core.databinding.observable.IObservableCollection;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.SetChangeEvent;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.jface.databinding.conformance.MutableObservableSetContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
import org.eclipse.jface.databinding.conformance.util.SetChangeEventTracker;

 */
public class JavaBeanObservableArrayBasedSetTest extends
		AbstractDefaultRealmTestCase {
	private IObservableSet set;
	private IBeanObservable beanObservable;

	private PropertyDescriptor propertyDescriptor;


		super.setUp();

		propertyName = "array";
		propertyDescriptor = ((IBeanProperty) BeanProperties.setProperty(
				Bean.class, propertyName)).getPropertyDescriptor();
		bean = new Bean(new HashSet());

		set = BeansObservables.observeSet(SWTObservables.getRealm(Display
				.getDefault()), bean, propertyName);
		beanObservable = (IBeanObservable) set;
	}

	public void testGetObserved() throws Exception {
		assertEquals(bean, beanObservable.getObserved());
	}

	public void testGetPropertyDescriptor() throws Exception {
		assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
	}

	public void testRegistersListenerAfterFirstListenerIsAdded()

		assertEquals("array", event.getPropertyName());
		assertTrue("old value", Arrays.equals(old, (Object[]) event
				.getOldValue()));
		assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event
				.getNewValue()));
		assertFalse("lists are equal", Arrays.equals(bean.getArray(), old));
	}



		PropertyChangeEvent evt;

		/*
		 * (non-Javadoc)
		 * 
		 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
		 */
		public void propertyChange(PropertyChangeEvent evt) {
			count++;
			this.evt = evt;

		public IObservableCollection createObservableCollection(Realm realm,
				int elementCount) {
			String propertyName = "array";
			PropertyDescriptor propertyDescriptor;
			try {
				propertyDescriptor = new PropertyDescriptor(propertyName,
						Bean.class);
			} catch (IntrospectionException e) {
				throw new RuntimeException(e);
			}
			Object bean = new Bean(new Object[0]);

			IObservableSet list = BeansObservables.observeSet(realm, bean,
					propertyName, String.class);
			for (int i = 0; i < elementCount; i++)
				list.add(createElement(list));
			return list;




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Matthew Hall - bug 194734
 *******************************************************************************/

package org.eclipse.core.tests.databinding.beans;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.beans.PojoObservables;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;

import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.WritableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.core.tests.internal.databinding.beans.Bean;
import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
import org.eclipse.jface.databinding.conformance.util.CurrentRealm;

		propertyName = "value";
	}

	public void testObserveValue_ReturnsIBeanObservable()
			throws Exception {
		IObservableValue value = PojoObservables.observeValue(pojo, propertyName);

		assertNotNull(value);
		assertTrue(value instanceof IBeanObservable);
	}

	public void testObserveValue_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners(propertyName));
	}

	public void testObservableValueWithRealm_ReturnsIBeanObservable()
			throws Exception {
		CurrentRealm realm = new CurrentRealm(true);
		IObservableValue value = PojoObservables.observeValue(realm, pojo,
				propertyName);

		assertNotNull(value);
		assertTrue(value instanceof IBeanObservable);
	}

	public void testObservableMap_ReturnsIBeanObservable()
			throws Exception {
		IObservableSet set = new WritableSet();
		set.add(new Bean());

		IObservableMap map = PojoObservables.observeMap(set, Bean.class,
				propertyName);
		assertNotNull(map);
		assertTrue(map instanceof IBeanObservable);
	}
	
	public void testObservableMap_DoesNotAttachListeners() throws Exception {

		assertEquals(2, maps.length);
	}
	
	public void testObserveListWithElementType_ReturnsIBeanObservable() throws Exception {
		IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);
		assertTrue(list instanceof IBeanObservable);
	}
	
	public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners("list"));
	}
	
	public void testObserveList_ReturnsIBeanObservable() throws Exception {
		IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");
		assertTrue(observable instanceof IBeanObservable);
	}
	
	public void testObserveList_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners("list"));
	}
	
	public void testObserveSetWithElementType_ReturnsIBeanObservable() throws Exception {
		IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);
		assertTrue(list instanceof IBeanObservable);
	}
	
	public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {

		assertFalse(pojo.hasListeners("set"));
	}
	
	public void testObserveSet_ReturnsIBeanObservable() throws Exception {
		IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");
		assertTrue(list instanceof IBeanObservable);
	}
	
	public void testObserveSet_DoesNotAttachListeners() throws Exception {

Lines 66-72 Link Here

(-)src/org/eclipse/jface/tests/databinding/scenarios/ButtonControlScenario.java (-1 lines)
66	adventure.setPetsAllowed(finalNewBoolean);	66	adventure.setPetsAllowed(finalNewBoolean);
67	spinEventLoop(0);	67	spinEventLoop(0);
68	assertEquals(newBoolean, button.getSelection());	68	assertEquals(newBoolean, button.getSelection());
69
70	}	69	}
71		70
72	public void testScenario02() {	71	public void testScenario02() {




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;

import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.ComputedObservableMap;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.util.Policy;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableMap extends ComputedObservableMap implements
		IBeanObservable {

	private PropertyDescriptor propertyDescriptor;
	
	private PropertyChangeListener elementListener = new PropertyChangeListener() {
		public void propertyChange(final java.beans.PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						fireMapChange(Diffs.createMapDiffSingleChange(
								event.getSource(), event.getOldValue(), event
								.getNewValue()));
					}
				});
			}
		}
	};

	private ListenerSupport listenerSupport;

	private boolean updating = false;

	private boolean attachListeners;

	/**
	 * @param domain
	 * @param propertyDescriptor
	 */
	public JavaBeanObservableMap(IObservableSet domain,
			PropertyDescriptor propertyDescriptor) {
		this(domain, propertyDescriptor, true);
	}

	/**
	 * @param domain
	 * @param propertyDescriptor
	 * @param attachListeners
	 */
	public JavaBeanObservableMap(IObservableSet domain,
			PropertyDescriptor propertyDescriptor, boolean attachListeners) {
		super(domain);

		this.propertyDescriptor = propertyDescriptor;
		this.attachListeners = attachListeners;
		if (attachListeners) {
			this.listenerSupport = new ListenerSupport(elementListener,
					propertyDescriptor.getName());
		}
		init();
	}

	protected void hookListener(Object domainElement) {
		if (attachListeners && domainElement != null) {
			listenerSupport.hookListener(domainElement);
		}
	}

	protected void unhookListener(Object domainElement) {
		if (attachListeners && domainElement != null) {
			listenerSupport.unhookListener(domainElement);
		}
	}

	protected Object doGet(Object key) {
		if (key == null) {
			return null;
		}
		try {
			Method readMethod = propertyDescriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(key, new Object[0]);
		} catch (Exception e) {
			Policy.getLog().log(
					new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
							IStatus.ERROR, "cannot get value", e)); //$NON-NLS-1$
			throw new RuntimeException(e);
		}
	}

	protected Object doPut(Object key, Object value) {
		try {
			Object oldValue = get(key);
			propertyDescriptor.getWriteMethod().invoke(key,
					new Object[] { value });
			keySet().add(key);
			return oldValue;
		} catch (Exception e) {
			Policy.getLog().log(
					new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
							IStatus.ERROR, "cannot set value", e)); //$NON-NLS-1$
			throw new RuntimeException(e);
		}
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
	 */
	public Object getObserved() {
		return keySet();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
	 */
	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}
}




/*******************************************************************************
 * Copyright (c) 2006-2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 171616
 *     Matthew Hall - bugs 208858, 221351, 213145, 223164
 *     Mike Evans - bug 217558
 *******************************************************************************/

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.databinding.observable.list.ObservableList;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableList extends ObservableList implements
		IBeanObservable {

	private final Object object;

	private PropertyChangeListener collectionListener = new PropertyChangeListener() {
		public void propertyChange(java.beans.PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						updateWrappedList( new ArrayList( Arrays.asList(getValues() ) ) );
					}
				});
			}
		}
	};

	private boolean updating = false;

	private PropertyDescriptor descriptor;

	private ListenerSupport collectionListenSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 */
	public JavaBeanObservableList(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType) {
		this(realm, object, descriptor, elementType, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 * @param attachListeners
	 */
	public JavaBeanObservableList(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType,
			boolean attachListeners) {

		super(realm, new ArrayList(), elementType);
		this.object = object;
		this.descriptor = descriptor;
		this.attachListeners = attachListeners;

		if (attachListeners) {
			this.collectionListenSupport = new ListenerSupport(
					collectionListener, descriptor.getName());
		}

		// initialize list without firing events
		wrappedList.addAll(Arrays.asList(getValues()));
	}

	protected void firstListenerAdded() {
		if (attachListeners) {
			collectionListenSupport.hookListener(this.object);
		}
	}

	protected void lastListenerRemoved() {
		if (collectionListenSupport != null) {
			collectionListenSupport.dispose();
		}
	}

	public void dispose() {
		super.dispose();
		lastListenerRemoved();
	}

	private Object primGetValues() {
		Exception ex = null;
		try {
			Method readMethod = descriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, new Object[0]);
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not read collection values", ex); //$NON-NLS-1$
	}

	private Object[] getValues() {
		Object[] values = null;

		Object result = primGetValues();
		if (descriptor.getPropertyType().isArray())
			values = (Object[]) result;
		else {
			// TODO add jUnit for POJO (var. SettableValue) collections
			Collection list = (Collection) result;
			if (list != null) {
				values = list.toArray();
			}
		}
		if (values == null)
			values = new Object[0];
		return values;
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return descriptor;
	}

	private void setValues() {
		if (descriptor.getPropertyType().isArray()) {
			Class componentType = descriptor.getPropertyType()
					.getComponentType();
			Object[] newArray = (Object[]) Array.newInstance(componentType,
					wrappedList.size());
			wrappedList.toArray(newArray);
			primSetValues(newArray);
		} else {
			// assume that it is a java.util.List
			primSetValues(new ArrayList(wrappedList));
		}
	}

	private void primSetValues(Object newValue) {
		Exception ex = null;
		try {
			Method writeMethod = descriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { newValue });
			return;
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
	}

	public Object set(int index, Object element) {
		getterCalled();
		updating = true;
		try {
			Object oldElement = wrappedList.set(index, element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, false, oldElement), Diffs.createListDiffEntry(index,
					true, element)));
			return oldElement;
		} finally {
			updating = false;
		}
	}

	public Object move(int oldIndex, int newIndex) {
		getterCalled();
		updating = true;
		try {
			int size = wrappedList.size();
			if (oldIndex < 0 || oldIndex >= size)
				throw new IndexOutOfBoundsException(
						"oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
			if (newIndex < 0 || newIndex >= size)
				throw new IndexOutOfBoundsException(
						"newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
			if (oldIndex == newIndex)
				return wrappedList.get(oldIndex);
			Object element = wrappedList.remove(oldIndex);
			wrappedList.add(newIndex, element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					oldIndex, false, element), Diffs.createListDiffEntry(
					newIndex, true, element)));
			return element;
		} finally {
			updating = false;
		}
	}

	public Object remove(int index) {
		getterCalled();
		updating = true;
		try {
			Object oldElement = wrappedList.remove(index);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, false, oldElement)));
			return oldElement;
		} finally {
			updating = false;
		}
	}

	public boolean add(Object element) {
		updating = true;
		try {
			int index = wrappedList.size();
			boolean result = wrappedList.add(element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, true, element)));
			return result;
		} finally {
			updating = false;
		}
	}

	public void add(int index, Object element) {
		updating = true;
		try {
			wrappedList.add(index, element);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, true, element)));
		} finally {
			updating = false;
		}
	}

	public boolean addAll(Collection c) {
		if (c.isEmpty()) {
			return false;
		}
		updating = true;
		try {
			int index = wrappedList.size();
			boolean result = wrappedList.addAll(c);
			setValues();
			ListDiffEntry[] entries = new ListDiffEntry[c.size()];
			int i = 0;
			for (Iterator it = c.iterator(); it.hasNext();) {
				Object o = it.next();
				entries[i++] = Diffs.createListDiffEntry(index++, true, o);
			}
			fireListChange(Diffs.createListDiff(entries));
			return result;
		} finally {
			updating = false;
		}
	}

	public boolean addAll(int index, Collection c) {
		if (c.isEmpty()) {
			return false;
		}
		updating = true;
		try {
			boolean result = wrappedList.addAll(index, c);
			setValues();
			ListDiffEntry[] entries = new ListDiffEntry[c.size()];
			int i = 0;
			for (Iterator it = c.iterator(); it.hasNext();) {
				Object o = it.next();
				entries[i++] = Diffs.createListDiffEntry(index++, true, o);
			}
			fireListChange(Diffs.createListDiff(entries));
			return result;
		} finally {
			updating = false;
		}
	}

	public boolean remove(Object o) {
		getterCalled();
		int index = wrappedList.indexOf(o);
		if (index == -1) {
			return false;
		}
		updating = true;
		try {
			Object oldElement = wrappedList.remove(index);
			setValues();
			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
					index, false, oldElement)));
			return true;
		} finally {
			updating = false;
		}
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		boolean changed = false;
		updating = true;
		try {
			List diffEntries = new ArrayList();
			for (Iterator it = c.iterator(); it.hasNext();) {
				Object o = it.next();
				int index = wrappedList.indexOf(o);
				if (index != -1) {
					changed = true;
					Object oldElement = wrappedList.remove(index);
					diffEntries.add(Diffs.createListDiffEntry(index, false,
							oldElement));
				}
			}
			if (changed) {
				setValues();
				fireListChange(Diffs
						.createListDiff((ListDiffEntry[]) diffEntries
								.toArray(new ListDiffEntry[diffEntries.size()])));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		boolean changed = false;
		updating = true;
		try {
			List diffEntries = new ArrayList();
			int index = 0;
			for (Iterator it = wrappedList.iterator(); it.hasNext();) {
				Object o = it.next();
				boolean retain = c.contains(o);
				if (retain) {
					index++;
				} else {
					changed = true;
					it.remove();
					diffEntries.add(Diffs.createListDiffEntry(index, false, o));
				}
			}
			if (changed) {
				setValues();
				fireListChange(Diffs
						.createListDiff((ListDiffEntry[]) diffEntries
								.toArray(new ListDiffEntry[diffEntries.size()])));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public void clear() {
		updating = true;
		try {
			List diffEntries = new ArrayList();
			for (Iterator it = wrappedList.iterator(); it.hasNext();) {
				Object o = it.next();
				diffEntries.add(Diffs.createListDiffEntry(0, false, o));
			}
			wrappedList.clear();
			setValues();
			fireListChange(Diffs.createListDiff((ListDiffEntry[]) diffEntries
					.toArray(new ListDiffEntry[diffEntries.size()])));
		} finally {
			updating = false;
		}
	}

}




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.ObservableMap;
import org.eclipse.core.internal.databinding.Util;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.0
 * 
 */
public class JavaBeanPropertyObservableMap extends ObservableMap implements
		IBeanObservable {

	private final Object object;

	private PropertyChangeListener mapListener = new PropertyChangeListener() {
		public void propertyChange(final PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						Map oldValue = wrappedMap;
						Map newValue = (Map) event.getNewValue();
						wrappedMap = new HashMap(newValue);
						
						fireMapChange(Diffs.computeMapDiff(oldValue, newValue));
					}
				});
			}
		}
	};

	private boolean updating = false;

	private PropertyDescriptor descriptor;

	private ListenerSupport collectionListenSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 */
	public JavaBeanPropertyObservableMap(Realm realm, Object object,
			PropertyDescriptor descriptor) {
		this(realm, object, descriptor, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param attachListeners
	 */
	public JavaBeanPropertyObservableMap(Realm realm, Object object,
			PropertyDescriptor descriptor, boolean attachListeners) {
		super(realm, new HashMap());
		this.object = object;
		this.descriptor = descriptor;
		this.attachListeners = attachListeners;
		if (attachListeners) {
			this.collectionListenSupport = new ListenerSupport(mapListener,
					descriptor.getName());
		}

		wrappedMap.putAll(getMap());
	}

	protected void firstListenerAdded() {
		if (attachListeners) {
			collectionListenSupport.hookListener(this.object);
		}
	}

	protected void lastListenerRemoved() {
		if (collectionListenSupport != null) {
			collectionListenSupport.dispose();
		}
	}

	private Object primGetMap() {
		try {
			Method readMethod = descriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, new Object[0]);
		} catch (IllegalArgumentException e) {
		} catch (IllegalAccessException e) {
		} catch (InvocationTargetException e) {
		}
		Assert.isTrue(false, "Could not read collection values"); //$NON-NLS-1$
		return null;
	}

	private void primSetMap(Object newValue) {
		Exception ex = null;
		try {
			Method writeMethod = descriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { newValue });
			return;
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
	}

	private Map getMap() {
		Map result = (Map) primGetMap();

		if (result == null)
			result = new HashMap();
		return result;
	}

	private void setMap() {
		primSetMap(new HashMap(wrappedMap));
	}

	public Object put(Object key, Object value) {
		checkRealm();
		updating = true;
		try {
			Object result = wrappedMap.put(key, value);
			if (!Util.equals(result, value)) {
				setMap();
				if (result == null) {
					fireMapChange(Diffs.createMapDiffSingleAdd(key, value));
				} else {
					fireMapChange(Diffs.createMapDiffSingleChange(key, result,
							value));
				}
			}
			return result;
		} finally {
			updating = false;
		}
	}

	public void putAll(Map map) {
		checkRealm();
		updating = true;
		try {
			Set addedKeys = new HashSet(map.size());
			Map changes = new HashMap(map.size());
			for (Iterator it = map.entrySet().iterator(); it.hasNext();) {
				Map.Entry entry = (Entry) it.next();
				Object key = entry.getKey();
				Object newValue = entry.getValue();
				Object oldValue = wrappedMap.put(key, newValue);
				if (oldValue == null) {
					addedKeys.add(key);
				} else if (!Util.equals(oldValue, newValue)) {
					changes.put(key, oldValue);
				}
			}
			if (!addedKeys.isEmpty() || !changes.isEmpty()) {
				setMap();
				fireMapChange(Diffs.createMapDiff(addedKeys,
						Collections.EMPTY_SET, changes.keySet(), changes,
						wrappedMap));
			}
		} finally {
			updating = false;
		}
	}

	public Object remove(Object key) {
		checkRealm();
		updating = true;
		try {
			Object result = wrappedMap.remove(key);
			if (result!=null) {
				setMap();
				fireMapChange(Diffs.createMapDiffSingleRemove(key, result));
			}
			return result;
		} finally {
			updating = false;
		}
	}

	public void clear() {
		checkRealm();
		if (wrappedMap.isEmpty())
			return;
		updating = true;
		try {
			Map oldMap = wrappedMap;
			wrappedMap = new HashMap();
			setMap();
			fireMapChange(Diffs.computeMapDiff(oldMap, Collections.EMPTY_MAP));
		} finally {
			updating = false;
		}
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return descriptor;
	}
}




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.ObservableSet;
import org.eclipse.core.runtime.Assert;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableSet extends ObservableSet implements IBeanObservable {

	private final Object object;

	private PropertyChangeListener collectionListener = new PropertyChangeListener() {
		public void propertyChange(java.beans.PropertyChangeEvent event) {
			if (!updating) {
				getRealm().exec(new Runnable() {
					public void run() {
						Set newElements = new HashSet(Arrays
								.asList(getValues()));
						Set addedElements = new HashSet(newElements);
						Set removedElements = new HashSet(wrappedSet);
						// remove all new elements from old elements to compute
						// the removed elements
						removedElements.removeAll(newElements);
						addedElements.removeAll(wrappedSet);
						wrappedSet = newElements;
						fireSetChange(Diffs.createSetDiff(addedElements,
								removedElements));
					}
				});
			}
		}
	};

	private boolean updating = false;

	private PropertyDescriptor descriptor;

	private ListenerSupport collectionListenSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 */
	public JavaBeanObservableSet(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType) {
		this(realm, object, descriptor, elementType, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param elementType
	 * @param attachListeners
	 */
	public JavaBeanObservableSet(Realm realm, Object object,
			PropertyDescriptor descriptor, Class elementType,
			boolean attachListeners) {
		super(realm, new HashSet(), elementType);
		this.object = object;
		this.descriptor = descriptor;
		this.attachListeners = attachListeners;
		if (attachListeners) {
			this.collectionListenSupport = new ListenerSupport(
					collectionListener, descriptor.getName());
		}

		wrappedSet.addAll(Arrays.asList(getValues()));
	}

	protected void firstListenerAdded() {
		if (attachListeners) {
			collectionListenSupport.hookListener(this.object);
		}
	}

	protected void lastListenerRemoved() {
		if (collectionListenSupport != null) {
			collectionListenSupport.dispose();
		}
	}

	private Object primGetValues() {
		try {
			Method readMethod = descriptor.getReadMethod();
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, new Object[0]);
		} catch (IllegalArgumentException e) {
		} catch (IllegalAccessException e) {
		} catch (InvocationTargetException e) {
		}
		Assert.isTrue(false, "Could not read collection values"); //$NON-NLS-1$
		return null;
	}

	private Object[] getValues() {
		Object[] values = null;

		Object result = primGetValues();
		if (descriptor.getPropertyType().isArray())
			values = (Object[]) result;
		else {
			// TODO add jUnit for POJO (var. SettableValue) collections
			Collection list = (Collection) result;
			if (list != null)
				values = list.toArray();
		}
		if (values == null)
			values = new Object[0];
		return values;
	}

	private void setValues() {
		if (descriptor.getPropertyType().isArray()) {
			Class componentType = descriptor.getPropertyType()
					.getComponentType();
			Object[] newArray = (Object[]) Array.newInstance(componentType,
					wrappedSet.size());
			wrappedSet.toArray(newArray);
			primSetValues(newArray);
		} else {
			// assume that it is a java.util.Set
			primSetValues(new HashSet(wrappedSet));
		}
	}

	public boolean add(Object o) {
		getterCalled();
		updating = true;
		try {
			boolean added = wrappedSet.add(o);
			if (added) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.singleton(o),
						Collections.EMPTY_SET));
			}
			return added;
		} finally {
			updating = false;
		}
	}

	public boolean remove(Object o) {
		getterCalled();
		updating = true;
		try {
			boolean removed = wrappedSet.remove(o);
			if (removed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET,
						Collections.singleton(o)));
			}
			return removed;
		} finally {
			updating = false;
		}
	}

	public boolean addAll(Collection c) {
		getterCalled();
		updating = true;
		try {
			Set additions = new HashSet();
			for (Iterator iterator = c.iterator(); iterator.hasNext();) {
				Object element = iterator.next();
				if (wrappedSet.add(element))
					additions.add(element);
			}
			boolean changed = !additions.isEmpty();
			if (changed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(additions,
						Collections.EMPTY_SET));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public boolean removeAll(Collection c) {
		getterCalled();
		updating = true;
		try {
			Set removals = new HashSet();
			for (Iterator iterator = c.iterator(); iterator.hasNext();) {
				Object element = iterator.next();
				if (wrappedSet.remove(element))
					removals.add(element);
			}
			boolean changed = !removals.isEmpty();
			if (changed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET,
						removals));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public boolean retainAll(Collection c) {
		getterCalled();
		updating = true;
		try {
			Set removals = new HashSet();
			for (Iterator iterator = wrappedSet.iterator(); iterator.hasNext();) {
				Object element = iterator.next();
				if (!c.contains(element)) {
					iterator.remove();
					removals.add(element);
				}
			}
			boolean changed = !removals.isEmpty();
			if (changed) {
				setValues();
				fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET,
						removals));
			}
			return changed;
		} finally {
			updating = false;
		}
	}

	public void clear() {
		getterCalled();
		if (wrappedSet.isEmpty())
			return;

		updating = true;
		try {
			Set removals = new HashSet(wrappedSet);
			wrappedSet.clear();
			setValues();
			fireSetChange(Diffs.createSetDiff(Collections.EMPTY_SET, removals));
		} finally {
			updating = false;
		}
	}

	private void primSetValues(Object newValue) {
		Exception ex = null;
		try {
			Method writeMethod = descriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { newValue });
			return;
		} catch (IllegalArgumentException e) {
			ex = e;
		} catch (IllegalAccessException e) {
			ex = e;
		} catch (InvocationTargetException e) {
			ex = e;
		}
		throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return descriptor;
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bug 164653
 *     Brad Reynolds - bug 164134, 171616
 *******************************************************************************/
package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.beans.IBeanObservable;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.databinding.util.Policy;
import org.eclipse.core.internal.databinding.Util;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

/**
 * @since 1.0
 * 
 */
public class JavaBeanObservableValue extends AbstractObservableValue implements IBeanObservable {
	private final Object object;
	private boolean updating = false;

	private final PropertyDescriptor propertyDescriptor;
	private ListenerSupport listenerSupport;

	private boolean attachListeners;

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 */
	public JavaBeanObservableValue(Realm realm, Object object,
			PropertyDescriptor descriptor) {
		this(realm, object, descriptor, true);
	}

	/**
	 * @param realm
	 * @param object
	 * @param descriptor
	 * @param attachListeners
	 */
	public JavaBeanObservableValue(Realm realm, Object object,
			PropertyDescriptor descriptor, boolean attachListeners) {
		super(realm);
		this.object = object;
		this.propertyDescriptor = descriptor;
		this.attachListeners = attachListeners;
	}

	protected void firstListenerAdded() {
		if (!attachListeners) {
			return;
		}
			
		PropertyChangeListener listener = new PropertyChangeListener() {
			public void propertyChange(java.beans.PropertyChangeEvent event) {
				if (!updating) {
					final ValueDiff diff = Diffs.createValueDiff(event.getOldValue(),
											event.getNewValue());
					getRealm().exec(new Runnable(){
						public void run() {
							fireValueChange(diff);
						}});
				}
			}
		};
		
		if (listenerSupport == null) {
			listenerSupport = new ListenerSupport(listener, propertyDescriptor.getName());
		}
		
		listenerSupport.hookListener(object);
	}

	public void doSetValue(Object value) {
		updating = true;
		try {
			Object oldValue = doGetValue();
			
			if (Util.equals(oldValue, value)) {
				return;
			}
			
			Method writeMethod = propertyDescriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(object, new Object[] { value });
			fireValueChange(Diffs.createValueDiff(oldValue, doGetValue()));
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not change value of " + object + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
		} finally {
			updating = false;
		}
	}

	public Object doGetValue() {
		try {
			Method readMethod = propertyDescriptor.getReadMethod();
			if (readMethod == null) {
				throw new BindingException(propertyDescriptor.getName()
						+ " property does not have a read method."); //$NON-NLS-1$
			}
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(object, null);
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not read value of " + object + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
			return null;
		}
	}

	protected void lastListenerRemoved() {
		unhookListener();
	}

	private void unhookListener() {
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
	}

	public Object getValueType() {
		return propertyDescriptor.getPropertyType();
	}

	public Object getObserved() {
		return object;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		unhookListener();
		super.dispose();
	}
}




 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Brad Reynolds - bugs 164268, 171616, 147515
 *     Matthew Hall - bug 221704, 234686, 246625, 194734
 *     Thomas Kratz - bug 213787
 *******************************************************************************/
package org.eclipse.core.databinding.beans;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;

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

import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanPropertyObservableMap;
import org.eclipse.core.runtime.Assert;

/**

	 */
	public static IObservableValue observeValue(Realm realm, Object bean,
			String propertyName) {
		IValueProperty property = BeanProperties.valueProperty(bean.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableValueDecorator(PropertyObservables
				.observeValue(realm, bean, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(IObservableSet domain,
			Class beanClass, String propertyName) {
		IValueProperty property = BeanProperties.valueProperty(beanClass,
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeDetailValues(
				domain, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(Realm realm, Object bean,
			String propertyName) {
		IMapProperty property = BeanProperties.mapProperty(bean.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
				bean, property), propertyDescriptor);
	}

	/**

		return observeMap(Realm.getDefault(), bean, propertyName);
	}

	/*package*/ static PropertyDescriptor getPropertyDescriptor(Class beanClass,
			String propertyName) {
		BeanInfo beanInfo;
		try {
			beanInfo = Introspector.getBeanInfo(beanClass);
		} catch (IntrospectionException e) {
			// cannot introspect, give up
			return null;
		}
		PropertyDescriptor[] propertyDescriptors = beanInfo
				.getPropertyDescriptors();
		for (int i = 0; i < propertyDescriptors.length; i++) {
			PropertyDescriptor descriptor = propertyDescriptors[i];
			if (descriptor.getName().equals(propertyName)) {
				return descriptor;
			}
		}
		throw new BindingException(
				"Could not find property with name " + propertyName + " in class " + beanClass); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/**
	 * Returns an array of observable maps in the default realm tracking the
	 * current values of the named propertys for the beans in the given set.

	 * collection-typed named property of the given bean object. The returned
	 * list is mutable. When an item is added or removed the setter is invoked
	 * for the list on the parent bean to provide notification to other
	 * listeners via <code>PropertyChangeEvents</code>. This is done to provide
	 * the same behavior as is expected from arrays as specified in the bean
	 * spec in section 7.2.
	 * 
	 * @param realm
	 *            the realm

	 * @param propertyName
	 *            the name of the property
	 * @param elementType
	 *            type of the elements in the list. If <code>null</code> and the
	 *            property is an array the type will be inferred. If
	 *            <code>null</code> and the property type cannot be inferred
	 *            element type will be <code>null</code>.
	 * @return an observable list tracking the collection-typed named property

	 */
	public static IObservableList observeList(Realm realm, Object bean,
			String propertyName, Class elementType) {
		IListProperty property = BeanProperties.listProperty(bean.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableListDecorator(PropertyObservables.observeList(
				realm, bean, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableValue observeDetailValue(Realm realm,
			IObservableValue master, String propertyName, Class propertyType) {

		IObservableValue value = MasterDetailObservables.detailValue(master,
				valueFactory(realm, propertyName), propertyType);
		return new BeanObservableValueDecorator(value, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));

		return decorator;
	}

	/**

	/**
	 * Helper method for
	 * <code>MasterDetailObservables.detailValue(master, valueFactory(realm,
	 * propertyName), propertyType)</code>. This method returns an
	 * {@link IBeanObservable} with a {@link PropertyDescriptor} based on the
	 * given master type and property name.
	 * name.
	 * 
	 * @param realm
	 *            the realm

	 * @since 1.1
	 */
	public static IObservableValue observeDetailValue(Realm realm,
			IObservableValue master, Class masterType, String propertyName,
			Class propertyType) {
		Assert.isNotNull(masterType, "masterType cannot be null"); //$NON-NLS-1$
		IObservableValue value = MasterDetailObservables.detailValue(master,
				valueFactory(realm, propertyName), propertyType);
		return new BeanObservableValueDecorator(value, BeanPropertyHelper
				.getPropertyDescriptor(masterType, propertyName));

		return decorator;
	}

	/**

		IObservableList observableList = MasterDetailObservables.detailList(
				master, listFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableListDecorator(observableList,
				BeanPropertyHelper.getValueTypePropertyDescriptor(master,
						propertyName));

		return decorator;
	}

	/**

	 */
	public static IObservableSet observeDetailSet(Realm realm,
			IObservableValue master, String propertyName, Class propertyType) {

		IObservableSet observableSet = MasterDetailObservables.detailSet(
				master, setFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						propertyName));

		return decorator;
	}

	/**

			IObservableValue master, String propertyName) {
		IObservableMap observableMap = MasterDetailObservables.detailMap(
				master, mapPropertyFactory(realm, propertyName));
		return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						propertyName));
		return decorator;
	}

	/**

	 */
	public static IObservableSet observeSet(Realm realm, Object bean,
			String propertyName, Class elementType) {
		ISetProperty property = BeanProperties.setProperty(bean.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableSetDecorator(PropertyObservables.observeSet(
				realm, bean, property), propertyDescriptor);
	}

	/**

	 * @param propertyName
	 *            the name of the property
	 * @return a factory for creating {@link IObservableMap} objects
	 * 
	 * @since 1.1
	 */
	public static IObservableFactory setToMapFactory(final Class beanClass,
			final String propertyName) {
		return new IObservableFactory() {
			public IObservable createObservable(Object target) {
				return observeMap((IObservableSet) target, beanClass,
						propertyName);
			}
		};
	}

	/**
	 * Returns a factory for creating an observable map. The factory, when
	 * provided with a bean object, will create an {@link IObservableMap} in the

	public static IObservableFactory mapPropertyFactory(String propertyName) {
		return mapPropertyFactory(Realm.getDefault(), propertyName);
	}

	/**
	 * @param elementType
	 *            can be <code>null</code>
	 * @param propertyDescriptor
	 * @return type of the items in a collection/array property
	 */
	/*package*/ static Class getCollectionElementType(Class elementType,
			PropertyDescriptor propertyDescriptor) {
		if (elementType == null) {
			Class propertyType = propertyDescriptor.getPropertyType();
			elementType = propertyType.isArray() ? propertyType
					.getComponentType() : Object.class;
		}

		return elementType;
	}

	/**
	 * @param observable
	 * @param propertyName
	 * @return property descriptor or <code>null</code>
	 */
	/* package*/ static PropertyDescriptor getValueTypePropertyDescriptor(
			IObservableValue observable, String propertyName) {
		return (observable.getValueType() != null) ? getPropertyDescriptor(
				(Class) observable.getValueType(), propertyName) : null;
	}
}




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     Matthew Hall - bugs 221704, 234686, 246625, 194734
 *******************************************************************************/

package org.eclipse.core.databinding.beans;

import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.databinding.property.PropertyObservables;
import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
import org.eclipse.core.internal.databinding.beans.JavaBeanPropertyObservableMap;

/**
 * A factory for creating observable objects for POJOs (plain old java objects)

	 */
	public static IObservableValue observeValue(Realm realm, Object pojo,
			String propertyName) {
		IValueProperty property = PojoProperties.valueProperty(pojo.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableValueDecorator(PropertyObservables
				.observeValue(realm, pojo, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(IObservableSet domain,
			Class pojoClass, String propertyName) {
		IValueProperty property = PojoProperties.valueProperty(pojoClass,
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeDetailValues(
				domain, property), propertyDescriptor);
	}

	/**

	 */
	public static IObservableMap observeMap(Realm realm, Object pojo,
			String propertyName) {
		IMapProperty property = PojoProperties.mapProperty(pojo.getClass(),
				propertyName);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableMapDecorator(PropertyObservables.observeMap(
				pojo, property), propertyDescriptor);
	}

	/**

	 * collection-typed named property of the given bean object. The returned
	 * list is mutable. When an item is added or removed the setter is invoked
	 * for the list on the parent bean to provide notification to other
	 * listeners via <code>PropertyChangeEvents</code>. This is done to provide
	 * the same behavior as is expected from arrays as specified in the bean
	 * spec in section 7.2.
	 * 
	 * @param realm
	 *            the realm

	 * @param propertyName
	 *            the name of the property
	 * @param elementType
	 *            type of the elements in the list. If <code>null</code> and the
	 *            property is an array the type will be inferred. If
	 *            <code>null</code> and the property type cannot be inferred
	 *            element type will be <code>null</code>.
	 * @return an observable list tracking the collection-typed named property

	 */
	public static IObservableList observeList(Realm realm, Object pojo,
			String propertyName, Class elementType) {
		IListProperty property = PojoProperties.listProperty(pojo.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableListDecorator(PropertyObservables.observeList(
				realm, pojo, property), propertyDescriptor);
				elementType, false);
	}

	/**

	 */
	public static IObservableSet observeSet(Realm realm, Object pojo,
			String propertyName, Class elementType) {
		ISetProperty property = PojoProperties.setProperty(pojo.getClass(),
				propertyName, elementType);
		PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
				.getPropertyDescriptor();
		return new BeanObservableSetDecorator(PropertyObservables.observeSet(
				realm, pojo, property), propertyDescriptor);
				elementType, false);
	}

	/**

	 */
	public static IObservableValue observeDetailValue(Realm realm,
			IObservableValue master, String propertyName, Class propertyType) {

		IObservableValue value = MasterDetailObservables.detailValue(master,
				valueFactory(realm, propertyName), propertyType);
		return new BeanObservableValueDecorator(value, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						propertyName));

		return decorator;
	}

	/**

		IObservableList observableList = MasterDetailObservables.detailList(
				master, listFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableListDecorator(observableList,
				BeanPropertyHelper.getValueTypePropertyDescriptor(master,
						propertyName));

		return decorator;
	}

	/**

	 */
	public static IObservableSet observeDetailSet(Realm realm,
			IObservableValue master, String propertyName, Class propertyType) {

		IObservableSet observableSet = MasterDetailObservables.detailSet(
				master, setFactory(realm, propertyName, propertyType),
				propertyType);
		return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						master, propertyName));

		return decorator;
	}

	/**

			IObservableValue master, String propertyName) {
		IObservableMap observableMap = MasterDetailObservables.detailMap(
				master, mapPropertyFactory(realm, propertyName));
		return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
				.getValueTypePropertyDescriptor(master, propertyName));
						master, propertyName));
		return decorator;
	}

	/**




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

package org.eclipse.core.databinding.beans;

import java.beans.PropertyDescriptor;

import org.eclipse.core.databinding.property.IProperty;

/**
 * Provides access to details of bean properties.
 * 
 * @since 1.2
 */
public interface IBeanProperty extends IProperty {
	/**
	 * Returns the property descriptor of the bean property being observed
	 * 
	 * @return the property descriptor of the bean property being observed
	 */
	public PropertyDescriptor getPropertyDescriptor();
}




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.BasicMapProperty;

/**
 * @since 3.3
 * 
 */
public class BeanMapProperty extends BasicMapProperty implements IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedMap = Collections.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param attachListener
	 */
	public BeanMapProperty(PropertyDescriptor propertyDescriptor,
			boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							Object oldValue = evt.getOldValue();
							Object newValue = evt.getNewValue();
							if (oldValue == null && newValue == null) {
								// Obscure condition indicating new and old
								// values are unknown
								oldValue = sourceToCachedMap.get(source);
								newValue = BeanPropertyHelper.getProperty(
										source, propertyDescriptor);
							}
							sourceToCachedMap.put(source, newValue);
							if (!isUpdating(source)) {
								fireMapChange(source, Diffs.computeMapDiff(
										asMap(oldValue), asMap(newValue)));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedMap.put(source, BeanPropertyHelper.getProperty(
					source, propertyDescriptor));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedMap.remove(source);
		}
	}

	public Map getMap(Object source) {
		if (source == null)
			return Collections.EMPTY_MAP;
		Object propertyValue = BeanPropertyHelper.getProperty(source,
				propertyDescriptor);
		return asMap(propertyValue);
	}

	private Map asMap(Object propertyValue) {
		if (propertyValue == null)
			return new HashMap();
		return (Map) propertyValue;
	}

	protected void setMap(Object source, Map map, MapDiff diff) {
		if (source == null)
			return;

		super.setMap(source, map, diff);
		sourceToCachedMap.put(source, map);
	}

	protected void doSetMap(Object source, Map map) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor, map);
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedMap != null) {
			sourceToCachedMap.clear();
			sourceToCachedMap = null;
		}
		super.dispose();
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}
}




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.property.BasicValueProperty;

/**
 * @since 3.3
 * 
 */
public class BeanValueProperty extends BasicValueProperty implements
		IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private Class valueType;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedValue = Collections
			.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param valueType
	 * @param attachListener
	 */
	public BeanValueProperty(PropertyDescriptor propertyDescriptor,
			Class valueType, boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.valueType = valueType == null ? propertyDescriptor
				.getPropertyType() : valueType;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							Object oldValue = evt.getOldValue();
							Object newValue = evt.getNewValue();
							if (oldValue == null && newValue == null) {
								// Obscure condition indicating new and old
								// values are unknown
								oldValue = sourceToCachedValue.get(source);
								newValue = getValue(source);
							}
							sourceToCachedValue.put(source, newValue);
							if (!isUpdating(source)) {
								fireValueChange(source, Diffs.createValueDiff(
										oldValue, newValue));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedValue.put(source, getValue(source));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedValue.remove(source);
		}
	}

	public Object getValue(Object source) {
		if (source == null)
			return null;
		return BeanPropertyHelper.getProperty(source, propertyDescriptor);
	}

	public void setValue(Object source, Object value) {
		if (source == null)
			return;
		super.setValue(source, value);
		sourceToCachedValue.put(source, getValue(source));
	}

	protected void doSetValue(Object source, Object value) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor, value);
	}

	public Object getValueType() {
		return valueType;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		valueType = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedValue != null) {
			sourceToCachedValue.clear();
			sourceToCachedValue = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.beans;

import java.beans.PropertyChangeEvent;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.beans.BeanListProperty;
import org.eclipse.core.internal.databinding.beans.BeanMapProperty;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.BeanSetProperty;
import org.eclipse.core.internal.databinding.beans.BeanValueProperty;

/**
 * A factory for creating properties for POJOs (plain old java objects) that
 * conform to idea of an object with getters and setters but does not provide
 * {@link PropertyChangeEvent property change events} on change. This factory is
 * identical to {@link BeanProperties} except for this fact.
 * 
 * @since 1.2
 */
public class PojoProperties {
	/**
	 * Returns a value property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName) {
		return valueProperty(beanClass, propertyName, null);
	}

	/**
	 * Returns a value property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param valueType
	 *            the value type of the returned value property
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName, Class valueType) {
		return new BeanValueProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), valueType, false);
	}

	/**
	 * Returns a set property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a set property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass, String propertyName) {
		return setProperty(beanClass, propertyName, null);
	}

	/**
	 * Returns a set property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param elementType
	 *            the element type of the returned set property
	 * @return a set property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanSetProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, false);
	}

	/**
	 * Returns a list property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName) {
		return listProperty(beanClass, propertyName, null);
	}

	/**
	 * Returns a list property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param elementType
	 *            the element type of the returned list property
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanListProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, false);
	}

	/**
	 * Returns a map property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a map property for the given property name of the given bean
	 *         class.
	 */
	public static IMapProperty mapProperty(Class beanClass, String propertyName) {
		return new BeanMapProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), false);
	}
}




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.property.BasicListProperty;

/**
 * @since 3.3
 * 
 */
public class BeanListProperty extends BasicListProperty implements
		IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private Class elementType;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedList = Collections.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param elementType
	 * @param attachListener
	 */
	public BeanListProperty(PropertyDescriptor propertyDescriptor,
			Class elementType, boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.elementType = elementType == null ? BeanPropertyHelper
				.getCollectionPropertyElementType(propertyDescriptor)
				: elementType;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							Object oldValue = evt.getOldValue();
							Object newValue = evt.getNewValue();
							if (oldValue == null && newValue == null) {
								// Obscure condition indicating new and old
								// values are unknown
								oldValue = sourceToCachedList.get(source);
								newValue = BeanPropertyHelper.getProperty(
										source, propertyDescriptor);
							}
							sourceToCachedList.put(source, newValue);
							if (!isUpdating(source)) {
								fireListChange(source, Diffs.computeListDiff(
										asList(oldValue), asList(newValue)));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedList.put(source, BeanPropertyHelper.getProperty(
					source, propertyDescriptor));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedList.remove(source);
		}
	}

	public List getList(Object source) {
		if (source == null)
			return Collections.EMPTY_LIST;
		Object propertyValue = BeanPropertyHelper.getProperty(source,
				propertyDescriptor);
		return asList(propertyValue);
	}

	private List asList(Object propertyValue) {
		if (propertyValue == null)
			return new ArrayList();
		if (propertyDescriptor.getPropertyType().isArray())
			return new ArrayList(Arrays.asList((Object[]) propertyValue));
		return (List) propertyValue;
	}

	protected void setList(Object source, List list, ListDiff diff) {
		if (source == null)
			return;

		super.setList(source, list, diff);
		sourceToCachedList.put(source, convertListToBeanPropertyType(list));
	}

	protected void doSetList(Object source, List list) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor,
				convertListToBeanPropertyType(list));
	}

	private Object convertListToBeanPropertyType(List list) {
		Object propertyValue = list;
		if (propertyDescriptor.getPropertyType().isArray()) {
			Class componentType = propertyDescriptor.getPropertyType()
					.getComponentType();
			Object[] array = (Object[]) Array.newInstance(componentType, list
					.size());
			list.toArray(array);
			propertyValue = array;
		}
		return propertyValue;
	}

	public Object getElementType() {
		return elementType;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		elementType = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedList != null) {
			sourceToCachedList.clear();
			sourceToCachedList = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import org.eclipse.core.databinding.beans.IBeanProperty;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.databinding.property.BasicSetProperty;

/**
 * @since 3.3
 * 
 */
public class BeanSetProperty extends BasicSetProperty implements IBeanProperty {
	private PropertyDescriptor propertyDescriptor;
	private Class elementType;
	private boolean attachListener;

	private ListenerSupport listenerSupport;

	private Map sourceToCachedSet = Collections.synchronizedMap(new HashMap());

	/**
	 * @param propertyDescriptor
	 * @param elementType
	 * @param attachListener
	 */
	public BeanSetProperty(PropertyDescriptor propertyDescriptor,
			Class elementType, boolean attachListener) {
		this.propertyDescriptor = propertyDescriptor;
		this.elementType = elementType == null ? BeanPropertyHelper
				.getCollectionPropertyElementType(propertyDescriptor)
				: elementType;
		this.attachListener = attachListener;
	}

	private void initListenerSupport() {
		if (listenerSupport == null) {
			synchronized (this) {
				if (listenerSupport == null) {
					PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
						public void propertyChange(PropertyChangeEvent evt) {
							Object source = evt.getSource();
							Object oldValue = evt.getOldValue();
							Object newValue = evt.getNewValue();
							if (oldValue == null && newValue == null) {
								// Obscure condition indicating new and old
								// values are unknown
								oldValue = sourceToCachedSet.get(source);
								newValue = BeanPropertyHelper.getProperty(
										source, propertyDescriptor);
							}
							sourceToCachedSet.put(source, newValue);
							if (!isUpdating(source)) {
								fireSetChange(source, Diffs.computeSetDiff(
										asSet(oldValue), asSet(newValue)));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (source != null && attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
			sourceToCachedSet.put(source, BeanPropertyHelper.getProperty(
					source, propertyDescriptor));
		}
	}

	protected void removeListenerFrom(Object source) {
		if (source != null && attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
			sourceToCachedSet.remove(source);
		}
	}

	public Set getSet(Object source) {
		if (source == null)
			return Collections.EMPTY_SET;
		Object propertyValue = BeanPropertyHelper.getProperty(source,
				propertyDescriptor);
		return asSet(propertyValue);
	}

	private Set asSet(Object propertyValue) {
		if (propertyValue == null)
			return Collections.EMPTY_SET;
		if (propertyDescriptor.getPropertyType().isArray())
			return new HashSet(Arrays.asList((Object[]) propertyValue));
		return (Set) propertyValue;
	}

	protected void setSet(Object source, Set set, SetDiff diff) {
		if (source == null)
			return;
		super.setSet(source, set, diff);
		sourceToCachedSet.put(source, set);
	}

	protected void doSetSet(Object source, Set set) {
		BeanPropertyHelper.setProperty(source, propertyDescriptor,
				convertSetToBeanPropertyType(set));
	}

	private Object convertSetToBeanPropertyType(Set set) {
		Object propertyValue = set;
		if (propertyDescriptor.getPropertyType().isArray()) {
			Class componentType = propertyDescriptor.getPropertyType()
					.getComponentType();
			Object[] array = (Object[]) Array.newInstance(componentType, set
					.size());
			propertyValue = set.toArray(array);
		}
		return propertyValue;
	}

	public Object getElementType() {
		return elementType;
	}

	public PropertyDescriptor getPropertyDescriptor() {
		return propertyDescriptor;
	}

	public synchronized void dispose() {
		propertyDescriptor = null;
		elementType = null;
		attachListener = false;
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		if (sourceToCachedSet != null) {
			sourceToCachedSet.clear();
			sourceToCachedSet = null;
		}
		super.dispose();
	}
}




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

package org.eclipse.core.databinding.beans;

import org.eclipse.core.databinding.property.IListProperty;
import org.eclipse.core.databinding.property.IMapProperty;
import org.eclipse.core.databinding.property.ISetProperty;
import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.beans.BeanListProperty;
import org.eclipse.core.internal.databinding.beans.BeanMapProperty;
import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
import org.eclipse.core.internal.databinding.beans.BeanSetProperty;
import org.eclipse.core.internal.databinding.beans.BeanValueProperty;

/**
 * A factory for creating properties for Java objects that conform to the <a
 * href="http://java.sun.com/products/javabeans/docs/spec.html">JavaBean
 * specification</a> for bound properties.
 * 
 * @since 1.2
 */
public class BeanProperties {
	/**
	 * Returns a value property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName) {
		return valueProperty(beanClass, propertyName, null);
	}

	/**
	 * Returns a value property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param valueType
	 *            the value type of the returned value property
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName, Class valueType) {
		return new BeanValueProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), valueType, true);
	}

	/**
	 * Returns a set property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a set property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass, String propertyName) {
		return setProperty(beanClass, propertyName, null);
	}

	/**
	 * Returns a set property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param elementType
	 *            the element type of the returned set property
	 * @return a set property for the given property name of the given bean
	 *         class.
	 */
	public static ISetProperty setProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanSetProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, true);
	}

	/**
	 * Returns a list property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName) {
		return listProperty(beanClass, propertyName, null);
	}

	/**
	 * Returns a list property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @param elementType
	 *            the element type of the returned list property
	 * @return a list property for the given property name of the given bean
	 *         class.
	 */
	public static IListProperty listProperty(Class beanClass,
			String propertyName, Class elementType) {
		return new BeanListProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), elementType, true);
	}

	/**
	 * Returns a map property for the given property name of the given bean
	 * class.
	 * 
	 * @param beanClass
	 *            the bean class
	 * @param propertyName
	 *            the property name
	 * @return a map property for the given property name of the given bean
	 *         class.
	 */
	public static IMapProperty mapProperty(Class beanClass, String propertyName) {
		return new BeanMapProperty(BeanPropertyHelper.getPropertyDescriptor(
				beanClass, propertyName), true);
	}
}




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

package org.eclipse.core.internal.databinding.beans;

import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeansObservables;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.util.Policy;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;

/**
 * @since 1.2
 * 
 */
public class BeanPropertyHelper {
	/**
	 * Sets the contents of the given property on the given source object to the
	 * given value.
	 * 
	 * @param source
	 *            the source object which has the property being updated
	 * @param propertyDescriptor
	 *            the property being changed
	 * @param value
	 *            the new value of the property
	 */
	public static void setProperty(Object source,
			PropertyDescriptor propertyDescriptor, Object value) {
		try {
			Method writeMethod = propertyDescriptor.getWriteMethod();
			if (!writeMethod.isAccessible()) {
				writeMethod.setAccessible(true);
			}
			writeMethod.invoke(source, new Object[] { value });
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not change value of " + source + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
		}
	}

	/**
	 * Returns the contents of the given property for the given bean.
	 * 
	 * @param source
	 *            the source bean
	 * @param propertyDescriptor
	 *            the property to retrieve
	 * @return the contents of the given property for the given bean.
	 */
	public static Object getProperty(Object source,
			PropertyDescriptor propertyDescriptor) {
		try {
			Method readMethod = propertyDescriptor.getReadMethod();
			if (readMethod == null) {
				throw new BindingException(propertyDescriptor.getName()
						+ " property does not have a read method."); //$NON-NLS-1$
			}
			if (!readMethod.isAccessible()) {
				readMethod.setAccessible(true);
			}
			return readMethod.invoke(source, null);
		} catch (InvocationTargetException e) {
			/*
			 * InvocationTargetException wraps any exception thrown by the
			 * invoked method.
			 */
			throw new RuntimeException(e.getCause());
		} catch (Exception e) {
			if (BeansObservables.DEBUG) {
				Policy
						.getLog()
						.log(
								new Status(
										IStatus.WARNING,
										Policy.JFACE_DATABINDING,
										IStatus.OK,
										"Could not read value of " + source + "." + propertyDescriptor.getName(), e)); //$NON-NLS-1$ //$NON-NLS-2$
			}
			return null;
		}
	}

	/**
	 * Returns the element type of the given collection-typed property for the
	 * given bean.
	 * 
	 * @param descriptor
	 *            the property being inspected
	 * @return the element type of the given collection-typed property if it is
	 *         an array property, or Object.class otherwise.
	 */
	public static Class getCollectionPropertyElementType(
			PropertyDescriptor descriptor) {
		Class propertyType = descriptor.getPropertyType();
		return propertyType.isArray() ? propertyType.getComponentType()
				: Object.class;
	}

	/**
	 * @param beanClass
	 * @param propertyName
	 * @return the PropertyDescriptor for the named property on the given bean
	 *         class
	 */
	public static PropertyDescriptor getPropertyDescriptor(Class beanClass,
			String propertyName) {
		BeanInfo beanInfo;
		try {
			beanInfo = Introspector.getBeanInfo(beanClass);
		} catch (IntrospectionException e) {
			// cannot introspect, give up
			return null;
		}
		PropertyDescriptor[] propertyDescriptors = beanInfo
				.getPropertyDescriptors();
		for (int i = 0; i < propertyDescriptors.length; i++) {
			PropertyDescriptor descriptor = propertyDescriptors[i];
			if (descriptor.getName().equals(propertyName)) {
				return descriptor;
			}
		}
		throw new BindingException(
				"Could not find property with name " + propertyName + " in class " + beanClass); //$NON-NLS-1$ //$NON-NLS-2$
	}

	/**
	 * @param observable
	 * @param propertyName
	 * @return property descriptor or <code>null</code>
	 */
	/* package */public static PropertyDescriptor getValueTypePropertyDescriptor(
			IObservableValue observable, String propertyName) {
		if (observable.getValueType() != null)
			return getPropertyDescriptor((Class) observable.getValueType(),
					propertyName);
		return null;
	}
}

Return to bug 194734

Lines 14-19 Link Here

(-)META-INF/MANIFEST.MF (+4 lines)
14	org.eclipse.core.databinding.observable.masterdetail,	14	org.eclipse.core.databinding.observable.masterdetail,
15	org.eclipse.core.databinding.observable.set;x-internal:=false,	15	org.eclipse.core.databinding.observable.set;x-internal:=false,
16	org.eclipse.core.databinding.observable.value;x-internal:=false,	16	org.eclipse.core.databinding.observable.value;x-internal:=false,
		17	org.eclipse.core.databinding.property,
		18	org.eclipse.core.databinding.property.masterdetail,
17	org.eclipse.core.databinding.util,	19	org.eclipse.core.databinding.util,
18	org.eclipse.core.databinding.validation;x-internal:=false,	20	org.eclipse.core.databinding.validation;x-internal:=false,
19	org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",	21	org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",
Lines 21-26 Link Here
21	org.eclipse.core.internal.databinding.observable;x-internal:=true,	23	org.eclipse.core.internal.databinding.observable;x-internal:=true,
22	org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:="org.eclipse.jface.tests.databinding",	24	org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:="org.eclipse.jface.tests.databinding",
23	org.eclipse.core.internal.databinding.observable.tree;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",	25	org.eclipse.core.internal.databinding.observable.tree;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
		26	org.eclipse.core.internal.databinding.property;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
		27	org.eclipse.core.internal.databinding.property.masterdetail;x-friends:="org.eclipse.jface.databinding,org.eclipse.jface.tests.databinding",
24	org.eclipse.core.internal.databinding.validation;x-friends:="org.eclipse.jface.tests.databinding"	28	org.eclipse.core.internal.databinding.validation;x-friends:="org.eclipse.jface.tests.databinding"
25	Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"	29	Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"
26	Import-Package-Comment: see http://wiki.eclipse.org/	30	Import-Package-Comment: see http://wiki.eclipse.org/

Added Link Here

(-)src/org/eclipse/core/databinding/property/BasicMapProperty.java (+146 lines)
1	/*******************************************************************************
2	* Copyright (c) 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	******************************************************************************/
11
12	package org.eclipse.core.databinding.property;
13
14	import java.util.Collections;
15	import java.util.HashMap;
16	import java.util.HashSet;
17	import java.util.Iterator;
18	import java.util.Map;
19	import java.util.Set;
20
21	import org.eclipse.core.databinding.observable.Diffs;
22	import org.eclipse.core.databinding.observable.map.MapDiff;
23	import org.eclipse.core.internal.databinding.property.PropertyUpdateHelper;
24
25	/**
26	* Abstract map property implementation for properties where the map can be
27	* completely replaced in a single atomic operation.
28	* <p>
29	* For example, a map-typed bean property Customer.phoneNumbers can be modified
30	* by calling Customer.setPhoneNumbers(Map phoneNumbers).
31	*
32	* @since 1.2
33	*/
34	public abstract class BasicMapProperty extends MapProperty {
35	private PropertyUpdateHelper updateHelper = new PropertyUpdateHelper();
36
37	/**
38	* Returns whether this property is currently being updated on the source.
39	* Implementors should query this value to avoid unnecessary calculations,
40	* such as computing a diff.
41	*
42	* @param source
43	* the property source
44	* @return whether this property is currently being updated on the source.
45	*/
46	protected boolean isUpdating(Object source) {
47	return updateHelper.isUpdating(source);
48	}
49
50	/**
51	* Sets the map property on the source to the specified map, then fires a
52	* map change using the specified diff.
53	*
54	* @param source
55	* the property source
56	* @param map
57	* the new map
58	* @param diff
59	* the diff to be fired after the map property has been set. If
60	* null, the diff will be computed.
61	*/
62	protected void setMap(Object source, Map map, MapDiff diff) {
63	if (diff == null) {
64	diff = Diffs.computeMapDiff(getMap(source), map);
65	}
66
67	updateHelper.setUpdating(source, true);
68	try {
69	doSetMap(source, map);
70	} finally {
71	updateHelper.setUpdating(source, false);
72	}
73
74	if (hasListeners(source)) {
75	fireMapChange(source, diff);
76	}
77	}
78
79	public void clear(Object source) {
80	setMap(source, new HashMap(), Diffs.createMapDiffRemoveAll(new HashMap(
81	getMap(source))));
82	}
83
84	public Object put(Object source, Object key, Object value) {
85	Map map = new HashMap(getMap(source));
86	boolean addition = !map.containsKey(key);
87	Object result = map.put(key, value);
88	MapDiff diff;
89	if (addition) {
90	diff = Diffs.createMapDiffSingleAdd(key, value);
91	} else {
92	diff = Diffs.createMapDiffSingleChange(key, result, value);
93	}
94	setMap(source, map, diff);
95	return result;
96	}
97
98	public void putAll(Object source, Map t) {
99	Map map = new HashMap(getMap(source));
100	Set addedKeys = new HashSet();
101	Set changedKeys = new HashSet();
102	Map oldValues = new HashMap();
103	Map newValues = new HashMap();
104	for (Iterator it = t.entrySet().iterator(); it.hasNext();) {
105	Map.Entry entry = (Map.Entry) it.next();
106	Object key = entry.getKey();
107	Object newValue = entry.getValue();
108	boolean addition = !map.containsKey(key);
109	Object oldValue = map.put(key, newValue);
110	if (addition) {
111	addedKeys.add(key);
112	} else {
113	changedKeys.add(key);
114	oldValues.put(key, oldValue);
115	}
116	newValues.put(key, newValue);
117	}
118	setMap(source, map, Diffs.createMapDiff(addedKeys,
119	Collections.EMPTY_SET, changedKeys, oldValues, newValues));
120	}
121
122	public Object remove(Object source, Object key) {
123	Map map = getMap(source);
124	if (map.containsKey(key)) {
125	map = new HashMap(map);
126	Object result = map.remove(key);
127	setMap(source, map, Diffs.createMapDiffSingleRemove(key, result));
128	return result;
129	}
130	return null;
131	}
132
133	public int size(Object source) {
134	return getMap(source).size();
135	}
136
137	protected abstract void doSetMap(Object source, Map map);
138
139	public synchronized void dispose() {
140	if (updateHelper != null) {
141	updateHelper.dispose();
142	updateHelper = null;
143	}
144	super.dispose();
145	}
146	}

Added Link Here

(-)src/org/eclipse/core/databinding/property/IListProperty.java (+162 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.core.databinding.property;
13
14	import java.util.Collection;
15	import java.util.List;
16
17	/**
18	* Interface for list-typed properties.
19	*
20	* @since 1.2
21	*/
22	public interface IListProperty extends ICollectionProperty {
23	/**
24	* Returns a List with the current contents of the source's list property
25	*
26	* @param source
27	* the property source
28	* @return a List with the current contents of the source's list property
29	*/
30	List getList(Object source);
31
32	/**
33	* Inserts all elements in the specified collection into the source's list
34	* property at the specified index.
35	*
36	* @param source
37	* the property source
38	* @param index
39	* the insertion index
40	* @param c
41	* the collection of elements to add
42	* @return whether the source's list property was changed
43	*/
44	boolean addAll(Object source, int index, Collection c);
45
46	/**
47	* Returns the element at the specified position in the source's list
48	* property
49	*
50	* @param source
51	* the property source
52	* @param index
53	* the element position
54	* @return the element at the given position in the source's list property
55	*/
56	Object get(Object source, int index);
57
58	/**
59	* Replaces the element at the specified position in the source's list
60	* property with the given element.
61	*
62	* @param source
63	* the property source
64	* @param index
65	* the element position
66	* @param element
67	* the replacement element
68	* @return the element previously at the specified position in the source's
69	* list property
70	*/
71	Object set(Object source, int index, Object element);
72
73	/**
74	* Moves the element at the specified old position in the source's list
75	* property to the specified new position
76	*
77	* @param source
78	* the property source
79	* @param oldIndex
80	* the old element position
81	* @param newIndex
82	* the new element position
83	* @return the element that was moved
84	*/
85	Object move(Object source, int oldIndex, int newIndex);
86
87	/**
88	* Inserts the element into the source's list property at the specified
89	* position
90	*
91	* @param source
92	* the property source
93	* @param index
94	* the insertion index
95	* @param element
96	* the element to insert
97	*/
98	void add(Object source, int index, Object element);
99
100	/**
101	* Removes the element from the source's list property which is located at
102	* the specified position
103	*
104	* @param source
105	* the property source
106	* @param index
107	* the index of the element to remove
108	* @return the element that was removed from the source's list property
109	*/
110	Object remove(Object source, int index);
111
112	/**
113	* Returns the index of the first location of the given element in the
114	* source's list property, or -1 if the list does not contain the element.
115	*
116	* @param source
117	* the property source
118	* @param o
119	* the element
120	* @return the index of the first location of the given element in the
121	* source's list property, or -1 if the list does not contain the
122	* element
123	*/
124	int indexOf(Object source, Object o);
125
126	/**
127	* Returns the index of the last location of the given element in the
128	* source's list property, or -1 if the list does not contain the given
129	* element.
130	*
131	* @param source
132	* @param o
133	* @return the index of the last location of the given element in the
134	* source's list property, or -1 if the list does not contain the
135	* element
136	*/
137	int lastIndexOf(Object source, Object o);
138
139	/**
140	* Adds the given list property change listener to the list of listeners for
141	* the given source.
142	*
143	* @param source
144	* the property source
145	* @param listener
146	* the listener
147	*/
148	public void addListChangeListener(Object source,
149	IListPropertyChangeListener listener);
150
151	/**
152	* Removes the given list property change listener from the list of
153	* listeners for the given source.
154	*
155	* @param source
156	* the property source
157	* @param listener
158	* the listener
159	*/
160	public void removeListChangeListener(Object source,
161	IListPropertyChangeListener listener);
162	}

Added Link Here

(-)src/org/eclipse/core/internal/databinding/property/PropertyObservableMap.java (+177 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.core.internal.databinding.property;
13
14	import java.util.Collection;
15	import java.util.Collections;
16	import java.util.Map;
17	import java.util.Set;
18
19	import org.eclipse.core.databinding.observable.ObservableTracker;
20	import org.eclipse.core.databinding.observable.Realm;
21	import org.eclipse.core.databinding.observable.map.AbstractObservableMap;
22	import org.eclipse.core.databinding.property.IMapProperty;
23	import org.eclipse.core.databinding.property.IMapPropertyChangeListener;
24	import org.eclipse.core.databinding.property.IProperty;
25	import org.eclipse.core.databinding.property.IPropertyObservable;
26	import org.eclipse.core.databinding.property.MapPropertyChangeEvent;
27
28	/**
29	* @since 3.3
30	*
31	*/
32	public class PropertyObservableMap extends AbstractObservableMap implements
33	IPropertyObservable {
34	private Object source;
35	private IMapProperty property;
36
37	private volatile boolean updating = false;
38
39	private boolean disposed = false;
40
41	private transient volatile int modCount = 0;
42
43	private IMapPropertyChangeListener listener = new IMapPropertyChangeListener() {
44	public void handleMapPropertyChange(final MapPropertyChangeEvent event) {
45	if (!disposed && !updating) {
46	getRealm().exec(new Runnable() {
47	public void run() {
48	getRealm().exec(new Runnable() {
49	public void run() {
50	modCount++;
51	fireMapChange(event.diff);
52	}
53	});
54	}
55	});
56	}
57	}
58	};
59
60	/**
61	* @param realm
62	* @param source
63	* @param property
64	*/
65	public PropertyObservableMap(Realm realm, Object source,
66	IMapProperty property) {
67	super(realm);
68	this.source = source;
69	this.property = property;
70	}
71
72	private void getterCalled() {
73	ObservableTracker.getterCalled(this);
74	}
75
76	protected void firstListenerAdded() {
77	if (!disposed) {
78	property.addMapChangeListener(source, listener);
79	}
80	}
81
82	protected void lastListenerRemoved() {
83	if (!disposed) {
84	property.removeMapChangeListener(source, listener);
85	}
86	}
87
88	public boolean containsKey(Object key) {
89	getterCalled();
90	return property.containsKey(source, key);
91	}
92
93	public boolean containsValue(Object value) {
94	getterCalled();
95	return property.containsValue(source, value);
96	}
97
98	public Set entrySet() {
99	getterCalled();
100	// unmodifiable for now
101	return Collections.unmodifiableSet(property.getMap(source).entrySet());
102	}
103
104	public Object get(Object key) {
105	getterCalled();
106	return property.get(source, key);
107	}
108
109	public boolean isEmpty() {
110	getterCalled();
111	return property.isEmpty(source);
112	}
113
114	public Set keySet() {
115	getterCalled();
116	return Collections.unmodifiableSet(property.getMap(source).keySet());
117	}
118
119	public Object put(Object key, Object value) {
120	checkRealm();
121	return property.put(source, key, value);
122	}
123
124	public void putAll(Map m) {
125	checkRealm();
126	property.putAll(source, m);
127	}
128
129	public Object remove(Object key) {
130	checkRealm();
131	return property.remove(source, key);
132	}
133
134	public int size() {
135	getterCalled();
136	return property.size(source);
137	}
138
139	public Collection values() {
140	getterCalled();
141	return Collections.unmodifiableCollection(property.getMap(source)
142	.values());
143	}
144
145	public void clear() {
146	getterCalled();
147	property.clear(source);
148	}
149
150	public boolean equals(Object o) {
151	getterCalled();
152	return property.equals(source, o);
153	}
154
155	public int hashCode() {
156	getterCalled();
157	return property.hashCode(source);
158	}
159
160	public Object getObserved() {
161	return source;
162	}
163
164	public IProperty getProperty() {
165	return property;
166	}
167
168	public synchronized void dispose() {
169	if (!disposed) {
170	disposed = true;
171	property.removeMapChangeListener(source, listener);
172	property = null;
173	source = null;
174	}
175	super.dispose();
176	}
177	}

Removed Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/ListObservableValue.java (-109 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	* Brad Reynolds - bug 164653
11	* Ashley Cambrell - bug 198904
12	*******************************************************************************/
13	package org.eclipse.jface.internal.databinding.swt;
14
15	import org.eclipse.core.databinding.observable.Diffs;
16	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.widgets.Event;
19	import org.eclipse.swt.widgets.List;
20	import org.eclipse.swt.widgets.Listener;
21
22	/**
23	* @since 3.2
24	*
25	*/
26	public class ListObservableValue extends AbstractSWTObservableValue {
27
28	private final List list;
29
30	private boolean updating = false;
31
32	private String currentValue;
33
34	private Listener listener;
35
36	/**
37	* @param list
38	*/
39	public ListObservableValue(List list) {
40	super(list);
41	this.list = list;
42	this.currentValue = (String) doGetValue();
43
44	if ((list.getStyle() & SWT.MULTI) > 0)
45	throw new IllegalArgumentException(
46	"SWT.SINGLE support only for a List selection"); //$NON-NLS-1$
47
48	listener = new Listener() {
49
50	public void handleEvent(Event event) {
51	if (!updating) {
52	Object oldValue = currentValue;
53	currentValue = (String) doGetValue();
54	fireValueChange(Diffs.createValueDiff(oldValue,
55	currentValue));
56	}
57	}
58
59	};
60	list.addListener(SWT.Selection, listener);
61	}
62
63	public void doSetValue(Object value) {
64	String oldValue = null;
65	if (list.getSelection() != null && list.getSelection().length > 0)
66	oldValue = list.getSelection()[0];
67	try {
68	updating = true;
69	String items[] = list.getItems();
70	int index = -1;
71	if (items != null && value != null) {
72	for (int i = 0; i < items.length; i++) {
73	if (value.equals(items[i])) {
74	index = i;
75	break;
76	}
77	}
78	list.select(index); // -1 will not "unselect"
79	}
80	currentValue = (String) value;
81	} finally {
82	updating = false;
83	}
84	fireValueChange(Diffs.createValueDiff(oldValue, value));
85	}
86
87	public Object doGetValue() {
88	int index = list.getSelectionIndex();
89	if (index >= 0)
90	return list.getItem(index);
91	return null;
92	}
93
94	public Object getValueType() {
95	return String.class;
96	}
97
98	/*
99	* (non-Javadoc)
100	*
101	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#dispose()
102	*/
103	public synchronized void dispose() {
104	super.dispose();
105	if (listener != null && !list.isDisposed()) {
106	list.removeListener(SWT.Selection, listener);
107	}
108	}
109	}

Removed Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/ShellObservableValue.java (-74 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007 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 207844)
10	* IBM Corporation - initial API and implementation
11	* Brad Reynolds - initial API and implementation
12	* Matthew Hall - bug 212235
13	*******************************************************************************/
14	package org.eclipse.jface.internal.databinding.swt;
15
16	import org.eclipse.core.databinding.observable.Diffs;
17	import org.eclipse.core.databinding.observable.Realm;
18	import org.eclipse.core.databinding.observable.value.IObservableValue;
19	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
20	import org.eclipse.swt.widgets.Shell;
21
22	/**
23	* An {@link IObservableValue} that tracks the text of a Shell.
24	*
25	* @since 1.2
26	*/
27	public class ShellObservableValue extends AbstractSWTObservableValue {
28
29	private final Shell shell;
30
31	/**
32	* Constructs a ShellObservableValue which tracks the text of the given
33	* Shell.
34	*
35	* @param shell
36	* the shell to track
37	*/
38	public ShellObservableValue(Shell shell) {
39	super(shell);
40	this.shell = shell;
41	}
42
43	/**
44	* Constructs a ShellObservableValue belonging to the given realm, which
45	* tracks the text of the given shell.
46	*
47	* @param realm
48	* the realm of the constructed observable
49	* @param shell
50	* the shell to track
51	*/
52	public ShellObservableValue(Realm realm, Shell shell) {
53	super(realm, shell);
54	this.shell = shell;
55	}
56
57	protected void doSetValue(final Object value) {
58	String oldValue = shell.getText();
59	String newValue = value == null ? "" : value.toString(); //$NON-NLS-1$
60	shell.setText(newValue);
61
62	if (!newValue.equals(oldValue)) {
63	fireValueChange(Diffs.createValueDiff(oldValue, newValue));
64	}
65	}
66
67	protected Object doGetValue() {
68	return shell.getText();
69	}
70
71	public Object getValueType() {
72	return String.class;
73	}
74	}

Removed Link Here

(-)src/org/eclipse/jface/internal/databinding/swt/TextEditableObservableValue.java (-75 lines)
1	/*******************************************************************************
2	* Copyright (c) 2007, 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	*******************************************************************************/
11
12	package org.eclipse.jface.internal.databinding.swt;
13
14	import org.eclipse.core.databinding.observable.Diffs;
15	import org.eclipse.core.databinding.observable.Realm;
16	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
17	import org.eclipse.swt.widgets.Text;
18
19	/**
20	* Observable value for the editable property of a Text.
21	*
22	* @since 1.1
23	*/
24	public class TextEditableObservableValue extends AbstractSWTObservableValue {
25	private Text text;
26
27	/**
28	* @param text
29	*/
30	public TextEditableObservableValue(Text text) {
31	super(text);
32	this.text = text;
33	}
34
35	/**
36	* @param realm
37	* @param text
38	*/
39	public TextEditableObservableValue(Realm realm, Text text) {
40	super(realm, text);
41	this.text = text;
42	}
43
44	/* (non-Javadoc)
45	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doGetValue()
46	*/
47	protected Object doGetValue() {
48	return (text.getEditable()) ? Boolean.TRUE : Boolean.FALSE;
49	}
50
51	/* (non-Javadoc)
52	* @see org.eclipse.core.databinding.observable.value.IObservableValue#getValueType()
53	*/
54	public Object getValueType() {
55	return Boolean.TYPE;
56	}
57
58	/* (non-Javadoc)
59	* @see org.eclipse.core.databinding.observable.value.AbstractObservableValue#doSetValue(java.lang.Object)
60	*/
61	protected void doSetValue(Object value) {
62	if (value == null) {
63	throw new IllegalArgumentException("Parameter value was null."); //$NON-NLS-1$
64	}
65
66	Boolean oldValue = new Boolean(text.getEditable());
67	Boolean newValue = (Boolean) value;
68
69	text.setEditable(newValue.booleanValue());
70
71	if (!oldValue.equals(newValue)) {
72	fireValueChange(Diffs.createValueDiff(oldValue, newValue));
73	}
74	}
75	}

Removed Link Here

(-)src/org/eclipse/jface/internal/databinding/internal/swt/LinkObservableValue.java (-47 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Michael Krauter, Catuno GmbH 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	* Michael Krauter, Catuno GmbH - initial API and implementation (bug 180223)
10	*******************************************************************************/
11	package org.eclipse.jface.internal.databinding.internal.swt;
12
13	import org.eclipse.core.databinding.observable.Diffs;
14	import org.eclipse.jface.internal.databinding.provisional.swt.AbstractSWTObservableValue;
15	import org.eclipse.swt.widgets.Link;
16
17	/**
18	* @since 1.2
19	*
20	*/
21	public class LinkObservableValue extends AbstractSWTObservableValue {
22
23	private final Link link;
24
25	/**
26	* @param link
27	*/
28	public LinkObservableValue(Link link) {
29	super(link);
30	this.link = link;
31	}
32
33	public void doSetValue(final Object value) {
34	String oldValue = link.getText();
35	link.setText(value == null ? "" : value.toString()); //$NON-NLS-1$
36	fireValueChange(Diffs.createValueDiff(oldValue, link.getText()));
37	}
38
39	public Object doGetValue() {
40	return link.getText();
41	}
42
43	public Object getValueType() {
44	return String.class;
45	}
46
47	}

Removed Link Here

(-)src/org/eclipse/jface/internal/databinding/provisional/swt/AbstractSWTObservableValue.java (-69 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006 The Pampered Chef, Inc. 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	* The Pampered Chef, Inc. - initial API and implementation
10	******************************************************************************/
11
12	package org.eclipse.jface.internal.databinding.provisional.swt;
13
14	import org.eclipse.core.databinding.observable.Realm;
15	import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
16	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
17	import org.eclipse.jface.databinding.swt.SWTObservables;
18	import org.eclipse.swt.events.DisposeEvent;
19	import org.eclipse.swt.events.DisposeListener;
20	import org.eclipse.swt.widgets.Widget;
21
22	/**
23	* NON-API - An abstract superclass for observable values that gurantees that the
24	* observable will be disposed when the control to which it is attached is
25	* disposed.
26	*
27	* @since 1.1
28	*/
29	public abstract class AbstractSWTObservableValue extends AbstractObservableValue implements ISWTObservableValue {
30
31	private final Widget widget;
32
33	/**
34	* Standard constructor for an SWT ObservableValue. Makes sure that
35	* the observable gets disposed when the SWT widget is disposed.
36	*
37	* @param widget
38	*/
39	protected AbstractSWTObservableValue(Widget widget) {
40	this(SWTObservables.getRealm(widget.getDisplay()), widget);
41	}
42
43	/**
44	* Constructor that allows for the setting of the realm. Makes sure that the
45	* observable gets disposed when the SWT widget is disposed.
46	*
47	* @param realm
48	* @param widget
49	* @since 1.2
50	*/
51	protected AbstractSWTObservableValue(Realm realm, Widget widget) {
52	super(realm);
53	this.widget = widget;
54	widget.addDisposeListener(disposeListener);
55	}
56
57	private DisposeListener disposeListener = new DisposeListener() {
58	public void widgetDisposed(DisposeEvent e) {
59	AbstractSWTObservableValue.this.dispose();
60	}
61	};
62
63	/**
64	* @return Returns the widget.
65	*/
66	public Widget getWidget() {
67	return widget;
68	}
69	}

Lines 19-46 Link Here

(-)src/org/eclipse/jface/databinding/swt/SWTObservables.java (-87 / +106 lines)
19		19
20	import org.eclipse.core.databinding.observable.Realm;	20	import org.eclipse.core.databinding.observable.Realm;
21	import org.eclipse.core.databinding.observable.list.IObservableList;	21	import org.eclipse.core.databinding.observable.list.IObservableList;
22	import org.eclipse.jface.internal.databinding.swt.ButtonObservableValue;	22	import org.eclipse.core.databinding.property.IListProperty;
23	import org.eclipse.jface.internal.databinding.swt.CComboObservableList;	23	import org.eclipse.core.databinding.property.IValueProperty;
24	import org.eclipse.jface.internal.databinding.swt.CComboObservableValue;	24	import org.eclipse.core.databinding.property.PropertyObservables;
25	import org.eclipse.jface.internal.databinding.swt.CComboSingleSelectionObservableValue;
26	import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;
27	import org.eclipse.jface.internal.databinding.swt.ComboObservableList;
28	import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;
29	import org.eclipse.jface.internal.databinding.internal.swt.LinkObservableValue;
30	import org.eclipse.jface.internal.databinding.swt.ComboSingleSelectionObservableValue;
31	import org.eclipse.jface.internal.databinding.swt.ControlObservableValue;
32	import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;	25	import org.eclipse.jface.internal.databinding.swt.DelayedObservableValue;
33	import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;	26	import org.eclipse.jface.internal.databinding.swt.SWTObservableListDecorator;
34	import org.eclipse.jface.internal.databinding.swt.ListObservableList;	27	import org.eclipse.jface.internal.databinding.swt.SWTObservableValueDecorator;
35	import org.eclipse.jface.internal.databinding.swt.ListObservableValue;	28	import org.eclipse.jface.internal.databinding.swt.SWTVetoableValueDecorator;
36	import org.eclipse.jface.internal.databinding.swt.ListSingleSelectionObservableValue;
37	import org.eclipse.jface.internal.databinding.swt.SWTProperties;
38	import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;
39	import org.eclipse.jface.internal.databinding.swt.ShellObservableValue;
40	import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;
41	import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionObservableValue;
42	import org.eclipse.jface.internal.databinding.swt.TextEditableObservableValue;
43	import org.eclipse.jface.internal.databinding.swt.TextObservableValue;
44	import org.eclipse.swt.custom.CCombo;	29	import org.eclipse.swt.custom.CCombo;
45	import org.eclipse.swt.custom.CLabel;	30	import org.eclipse.swt.custom.CLabel;
46	import org.eclipse.swt.widgets.Button;	31	import org.eclipse.swt.widgets.Button;
Lines 88-100 Link Here
88		73
89	/**	74	/**
90	* Returns an observable which delays notification of value change events	75	* Returns an observable which delays notification of value change events
91	* from <code>observable</code> until <code>delay</code> milliseconds	76	* from <code>observable</code> until <code>delay</code> milliseconds have
92	* have passed since the last change event, or until a FocusOut event is	77	* passed since the last change event, or until a FocusOut event is received
93	* received from the underlying widget (whichever happens earlier). This	78	* from the underlying widget (whichever happens earlier). This class helps
94	* class helps to delay validation until the user stops typing. To notify	79	* to delay validation until the user stops typing. To notify about pending
95	* about pending changes, the returned observable value will fire a stale	80	* changes, the returned observable value will fire a stale event when the
96	* event when the wrapped observable value fires a change event, but this	81	* wrapped observable value fires a change event, but this change is being
97	* change is being delayed.	82	* delayed.
98	*	83	*
99	* @param delay	84	* @param delay
100	* @param observable	85	* @param observable
Lines 104-111 Link Here
104	*	89	*
105	* @since 1.2	90	* @since 1.2
106	*/	91	*/
107	public static ISWTObservableValue observeDelayedValue(int delay, ISWTObservableValue observable) {	92	public static ISWTObservableValue observeDelayedValue(int delay,
108	return new DelayedObservableValue(delay, observable);	93	ISWTObservableValue observable) {
		94	return new DelayedObservableValue(delay, observable);
		95	}
		96
		97	private static ISWTObservableValue observeControl(Control control,
		98	IValueProperty property) {
		99	return new SWTObservableValueDecorator(
		100	PropertyObservables.observeValue(
		101	getRealm(control.getDisplay()), control, property),
		102	control);
109	}	103	}
110		104
111	/**	105	/**
Lines 114-120 Link Here
114	* control	108	* control
115	*/	109	*/
116	public static ISWTObservableValue observeEnabled(Control control) {	110	public static ISWTObservableValue observeEnabled(Control control) {
117	return new ControlObservableValue(control, SWTProperties.ENABLED);	111	return observeControl(control, ControlProperties.enablement());
118	}	112	}
119		113
120	/**	114	/**
Lines 123-129 Link Here
123	* control	117	* control
124	*/	118	*/
125	public static ISWTObservableValue observeVisible(Control control) {	119	public static ISWTObservableValue observeVisible(Control control) {
126	return new ControlObservableValue(control, SWTProperties.VISIBLE);	120	return observeControl(control, ControlProperties.visible());
127	}	121	}
128		122
129	/**	123	/**
Lines 132-138 Link Here
132	* control	126	* control
133	*/	127	*/
134	public static ISWTObservableValue observeTooltipText(Control control) {	128	public static ISWTObservableValue observeTooltipText(Control control) {
135	return new ControlObservableValue(control, SWTProperties.TOOLTIP_TEXT);	129	return observeControl(control, ControlProperties.toolTipText());
136	}	130	}
137		131
138	/**	132	/**
Lines 153-178 Link Here
153	* if <code>control</code> type is unsupported	147	* if <code>control</code> type is unsupported
154	*/	148	*/
155	public static ISWTObservableValue observeSelection(Control control) {	149	public static ISWTObservableValue observeSelection(Control control) {
		150	IValueProperty property;
156	if (control instanceof Spinner) {	151	if (control instanceof Spinner) {
157	return new SpinnerObservableValue((Spinner) control,	152	property = SpinnerProperties.selection();
158	SWTProperties.SELECTION);
159	} else if (control instanceof Button) {	153	} else if (control instanceof Button) {
160	return new ButtonObservableValue((Button) control);	154	property = ButtonProperties.selection();
161	} else if (control instanceof Combo) {	155	} else if (control instanceof Combo) {
162	return new ComboObservableValue((Combo) control,	156	property = ComboProperties.selection();
163	SWTProperties.SELECTION);
164	} else if (control instanceof CCombo) {	157	} else if (control instanceof CCombo) {
165	return new CComboObservableValue((CCombo) control,	158	property = CComboProperties.selection();
166	SWTProperties.SELECTION);
167	} else if (control instanceof List) {	159	} else if (control instanceof List) {
168	return new ListObservableValue((List) control);	160	property = ListProperties.selection();
169	} else if (control instanceof Scale) {	161	} else if (control instanceof Scale) {
170	return new ScaleObservableValue((Scale) control,	162	property = ScaleProperties.selection();
171	SWTProperties.SELECTION);	163	} else {
		164	throw new IllegalArgumentException(
		165	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
172	}	166	}
173		167
174	throw new IllegalArgumentException(	168	return observeControl(control, property);
175	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
176	}	169	}
177		170
178	/**	171	/**
Lines 189-203 Link Here
189	* if <code>control</code> type is unsupported	182	* if <code>control</code> type is unsupported
190	*/	183	*/
191	public static ISWTObservableValue observeMin(Control control) {	184	public static ISWTObservableValue observeMin(Control control) {
		185	IValueProperty property;
192	if (control instanceof Spinner) {	186	if (control instanceof Spinner) {
193	return new SpinnerObservableValue((Spinner) control,	187	property = SpinnerProperties.minimum();
194	SWTProperties.MIN);
195	} else if (control instanceof Scale) {	188	} else if (control instanceof Scale) {
196	return new ScaleObservableValue((Scale) control, SWTProperties.MIN);	189	property = ScaleProperties.minimum();
		190	} else {
		191	throw new IllegalArgumentException(
		192	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
197	}	193	}
198		194
199	throw new IllegalArgumentException(	195	return observeControl(control, property);
200	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
201	}	196	}
202		197
203	/**	198	/**
Lines 214-228 Link Here
214	* if <code>control</code> type is unsupported	209	* if <code>control</code> type is unsupported
215	*/	210	*/
216	public static ISWTObservableValue observeMax(Control control) {	211	public static ISWTObservableValue observeMax(Control control) {
		212	IValueProperty property;
217	if (control instanceof Spinner) {	213	if (control instanceof Spinner) {
218	return new SpinnerObservableValue((Spinner) control,	214	property = SpinnerProperties.maximum();
219	SWTProperties.MAX);
220	} else if (control instanceof Scale) {	215	} else if (control instanceof Scale) {
221	return new ScaleObservableValue((Scale) control, SWTProperties.MAX);	216	property = ScaleProperties.maximum();
		217	} else {
		218	throw new IllegalArgumentException(
		219	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
222	}	220	}
223		221
224	throw new IllegalArgumentException(	222	return observeControl(control, property);
225	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
226	}	223	}
227		224
228	/**	225	/**
Lines 233-247 Link Here
233	* </ul>	230	* </ul>
234	*	231	*
235	* <li>org.eclipse.swt.widgets.Label</li>	232	* <li>org.eclipse.swt.widgets.Label</li>
		233	*
236	* @param control	234	* @param control
237	* @param event event type to register for change events	235	* @param event
		236	* event type to register for change events
238	* @return observable value	237	* @return observable value
239	* @throws IllegalArgumentException	238	* @throws IllegalArgumentException
240	* if <code>control</code> type is unsupported	239	* if <code>control</code> type is unsupported
241	*/	240	*/
242	public static ISWTObservableValue observeText(Control control, int event) {	241	public static ISWTObservableValue observeText(Control control, int event) {
243	if (control instanceof Text) {	242	if (control instanceof Text) {
244	return new TextObservableValue((Text) control, event);	243	return new SWTVetoableValueDecorator(PropertyObservables
		244	.observeValue(control, TextProperties.text(event)), control);
245	}	245	}
246		246
247	throw new IllegalArgumentException(	247	throw new IllegalArgumentException(
Lines 266-288 Link Here
266	* if <code>control</code> type is unsupported	266	* if <code>control</code> type is unsupported
267	*/	267	*/
268	public static ISWTObservableValue observeText(Control control) {	268	public static ISWTObservableValue observeText(Control control) {
		269	IValueProperty property;
269	if (control instanceof Label) {	270	if (control instanceof Label) {
270	return new LabelObservableValue((Label) control);	271	property = LabelProperties.text();
271	} else if (control instanceof Link) {	272	} else if (control instanceof Link) {
272	return new LinkObservableValue((Link) control);	273	property = LinkProperties.text();
273	} else if (control instanceof CLabel) {	274	} else if (control instanceof CLabel) {
274	return new CLabelObservableValue((CLabel) control);	275	property = CLabelProperties.text();
275	} else if (control instanceof Combo) {	276	} else if (control instanceof Combo) {
276	return new ComboObservableValue((Combo) control, SWTProperties.TEXT);	277	property = ComboProperties.text();
277	} else if (control instanceof CCombo) {	278	} else if (control instanceof CCombo) {
278	return new CComboObservableValue((CCombo) control,	279	property = CComboProperties.text();
279	SWTProperties.TEXT);
280	} else if (control instanceof Shell) {	280	} else if (control instanceof Shell) {
281	return new ShellObservableValue((Shell) control);	281	property = ShellProperties.text();
		282	} else {
		283	throw new IllegalArgumentException(
		284	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
282	}	285	}
283		286
284	throw new IllegalArgumentException(	287	return observeControl(control, property);
285	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
286	}	288	}
287		289
288	/**	290	/**
Lines 300-315 Link Here
300	* if <code>control</code> type is unsupported	302	* if <code>control</code> type is unsupported
301	*/	303	*/
302	public static IObservableList observeItems(Control control) {	304	public static IObservableList observeItems(Control control) {
		305	IListProperty property;
303	if (control instanceof Combo) {	306	if (control instanceof Combo) {
304	return new ComboObservableList((Combo) control);	307	property = ComboProperties.items();
305	} else if (control instanceof CCombo) {	308	} else if (control instanceof CCombo) {
306	return new CComboObservableList((CCombo) control);	309	property = CComboProperties.items();
307	} else if (control instanceof List) {	310	} else if (control instanceof List) {
308	return new ListObservableList((List) control);	311	property = ListProperties.items();
		312	} else {
		313	throw new IllegalArgumentException(
		314	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
309	}	315	}
310		316
311	throw new IllegalArgumentException(	317	return new SWTObservableListDecorator(PropertyObservables.observeList(
312	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$	318	control, property), control);
313	}	319	}
314		320
315	/**	321	/**
Lines 329-346 Link Here
329	*/	335	*/
330	public static ISWTObservableValue observeSingleSelectionIndex(	336	public static ISWTObservableValue observeSingleSelectionIndex(
331	Control control) {	337	Control control) {
		338	IValueProperty property;
332	if (control instanceof Table) {	339	if (control instanceof Table) {
333	return new TableSingleSelectionObservableValue((Table) control);	340	property = TableProperties.singleSelectionIndex();
334	} else if (control instanceof Combo) {	341	} else if (control instanceof Combo) {
335	return new ComboSingleSelectionObservableValue((Combo) control);	342	property = ComboProperties.singleSelectionIndex();
336	} else if (control instanceof CCombo) {	343	} else if (control instanceof CCombo) {
337	return new CComboSingleSelectionObservableValue((CCombo) control);	344	property = CComboProperties.singleSelectionIndex();
338	} else if (control instanceof List) {	345	} else if (control instanceof List) {
339	return new ListSingleSelectionObservableValue((List) control);	346	property = ListProperties.singleSelectionIndex();
		347	} else {
		348	throw new IllegalArgumentException(
		349	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
340	}	350	}
341		351
342	throw new IllegalArgumentException(	352	return observeControl(control, property);
343	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
344	}	353	}
345		354
346	/**	355	/**
Lines 349-377 Link Here
349	* control	358	* control
350	*/	359	*/
351	public static ISWTObservableValue observeForeground(Control control) {	360	public static ISWTObservableValue observeForeground(Control control) {
352	return new ControlObservableValue(control, SWTProperties.FOREGROUND);	361	return observeControl(control, ControlProperties.foreground());
353	}	362	}
354		363
355	/**	364	/**
		365	* Returns an observable value tracking the background color of the given
		366	* control
		367	*
356	* @param control	368	* @param control
		369	* the control to observe
357	* @return an observable value tracking the background color of the given	370	* @return an observable value tracking the background color of the given
358	* control	371	* control
359	*/	372	*/
360	public static ISWTObservableValue observeBackground(Control control) {	373	public static ISWTObservableValue observeBackground(Control control) {
361	return new ControlObservableValue(control, SWTProperties.BACKGROUND);	374	return observeControl(control, ControlProperties.background());
362	}	375	}
363		376
364	/**	377	/**
		378	* Returns an observable value tracking the font of the given control.
		379	*
365	* @param control	380	* @param control
		381	* the control to observe
366	* @return an observable value tracking the font of the given control	382	* @return an observable value tracking the font of the given control
367	*/	383	*/
368	public static ISWTObservableValue observeFont(Control control) {	384	public static ISWTObservableValue observeFont(Control control) {
369	return new ControlObservableValue(control, SWTProperties.FONT);	385	return observeControl(control, ControlProperties.font());
370	}	386	}
371		387
372	/**	388	/**
373	* Returns an observable observing the editable attribute of	389	* Returns an observable observing the editable attribute of the provided
374	* the provided <code>control</code>. The supported types are:	390	* <code>control</code>. The supported types are:
375	* <ul>	391	* <ul>
376	* <li>org.eclipse.swt.widgets.Text</li>	392	* <li>org.eclipse.swt.widgets.Text</li>
377	* </ul>	393	* </ul>
Lines 382-393 Link Here
382	* if <code>control</code> type is unsupported	398	* if <code>control</code> type is unsupported
383	*/	399	*/
384	public static ISWTObservableValue observeEditable(Control control) {	400	public static ISWTObservableValue observeEditable(Control control) {
		401	IValueProperty property;
385	if (control instanceof Text) {	402	if (control instanceof Text) {
386	return new TextEditableObservableValue((Text) control);	403	property = TextProperties.editable();
		404	} else {
		405	throw new IllegalArgumentException(
		406	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
387	}	407	}
388		408
389	throw new IllegalArgumentException(	409	return observeControl(control, property);
390	"Widget [" + control.getClass().getName() + "] is not supported."); //$NON-NLS-1$//$NON-NLS-2$
391	}	410	}
392		411
393	private static class DisplayRealm extends Realm {	412	private static class DisplayRealm extends Realm {

Lines 11-35 Link Here

(-)src/org/eclipse/jface/tests/databinding/swt/SWTObservablesTest.java (-71 / +104 lines)
11		11
12	package org.eclipse.jface.tests.databinding.swt;	12	package org.eclipse.jface.tests.databinding.swt;
13		13
		14	import org.eclipse.core.databinding.observable.IDecoratingObservable;
14	import org.eclipse.core.databinding.observable.list.IObservableList;	15	import org.eclipse.core.databinding.observable.list.IObservableList;
		16	import org.eclipse.core.databinding.property.IPropertyObservable;
		17	import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
15	import org.eclipse.jface.databinding.conformance.util.RealmTester;	18	import org.eclipse.jface.databinding.conformance.util.RealmTester;
		19	import org.eclipse.jface.databinding.swt.ISWTObservable;
16	import org.eclipse.jface.databinding.swt.ISWTObservableValue;	20	import org.eclipse.jface.databinding.swt.ISWTObservableValue;
17	import org.eclipse.jface.databinding.swt.SWTObservables;	21	import org.eclipse.jface.databinding.swt.SWTObservables;
18	import org.eclipse.jface.internal.databinding.swt.ButtonObservableValue;	22	import org.eclipse.jface.internal.databinding.swt.CComboSelectionProperty;
19	import org.eclipse.jface.internal.databinding.swt.CComboObservableList;	23	import org.eclipse.jface.internal.databinding.swt.CComboTextProperty;
20	import org.eclipse.jface.internal.databinding.swt.CComboObservableValue;	24	import org.eclipse.jface.internal.databinding.swt.CLabelTextProperty;
21	import org.eclipse.jface.internal.databinding.swt.CLabelObservableValue;	25	import org.eclipse.jface.internal.databinding.swt.ComboSelectionProperty;
22	import org.eclipse.jface.internal.databinding.swt.ComboObservableList;	26	import org.eclipse.jface.internal.databinding.swt.ComboTextProperty;
23	import org.eclipse.jface.internal.databinding.swt.ComboObservableValue;	27	import org.eclipse.jface.internal.databinding.swt.LabelTextProperty;
24	import org.eclipse.jface.internal.databinding.swt.LabelObservableValue;	28	import org.eclipse.jface.internal.databinding.swt.ScaleMaximumProperty;
25	import org.eclipse.jface.internal.databinding.swt.ListObservableList;	29	import org.eclipse.jface.internal.databinding.swt.ScaleMinimumProperty;
26	import org.eclipse.jface.internal.databinding.swt.ListObservableValue;	30	import org.eclipse.jface.internal.databinding.swt.ScaleSelectionProperty;
27	import org.eclipse.jface.internal.databinding.swt.SWTProperties;	31	import org.eclipse.jface.internal.databinding.swt.SpinnerMaximumProperty;
28	import org.eclipse.jface.internal.databinding.swt.ScaleObservableValue;	32	import org.eclipse.jface.internal.databinding.swt.SpinnerMinimumProperty;
29	import org.eclipse.jface.internal.databinding.swt.SpinnerObservableValue;	33	import org.eclipse.jface.internal.databinding.swt.SpinnerSelectionProperty;
30	import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionObservableValue;	34	import org.eclipse.jface.internal.databinding.swt.TableSingleSelectionIndexProperty;
31	import org.eclipse.jface.internal.databinding.swt.TextEditableObservableValue;	35	import org.eclipse.jface.internal.databinding.swt.TextEditableProperty;
32	import org.eclipse.jface.internal.databinding.swt.TextObservableValue;	36	import org.eclipse.jface.internal.databinding.swt.TextTextProperty;
33	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;	37	import org.eclipse.jface.tests.databinding.AbstractSWTTestCase;
34	import org.eclipse.swt.SWT;	38	import org.eclipse.swt.SWT;
35	import org.eclipse.swt.custom.CCombo;	39	import org.eclipse.swt.custom.CCombo;
Lines 55-68 Link Here
55		59
56	protected void setUp() throws Exception {	60	protected void setUp() throws Exception {
57	super.setUp();	61	super.setUp();
58		62
59	shell = getShell();	63	shell = getShell();
60	RealmTester.setDefault(SWTObservables.getRealm(shell.getDisplay()));	64	RealmTester.setDefault(SWTObservables.getRealm(shell.getDisplay()));
61	}	65	}
62		66
63	protected void tearDown() throws Exception {	67	protected void tearDown() throws Exception {
64	super.tearDown();	68	super.tearDown();
65		69
66	RealmTester.setDefault(null);	70	RealmTester.setDefault(null);
67	}	71	}
68		72
Lines 88-141 Link Here
88	Spinner spinner = new Spinner(shell, SWT.NONE);	92	Spinner spinner = new Spinner(shell, SWT.NONE);
89	ISWTObservableValue value = SWTObservables.observeSelection(spinner);	93	ISWTObservableValue value = SWTObservables.observeSelection(spinner);
90	assertNotNull(value);	94	assertNotNull(value);
91	assertTrue(value instanceof SpinnerObservableValue);	95	assertTrue(value.getWidget() == spinner);
92		96
93	SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;	97	IPropertyObservable propertyObservable = getPropertyObservable(value);
94	assertEquals(SWTProperties.SELECTION, spinnerObservable.getAttribute());	98	assertTrue(propertyObservable.getProperty() instanceof SpinnerSelectionProperty);
95	}	99	}
96		100
97	public void testObserveSelectionOfButton() throws Exception {	101	public void testObserveSelectionOfButton() throws Exception {
98	Button button = new Button(shell, SWT.PUSH);	102	Button button = new Button(shell, SWT.PUSH);
99	ISWTObservableValue value = SWTObservables.observeSelection(button);	103	ISWTObservableValue value = SWTObservables.observeSelection(button);
100	assertNotNull(value);	104	assertNotNull(value);
101	assertTrue(value instanceof ButtonObservableValue);	105	assertTrue(value.getWidget() == button);
102	}	106	}
103		107
104	public void testObserveSelectionOfCombo() throws Exception {	108	public void testObserveSelectionOfCombo() throws Exception {
105	Combo combo = new Combo(shell, SWT.NONE);	109	Combo combo = new Combo(shell, SWT.NONE);
106	ISWTObservableValue value = SWTObservables.observeSelection(combo);	110	ISWTObservableValue value = SWTObservables.observeSelection(combo);
107	assertNotNull(value);	111	assertNotNull(value);
108	assertTrue(value instanceof ComboObservableValue);	112	assertTrue(value.getWidget() == combo);
109		113
110	ComboObservableValue comboObservable = (ComboObservableValue) value;	114	IPropertyObservable propertyObservable = getPropertyObservable(value);
111	assertEquals(SWTProperties.SELECTION, comboObservable.getAttribute());	115	assertTrue(propertyObservable.getProperty() instanceof ComboSelectionProperty);
112	}	116	}
113		117
114	public void testObserveSelectionOfCCombo() throws Exception {	118	public void testObserveSelectionOfCCombo() throws Exception {
115	CCombo combo = new CCombo(shell, SWT.NONE);	119	CCombo combo = new CCombo(shell, SWT.NONE);
116	ISWTObservableValue value = SWTObservables.observeSelection(combo);	120	ISWTObservableValue value = SWTObservables.observeSelection(combo);
117	assertNotNull(value);	121	assertNotNull(value);
118	assertTrue(value instanceof CComboObservableValue);	122	assertTrue(value.getWidget() == combo);
119		123
120	CComboObservableValue ccomboObservable = (CComboObservableValue) value;	124	IPropertyObservable property = getPropertyObservable(value);
121	assertEquals(SWTProperties.SELECTION, ccomboObservable.getAttribute());	125	assertTrue(property.getProperty() instanceof CComboSelectionProperty);
122	}	126	}
123		127
124	public void testObserveSelectionOfList() throws Exception {	128	public void testObserveSelectionOfList() throws Exception {
125	List list = new List(shell, SWT.NONE);	129	List list = new List(shell, SWT.NONE);
126	ISWTObservableValue value = SWTObservables.observeSelection(list);	130	ISWTObservableValue value = SWTObservables.observeSelection(list);
127	assertNotNull(value);	131	assertNotNull(value);
128	assertTrue(value instanceof ListObservableValue);	132	assertTrue(value.getWidget() == list);
129	}	133	}
130		134
131	public void testObserveSelectionOfScale() throws Exception {	135	public void testObserveSelectionOfScale() throws Exception {
132	Scale scale = new Scale(shell, SWT.NONE);	136	Scale scale = new Scale(shell, SWT.NONE);
133	ISWTObservableValue value = SWTObservables.observeSelection(scale);	137	ISWTObservableValue value = SWTObservables.observeSelection(scale);
134	assertNotNull(value);	138	assertNotNull(value);
135	assertTrue(value instanceof ScaleObservableValue);	139	assertTrue(value.getWidget() == scale);
136		140
137	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;	141	IPropertyObservable property = getPropertyObservable(value);
138	assertEquals(SWTProperties.SELECTION, scaleObservable.getAttribute());	142	assertTrue(property.getProperty() instanceof ScaleSelectionProperty);
139	}	143	}
140		144
141	public void testObserveSelectionOfUnsupportedControl() throws Exception {	145	public void testObserveSelectionOfUnsupportedControl() throws Exception {
Lines 154-160 Link Here
154	ISWTObservableValue value = SWTObservables.observeText(text,	158	ISWTObservableValue value = SWTObservables.observeText(text,
155	SWT.FocusOut);	159	SWT.FocusOut);
156	assertNotNull(value);	160	assertNotNull(value);
157	assertTrue(value instanceof TextObservableValue);	161	assertTrue(value.getWidget() == text);
		162	IPropertyObservable propertyObservable = getPropertyObservable(value);
		163	assertTrue(propertyObservable.getProperty() instanceof TextTextProperty);
		164
		165	assertFalse(text.isListening(SWT.FocusOut));
		166	ChangeEventTracker.observe(value);
158	assertTrue(text.isListening(SWT.FocusOut));	167	assertTrue(text.isListening(SWT.FocusOut));
159	}	168	}
160		169
Lines 171-204 Link Here
171	Label label = new Label(shell, SWT.NONE);	180	Label label = new Label(shell, SWT.NONE);
172	ISWTObservableValue value = SWTObservables.observeText(label);	181	ISWTObservableValue value = SWTObservables.observeText(label);
173	assertNotNull(label);	182	assertNotNull(label);
174	assertTrue(value instanceof LabelObservableValue);	183	assertTrue(value.getWidget() == label);
		184	IPropertyObservable propertyObservable = getPropertyObservable(value);
		185	assertTrue(propertyObservable.getProperty() instanceof LabelTextProperty);
175	}	186	}
176		187
177	public void testObserveTextOfCLabel() throws Exception {	188	public void testObserveTextOfCLabel() throws Exception {
178	CLabel label = new CLabel(shell, SWT.NONE);	189	CLabel label = new CLabel(shell, SWT.NONE);
179	ISWTObservableValue value = SWTObservables.observeText(label);	190	ISWTObservableValue value = SWTObservables.observeText(label);
180	assertNotNull(label);	191	assertNotNull(label);
181	assertTrue(value instanceof CLabelObservableValue);	192	assertTrue(value.getWidget() == label);
		193	IPropertyObservable propertyObservable = getPropertyObservable(value);
		194	assertTrue(propertyObservable.getProperty() instanceof CLabelTextProperty);
182	}	195	}
183		196
184	public void testObserveTextOfCombo() throws Exception {	197	public void testObserveTextOfCombo() throws Exception {
185	Combo combo = new Combo(shell, SWT.NONE);	198	Combo combo = new Combo(shell, SWT.NONE);
186	ISWTObservableValue value = SWTObservables.observeText(combo);	199	ISWTObservableValue value = SWTObservables.observeText(combo);
187	assertNotNull(value);	200	assertNotNull(value);
188	assertTrue(value instanceof ComboObservableValue);	201	assertTrue(value.getWidget() == combo);
		202
		203	assertTrue(getPropertyObservable(value).getProperty() instanceof ComboTextProperty);
		204	}
189		205
190	ComboObservableValue comboObservable = (ComboObservableValue) value;	206	/**
191	assertEquals(SWTProperties.TEXT, comboObservable.getAttribute());	207	* @param observable
		208	* @return
		209	*/
		210	private IPropertyObservable getPropertyObservable(
		211	ISWTObservableValue observable) {
		212	IDecoratingObservable decoratingObservable = (IDecoratingObservable) observable;
		213	IPropertyObservable propertyObservable = (IPropertyObservable) decoratingObservable
		214	.getDecorated();
		215	return propertyObservable;
192	}	216	}
193		217
194	public void testObserveTextOfCCombo() throws Exception {	218	public void testObserveTextOfCCombo() throws Exception {
195	CCombo combo = new CCombo(shell, SWT.NONE);	219	CCombo combo = new CCombo(shell, SWT.NONE);
196	ISWTObservableValue value = SWTObservables.observeText(combo);	220	ISWTObservableValue value = SWTObservables.observeText(combo);
197	assertNotNull(value);	221	assertNotNull(value);
198	assertTrue(value instanceof CComboObservableValue);	222	assertTrue(value.getWidget() == combo);
199		223
200	CComboObservableValue ccomboObservable = (CComboObservableValue) value;	224	IDecoratingObservable decorating = (IDecoratingObservable) value;
201	assertEquals(SWTProperties.TEXT, ccomboObservable.getAttribute());	225	IPropertyObservable property = (IPropertyObservable) decorating
		226	.getDecorated();
		227	assertTrue(property.getProperty() instanceof CComboTextProperty);
202	}	228	}
203		229
204	public void testObserveTextOfUnsupportedControl() throws Exception {	230	public void testObserveTextOfUnsupportedControl() throws Exception {
Lines 214-234 Link Here
214	Combo combo = new Combo(shell, SWT.NONE);	240	Combo combo = new Combo(shell, SWT.NONE);
215	IObservableList list = SWTObservables.observeItems(combo);	241	IObservableList list = SWTObservables.observeItems(combo);
216	assertNotNull(list);	242	assertNotNull(list);
217	assertTrue(list instanceof ComboObservableList);	243	assertTrue(list instanceof ISWTObservable);
		244	assertTrue(((ISWTObservable) list).getWidget() == combo);
218	}	245	}
219		246
220	public void testObserveItemsOfCCombo() throws Exception {	247	public void testObserveItemsOfCCombo() throws Exception {
221	CCombo ccombo = new CCombo(shell, SWT.NONE);	248	CCombo ccombo = new CCombo(shell, SWT.NONE);
222	IObservableList list = SWTObservables.observeItems(ccombo);	249	IObservableList list = SWTObservables.observeItems(ccombo);
223	assertNotNull(list);	250	assertNotNull(list);
224	assertTrue(list instanceof CComboObservableList);	251	ISWTObservable swtObservable = (ISWTObservable) list;
		252	assertTrue(swtObservable.getWidget() == ccombo);
225	}	253	}
226		254
227	public void testObserveItemsOfList() throws Exception {	255	public void testObserveItemsOfList() throws Exception {
228	List list = new List(shell, SWT.NONE);	256	List list = new List(shell, SWT.NONE);
229	IObservableList observableList = SWTObservables.observeItems(list);	257	IObservableList observableList = SWTObservables.observeItems(list);
230	assertNotNull(observableList);	258	assertNotNull(observableList);
231	assertTrue(observableList instanceof ListObservableList);	259	ISWTObservable swtObservable = (ISWTObservable) observableList;
		260	assertTrue(swtObservable.getWidget() == list);
232	}	261	}
233		262
234	public void testObserveItemsOfUnsupportedControl() throws Exception {	263	public void testObserveItemsOfUnsupportedControl() throws Exception {
Lines 245-251 Link Here
245	ISWTObservableValue value = SWTObservables	274	ISWTObservableValue value = SWTObservables
246	.observeSingleSelectionIndex(table);	275	.observeSingleSelectionIndex(table);
247	assertNotNull(value);	276	assertNotNull(value);
248	assertTrue(value instanceof TableSingleSelectionObservableValue);	277	assertTrue(value.getWidget() == table);
		278	IPropertyObservable propertyObservable = getPropertyObservable(value);
		279	assertTrue(propertyObservable.getProperty() instanceof TableSingleSelectionIndexProperty);
249	}	280	}
250		281
251	public void testObserveSingleSelectionIndexOfUnsupportedControl()	282	public void testObserveSingleSelectionIndexOfUnsupportedControl()
Lines 258-282 Link Here
258		289
259	}	290	}
260	}	291	}
261		292
262	public void testObserveMinOfSpinner() throws Exception {	293	public void testObserveMinOfSpinner() throws Exception {
263	Spinner spinner = new Spinner(shell, SWT.NONE);	294	Spinner spinner = new Spinner(shell, SWT.NONE);
264	ISWTObservableValue value = SWTObservables.observeMin(spinner);	295	ISWTObservableValue value = SWTObservables.observeMin(spinner);
265	assertNotNull(value);	296	assertNotNull(value);
266	assertTrue(value instanceof SpinnerObservableValue);	297	assertTrue(value.getWidget() == spinner);
267		298
268	SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;	299	IPropertyObservable propertyObservable = getPropertyObservable(value);
269	assertEquals(SWTProperties.MIN, spinnerObservable.getAttribute());	300	assertTrue(propertyObservable.getProperty() instanceof SpinnerMinimumProperty);
270	}	301	}
271		302
272	public void testObserveMinOfScale() throws Exception {	303	public void testObserveMinOfScale() throws Exception {
273	Scale scale = new Scale(shell, SWT.NONE);	304	Scale scale = new Scale(shell, SWT.NONE);
274	ISWTObservableValue value = SWTObservables.observeMin(scale);	305	ISWTObservableValue value = SWTObservables.observeMin(scale);
275	assertNotNull(value);	306	assertNotNull(value);
276	assertTrue(value instanceof ScaleObservableValue);	307	assertTrue(value.getWidget() == scale);
277		308
278	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;	309	IPropertyObservable propertyObservable = getPropertyObservable(value);
279	assertEquals(SWTProperties.MIN, scaleObservable.getAttribute());	310	assertTrue(propertyObservable.getProperty() instanceof ScaleMinimumProperty);
280	}	311	}
281		312
282	public void testObserveMinOfUnsupportedControl() throws Exception {	313	public void testObserveMinOfUnsupportedControl() throws Exception {
Lines 284-313 Link Here
284	try {	315	try {
285	SWTObservables.observeMin(text);	316	SWTObservables.observeMin(text);
286	fail("Exception should have been thrown");	317	fail("Exception should have been thrown");
287	} catch (IllegalArgumentException e) {	318	} catch (IllegalArgumentException e) {
288	}	319	}
289	}	320	}
290		321
291	public void testObserveMaxOfSpinner() throws Exception {	322	public void testObserveMaxOfSpinner() throws Exception {
292	Spinner spinner = new Spinner(shell, SWT.NONE);	323	Spinner spinner = new Spinner(shell, SWT.NONE);
293	ISWTObservableValue value = SWTObservables.observeMax(spinner);	324	ISWTObservableValue value = SWTObservables.observeMax(spinner);
294	assertNotNull(value);	325	assertNotNull(value);
295	assertTrue(value instanceof SpinnerObservableValue);	326	assertTrue(value.getWidget() == spinner);
296		327
297	SpinnerObservableValue spinnerObservable = (SpinnerObservableValue) value;	328	IPropertyObservable propertyObservable = getPropertyObservable(value);
298	assertEquals(SWTProperties.MAX, spinnerObservable.getAttribute());	329	assertTrue(propertyObservable.getProperty() instanceof SpinnerMaximumProperty);
299	}	330	}
300		331
301	public void testObserveMaxOfScale() throws Exception {	332	public void testObserveMaxOfScale() throws Exception {
302	Scale scale = new Scale(shell, SWT.NONE);	333	Scale scale = new Scale(shell, SWT.NONE);
303	ISWTObservableValue value = SWTObservables.observeMax(scale);	334	ISWTObservableValue value = SWTObservables.observeMax(scale);
304	assertNotNull(value);	335	assertNotNull(value);
305	assertTrue(value instanceof ScaleObservableValue);	336	assertTrue(value.getWidget() == scale);
306		337
307	ScaleObservableValue scaleObservable = (ScaleObservableValue) value;	338	IPropertyObservable propertyObservable = getPropertyObservable(value);
308	assertEquals(SWTProperties.MAX, scaleObservable.getAttribute());	339	assertTrue(propertyObservable.getProperty() instanceof ScaleMaximumProperty);
309	}	340	}
310		341
311	public void testObserveMaxOfUnsupportedControl() throws Exception {	342	public void testObserveMaxOfUnsupportedControl() throws Exception {
312	Text text = new Text(shell, SWT.NONE);	343	Text text = new Text(shell, SWT.NONE);
313	try {	344	try {
Lines 316-329 Link Here
316	} catch (IllegalArgumentException e) {	347	} catch (IllegalArgumentException e) {
317	}	348	}
318	}	349	}
319		350
320	public void testObserveEditableOfText() throws Exception {	351	public void testObserveEditableOfText() throws Exception {
321	Text text = new Text(shell, SWT.NONE);	352	Text text = new Text(shell, SWT.NONE);
322	ISWTObservableValue value = SWTObservables.observeEditable(text);	353	ISWTObservableValue value = SWTObservables.observeEditable(text);
323	assertNotNull(value);	354	assertNotNull(value);
324	assertTrue(value instanceof TextEditableObservableValue);	355	assertTrue(value.getWidget() == text);
		356	IPropertyObservable propertyObservable = getPropertyObservable(value);
		357	assertTrue(propertyObservable.getProperty() instanceof TextEditableProperty);
325	}	358	}
326		359
327	public void testObserveEditableOfUnsupportedControl() throws Exception {	360	public void testObserveEditableOfUnsupportedControl() throws Exception {
328	Label label = new Label(shell, SWT.NONE);	361	Label label = new Label(shell, SWT.NONE);
329	try {	362	try {

Lines 7-18 Link Here

(-)src/org/eclipse/core/tests/internal/databinding/beans/JavaBeanObservableArrayBasedListTest.java (-32 / +25 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Brad Reynolds - initial API and implementation	9	* Brad Reynolds - initial API and implementation
10	* Matthew Hall - bugs 221351, 213145	10	* Matthew Hall - bugs 221351, 213145, 194734
11	******************************************************************************/	11	******************************************************************************/
12		12
13	package org.eclipse.core.tests.internal.databinding.beans;	13	package org.eclipse.core.tests.internal.databinding.beans;
14		14
15	import java.beans.IntrospectionException;
16	import java.beans.PropertyChangeEvent;	15	import java.beans.PropertyChangeEvent;
17	import java.beans.PropertyChangeListener;	16	import java.beans.PropertyChangeListener;
18	import java.beans.PropertyDescriptor;	17	import java.beans.PropertyDescriptor;
Lines 23-35 Link Here
23	import junit.framework.Test;	22	import junit.framework.Test;
24	import junit.framework.TestSuite;	23	import junit.framework.TestSuite;
25		24
		25	import org.eclipse.core.databinding.beans.BeanProperties;
		26	import org.eclipse.core.databinding.beans.BeansObservables;
		27	import org.eclipse.core.databinding.beans.IBeanObservable;
		28	import org.eclipse.core.databinding.beans.IBeanProperty;
26	import org.eclipse.core.databinding.observable.IObservable;	29	import org.eclipse.core.databinding.observable.IObservable;
27	import org.eclipse.core.databinding.observable.IObservableCollection;	30	import org.eclipse.core.databinding.observable.IObservableCollection;
28	import org.eclipse.core.databinding.observable.Realm;	31	import org.eclipse.core.databinding.observable.Realm;
29	import org.eclipse.core.databinding.observable.list.IObservableList;	32	import org.eclipse.core.databinding.observable.list.IObservableList;
30	import org.eclipse.core.databinding.observable.list.ListChangeEvent;	33	import org.eclipse.core.databinding.observable.list.ListChangeEvent;
31	import org.eclipse.core.databinding.observable.list.ListDiffEntry;	34	import org.eclipse.core.databinding.observable.list.ListDiffEntry;
32	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
33	import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;	35	import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
34	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;	36	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
35	import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker;	37	import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker;
Lines 42-48 Link Here
42	*/	44	*/
43	public class JavaBeanObservableArrayBasedListTest extends	45	public class JavaBeanObservableArrayBasedListTest extends
44	AbstractDefaultRealmTestCase {	46	AbstractDefaultRealmTestCase {
45	private JavaBeanObservableList list;	47	private IObservableList list;
		48	private IBeanObservable beanObservable;
46		49
47	private PropertyDescriptor propertyDescriptor;	50	private PropertyDescriptor propertyDescriptor;
48		51
Lines 59-77 Link Here
59	super.setUp();	62	super.setUp();
60		63
61	propertyName = "array";	64	propertyName = "array";
62	propertyDescriptor = new PropertyDescriptor(propertyName, Bean.class);	65	propertyDescriptor = ((IBeanProperty) BeanProperties.listProperty(
		66	Bean.class, propertyName)).getPropertyDescriptor();
63	bean = new Bean(new Object[0]);	67	bean = new Bean(new Object[0]);
64		68
65	list = new JavaBeanObservableList(SWTObservables.getRealm(Display	69	list = BeansObservables.observeList(SWTObservables.getRealm(Display
66	.getDefault()), bean, propertyDescriptor, Bean.class);	70	.getDefault()), bean, propertyName);
		71	beanObservable = (IBeanObservable) list;
67	}	72	}
68		73
69	public void testGetObserved() throws Exception {	74	public void testGetObserved() throws Exception {
70	assertSame(bean, list.getObserved());	75	assertSame(bean, beanObservable.getObserved());
71	}	76	}
72		77
73	public void testGetPropertyDescriptor() throws Exception {	78	public void testGetPropertyDescriptor() throws Exception {
74	assertSame(propertyDescriptor, list.getPropertyDescriptor());	79	assertEquals(propertyDescriptor, beanObservable.getPropertyDescriptor());
75	}	80	}
76		81
77	public void testRegistersListenerAfterFirstListenerIsAdded()	82	public void testRegistersListenerAfterFirstListenerIsAdded()
Lines 308-323 Link Here
308	}	313	}
309		314
310	public void testRemoveAll() throws Exception {	315	public void testRemoveAll() throws Exception {
311	List elements = Arrays.asList(new String[] { "1", "2" });	316	list.addAll(Arrays.asList(new String[] { "1", "2", "3", "4" }));
312	list.addAll(elements);
313	list.addAll(elements);
314
315	assertEquals(4, bean.getArray().length);	317	assertEquals(4, bean.getArray().length);
316	list.removeAll(elements);	318
		319	list.removeAll(Arrays.asList(new String[] { "2", "4" }));
317		320
318	assertEquals(2, bean.getArray().length);	321	assertEquals(2, bean.getArray().length);
319	assertEquals(elements.get(0), bean.getArray()[0]);	322	assertEquals("1", bean.getArray()[0]);
320	assertEquals(elements.get(1), bean.getArray()[1]);	323	assertEquals("3", bean.getArray()[1]);
321	}	324	}
322		325
323	public void testRemoveAllListChangeEvent() throws Exception {	326	public void testRemoveAllListChangeEvent() throws Exception {
Lines 471-478 Link Here
471	PropertyChangeEvent event = listener.evt;	474	PropertyChangeEvent event = listener.evt;
472	assertEquals("event did not fire", 1, listener.count);	475	assertEquals("event did not fire", 1, listener.count);
473	assertEquals("array", event.getPropertyName());	476	assertEquals("array", event.getPropertyName());
474	assertTrue("old value", Arrays.equals(old, (Object[]) event.getOldValue()));	477	assertTrue("old value", Arrays.equals(old, (Object[]) event
475	assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event.getNewValue()));	478	.getOldValue()));
		479	assertTrue("new value", Arrays.equals(bean.getArray(), (Object[]) event
		480	.getNewValue()));
476	assertFalse("lists are equal", Arrays.equals(bean.getArray(), old));	481	assertFalse("lists are equal", Arrays.equals(bean.getArray(), old));
477	}	482	}
478		483
Lines 482-492 Link Here
482		487
483	PropertyChangeEvent evt;	488	PropertyChangeEvent evt;
484		489
485	/*
486	* (non-Javadoc)
487	*
488	* @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
489	*/
490	public void propertyChange(PropertyChangeEvent evt) {	490	public void propertyChange(PropertyChangeEvent evt) {
491	count++;	491	count++;
492	this.evt = evt;	492	this.evt = evt;
Lines 504-520 Link Here
504	public IObservableCollection createObservableCollection(Realm realm,	504	public IObservableCollection createObservableCollection(Realm realm,
505	int elementCount) {	505	int elementCount) {
506	String propertyName = "array";	506	String propertyName = "array";
507	PropertyDescriptor propertyDescriptor;
508	try {
509	propertyDescriptor = new PropertyDescriptor(propertyName,
510	Bean.class);
511	} catch (IntrospectionException e) {
512	throw new RuntimeException(e);
513	}
514	Object bean = new Bean(new Object[0]);	507	Object bean = new Bean(new Object[0]);
515		508
516	IObservableList list = new JavaBeanObservableList(realm, bean,	509	IObservableList list = BeansObservables.observeList(realm, bean,
517	propertyDescriptor, String.class);	510	propertyName, String.class);
518	for (int i = 0; i < elementCount; i++)	511	for (int i = 0; i < elementCount; i++)
519	list.add(createElement(list));	512	list.add(createElement(list));
520	return list;	513	return list;

Lines 18-30 Link Here

(-)src/org/eclipse/core/tests/internal/databinding/beans/BeanObservableListDecoratorTest.java (-13 / +7 lines)
18	import junit.framework.TestCase;	18	import junit.framework.TestCase;
19	import junit.framework.TestSuite;	19	import junit.framework.TestSuite;
20		20
		21	import org.eclipse.core.databinding.beans.BeansObservables;
21	import org.eclipse.core.databinding.observable.IObservable;	22	import org.eclipse.core.databinding.observable.IObservable;
22	import org.eclipse.core.databinding.observable.IObservableCollection;	23	import org.eclipse.core.databinding.observable.IObservableCollection;
23	import org.eclipse.core.databinding.observable.Realm;	24	import org.eclipse.core.databinding.observable.Realm;
24	import org.eclipse.core.databinding.observable.list.IObservableList;	25	import org.eclipse.core.databinding.observable.list.IObservableList;
25	import org.eclipse.core.databinding.observable.list.WritableList;	26	import org.eclipse.core.databinding.observable.list.WritableList;
26	import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;	27	import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
27	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
28	import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;	28	import org.eclipse.jface.databinding.conformance.MutableObservableListContractTest;
29	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;	29	import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableCollectionContractDelegate;
30	import org.eclipse.jface.databinding.swt.SWTObservables;	30	import org.eclipse.jface.databinding.swt.SWTObservables;
Lines 36-71 Link Here
36	public class BeanObservableListDecoratorTest extends TestCase {	36	public class BeanObservableListDecoratorTest extends TestCase {
37	private Bean bean;	37	private Bean bean;
38	private PropertyDescriptor propertyDescriptor;	38	private PropertyDescriptor propertyDescriptor;
39	private JavaBeanObservableList observableList;	39	private IObservableList observableList;
40	private BeanObservableListDecorator decorator;	40	private BeanObservableListDecorator decorator;
41		41
42	/*
43	* (non-Javadoc)
44	*
45	* @see junit.framework.TestCase#setUp()
46	*/
47	protected void setUp() throws Exception {	42	protected void setUp() throws Exception {
48	super.setUp();	43	super.setUp();
49		44
50	bean = new Bean();	45	bean = new Bean();
51	propertyDescriptor = new PropertyDescriptor(	46	propertyDescriptor = new PropertyDescriptor(
52	"list", Bean.class,"getList","setList");	47	"list", Bean.class,"getList","setList");
53	observableList = new JavaBeanObservableList(	48	observableList = BeansObservables.observeList(
54	SWTObservables.getRealm(Display.getDefault()), bean,	49	SWTObservables.getRealm(Display.getDefault()), bean, "list");
55	propertyDescriptor, Bean.class);
56	decorator = new BeanObservableListDecorator(observableList, propertyDescriptor);	50	decorator = new BeanObservableListDecorator(observableList, propertyDescriptor);
57	}	51	}
58		52
59	public void testGetDelegate() throws Exception {	53	public void testGetDelegate() throws Exception {
60	assertEquals(observableList, decorator.getDecorated());	54	assertSame(observableList, decorator.getDecorated());
61	}	55	}
62		56
63	public void testGetObserved() throws Exception {	57	public void testGetObserved() throws Exception {
64	assertEquals(bean, decorator.getObserved());	58	assertSame(bean, decorator.getObserved());
65	}	59	}
66		60
67	public void testGetPropertyDescriptor() throws Exception {	61	public void testGetPropertyDescriptor() throws Exception {
68	assertEquals(propertyDescriptor, decorator.getPropertyDescriptor());	62	assertSame(propertyDescriptor, decorator.getPropertyDescriptor());
69	}	63	}
70		64
71	public static Test suite() {	65	public static Test suite() {

Lines 155-161 Link Here

(-)src/org/eclipse/jface/tests/databinding/BindingTestSuite.java (-3 lines)
155	import org.eclipse.jface.tests.internal.databinding.swt.DelayedObservableValueTest;	155	import org.eclipse.jface.tests.internal.databinding.swt.DelayedObservableValueTest;
156	import org.eclipse.jface.tests.internal.databinding.swt.LabelObservableValueTest;	156	import org.eclipse.jface.tests.internal.databinding.swt.LabelObservableValueTest;
157	import org.eclipse.jface.tests.internal.databinding.swt.ListSingleSelectionObservableValueTest;	157	import org.eclipse.jface.tests.internal.databinding.swt.ListSingleSelectionObservableValueTest;
158	import org.eclipse.jface.tests.internal.databinding.swt.SWTObservableListTest;
159	import org.eclipse.jface.tests.internal.databinding.swt.ScaleObservableValueMaxTest;	158	import org.eclipse.jface.tests.internal.databinding.swt.ScaleObservableValueMaxTest;
160	import org.eclipse.jface.tests.internal.databinding.swt.ScaleObservableValueMinTest;	159	import org.eclipse.jface.tests.internal.databinding.swt.ScaleObservableValueMinTest;
161	import org.eclipse.jface.tests.internal.databinding.swt.ScaleObservableValueSelectionTest;	160	import org.eclipse.jface.tests.internal.databinding.swt.ScaleObservableValueSelectionTest;
Lines 366-373 Link Here
366	addTestSuite(ComboSingleSelectionObservableValueTest.class);	365	addTestSuite(ComboSingleSelectionObservableValueTest.class);
367	addTest(DelayedObservableValueTest.suite());	366	addTest(DelayedObservableValueTest.suite());
368		367
369	addTest(SWTObservableListTest.suite());
370
371	addTestSuite(ControlObservableValueTest.class);	368	addTestSuite(ControlObservableValueTest.class);
372	addTest(LabelObservableValueTest.suite());	369	addTest(LabelObservableValueTest.suite());
373	addTestSuite(ListSingleSelectionObservableValueTest.class);	370	addTestSuite(ListSingleSelectionObservableValueTest.class);

Lines 7-16 Link Here

(-)src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java (-18 / +16 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Matthew Hall - bug 194734
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	package org.eclipse.core.tests.databinding.beans;	13	package org.eclipse.core.tests.databinding.beans;
13		14
		15	import org.eclipse.core.databinding.beans.IBeanObservable;
14	import org.eclipse.core.databinding.beans.PojoObservables;	16	import org.eclipse.core.databinding.beans.PojoObservables;
15	import org.eclipse.core.databinding.observable.Realm;	17	import org.eclipse.core.databinding.observable.Realm;
16	import org.eclipse.core.databinding.observable.list.IObservableList;	18	import org.eclipse.core.databinding.observable.list.IObservableList;
Lines 19-28 Link Here
19	import org.eclipse.core.databinding.observable.set.IObservableSet;	21	import org.eclipse.core.databinding.observable.set.IObservableSet;
20	import org.eclipse.core.databinding.observable.set.WritableSet;	22	import org.eclipse.core.databinding.observable.set.WritableSet;
21	import org.eclipse.core.databinding.observable.value.IObservableValue;	23	import org.eclipse.core.databinding.observable.value.IObservableValue;
22	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;
23	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
24	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
25	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
26	import org.eclipse.core.tests.internal.databinding.beans.Bean;	24	import org.eclipse.core.tests.internal.databinding.beans.Bean;
27	import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;	25	import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
28	import org.eclipse.jface.databinding.conformance.util.CurrentRealm;	26	import org.eclipse.jface.databinding.conformance.util.CurrentRealm;
Lines 47-58 Link Here
47	propertyName = "value";	45	propertyName = "value";
48	}	46	}
49		47
50	public void testObserveValue_ReturnsJavaBeanObservableValue()	48	public void testObserveValue_ReturnsIBeanObservable()
51	throws Exception {	49	throws Exception {
52	IObservableValue value = PojoObservables.observeValue(pojo, propertyName);	50	IObservableValue value = PojoObservables.observeValue(pojo, propertyName);
53		51
54	assertNotNull(value);	52	assertNotNull(value);
55	assertTrue(value instanceof JavaBeanObservableValue);	53	assertTrue(value instanceof IBeanObservable);
56	}	54	}
57		55
58	public void testObserveValue_DoesNotAttachListeners() throws Exception {	56	public void testObserveValue_DoesNotAttachListeners() throws Exception {
Lines 62-78 Link Here
62	assertFalse(pojo.hasListeners(propertyName));	60	assertFalse(pojo.hasListeners(propertyName));
63	}	61	}
64		62
65	public void testObservableValueWithRealm_ReturnsJavaBeanObservable()	63	public void testObservableValueWithRealm_ReturnsIBeanObservable()
66	throws Exception {	64	throws Exception {
67	CurrentRealm realm = new CurrentRealm(true);	65	CurrentRealm realm = new CurrentRealm(true);
68	IObservableValue value = PojoObservables.observeValue(realm, pojo,	66	IObservableValue value = PojoObservables.observeValue(realm, pojo,
69	propertyName);	67	propertyName);
70		68
71	assertNotNull(value);	69	assertNotNull(value);
72	assertTrue(value instanceof JavaBeanObservableValue);	70	assertTrue(value instanceof IBeanObservable);
73	}	71	}
74		72
75	public void testObservableMap_ReturnsJavaBeanObservableMap()	73	public void testObservableMap_ReturnsIBeanObservable()
76	throws Exception {	74	throws Exception {
77	IObservableSet set = new WritableSet();	75	IObservableSet set = new WritableSet();
78	set.add(new Bean());	76	set.add(new Bean());
Lines 80-86 Link Here
80	IObservableMap map = PojoObservables.observeMap(set, Bean.class,	78	IObservableMap map = PojoObservables.observeMap(set, Bean.class,
81	propertyName);	79	propertyName);
82	assertNotNull(map);	80	assertNotNull(map);
83	assertTrue(map instanceof JavaBeanObservableMap);	81	assertTrue(map instanceof IBeanObservable);
84	}	82	}
85		83
86	public void testObservableMap_DoesNotAttachListeners() throws Exception {	84	public void testObservableMap_DoesNotAttachListeners() throws Exception {
Lines 101-109 Link Here
101	assertEquals(2, maps.length);	99	assertEquals(2, maps.length);
102	}	100	}
103		101
104	public void testObserveListWithElementType_ReturnsJavaBeanObservableList() throws Exception {	102	public void testObserveListWithElementType_ReturnsIBeanObservable() throws Exception {
105	IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);	103	IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);
106	assertTrue(list instanceof JavaBeanObservableList);	104	assertTrue(list instanceof IBeanObservable);
107	}	105	}
108		106
109	public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {	107	public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {
Lines 113-121 Link Here
113	assertFalse(pojo.hasListeners("list"));	111	assertFalse(pojo.hasListeners("list"));
114	}	112	}
115		113
116	public void testObserveList_ReturnsJavaBeanObservableList() throws Exception {	114	public void testObserveList_ReturnsIBeanObservable() throws Exception {
117	IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");	115	IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");
118	assertTrue(observable instanceof JavaBeanObservableList);	116	assertTrue(observable instanceof IBeanObservable);
119	}	117	}
120		118
121	public void testObserveList_DoesNotAttachListeners() throws Exception {	119	public void testObserveList_DoesNotAttachListeners() throws Exception {
Lines 125-133 Link Here
125	assertFalse(pojo.hasListeners("list"));	123	assertFalse(pojo.hasListeners("list"));
126	}	124	}
127		125
128	public void testObserveSetWithElementType_ReturnsJavaBeanObservableList() throws Exception {	126	public void testObserveSetWithElementType_ReturnsIBeanObservable() throws Exception {
129	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);	127	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);
130	assertTrue(list instanceof JavaBeanObservableSet);	128	assertTrue(list instanceof IBeanObservable);
131	}	129	}
132		130
133	public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {	131	public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {
Lines 137-145 Link Here
137	assertFalse(pojo.hasListeners("set"));	135	assertFalse(pojo.hasListeners("set"));
138	}	136	}
139		137
140	public void testObserveSet_ReturnsJavaBeanObservableList() throws Exception {	138	public void testObserveSet_ReturnsIBeanObservable() throws Exception {
141	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");	139	IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");
142	assertTrue(list instanceof JavaBeanObservableSet);	140	assertTrue(list instanceof IBeanObservable);
143	}	141	}
144		142
145	public void testObserveSet_DoesNotAttachListeners() throws Exception {	143	public void testObserveSet_DoesNotAttachListeners() throws Exception {

Removed Link Here

(-)src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableMap.java (-142 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006, 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	* Brad Reynolds - bug 171616
11	* Matthew hall - bugs 223164, 241585
12	*******************************************************************************/
13
14	package org.eclipse.core.internal.databinding.beans;
15
16	import java.beans.PropertyChangeListener;
17	import java.beans.PropertyDescriptor;
18	import java.lang.reflect.Method;
19
20	import org.eclipse.core.databinding.beans.IBeanObservable;
21	import org.eclipse.core.databinding.observable.Diffs;
22	import org.eclipse.core.databinding.observable.map.ComputedObservableMap;
23	import org.eclipse.core.databinding.observable.set.IObservableSet;
24	import org.eclipse.core.databinding.util.Policy;
25	import org.eclipse.core.runtime.IStatus;
26	import org.eclipse.core.runtime.Status;
27
28	/**
29	* @since 1.0
30	*
31	*/
32	public class JavaBeanObservableMap extends ComputedObservableMap implements
33	IBeanObservable {
34
35	private PropertyDescriptor propertyDescriptor;
36
37	private PropertyChangeListener elementListener = new PropertyChangeListener() {
38	public void propertyChange(final java.beans.PropertyChangeEvent event) {
39	if (!updating) {
40	getRealm().exec(new Runnable() {
41	public void run() {
42	fireMapChange(Diffs.createMapDiffSingleChange(
43	event.getSource(), event.getOldValue(), event
44	.getNewValue()));
45	}
46	});
47	}
48	}
49	};
50
51	private ListenerSupport listenerSupport;
52
53	private boolean updating = false;
54
55	private boolean attachListeners;
56
57	/**
58	* @param domain
59	* @param propertyDescriptor
60	*/
61	public JavaBeanObservableMap(IObservableSet domain,
62	PropertyDescriptor propertyDescriptor) {
63	this(domain, propertyDescriptor, true);
64	}
65
66	/**
67	* @param domain
68	* @param propertyDescriptor
69	* @param attachListeners
70	*/
71	public JavaBeanObservableMap(IObservableSet domain,
72	PropertyDescriptor propertyDescriptor, boolean attachListeners) {
73	super(domain);
74
75	this.propertyDescriptor = propertyDescriptor;
76	this.attachListeners = attachListeners;
77	if (attachListeners) {
78	this.listenerSupport = new ListenerSupport(elementListener,
79	propertyDescriptor.getName());
80	}
81	init();
82	}
83
84	protected void hookListener(Object domainElement) {
85	if (attachListeners && domainElement != null) {
86	listenerSupport.hookListener(domainElement);
87	}
88	}
89
90	protected void unhookListener(Object domainElement) {
91	if (attachListeners && domainElement != null) {
92	listenerSupport.unhookListener(domainElement);
93	}
94	}
95
96	protected Object doGet(Object key) {
97	if (key == null) {
98	return null;
99	}
100	try {
101	Method readMethod = propertyDescriptor.getReadMethod();
102	if (!readMethod.isAccessible()) {
103	readMethod.setAccessible(true);
104	}
105	return readMethod.invoke(key, new Object[0]);
106	} catch (Exception e) {
107	Policy.getLog().log(
108	new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
109	IStatus.ERROR, "cannot get value", e)); //$NON-NLS-1$
110	throw new RuntimeException(e);
111	}
112	}
113
114	protected Object doPut(Object key, Object value) {
115	try {
116	Object oldValue = get(key);
117	propertyDescriptor.getWriteMethod().invoke(key,
118	new Object[] { value });
119	keySet().add(key);
120	return oldValue;
121	} catch (Exception e) {
122	Policy.getLog().log(
123	new Status(IStatus.ERROR, Policy.JFACE_DATABINDING,
124	IStatus.ERROR, "cannot set value", e)); //$NON-NLS-1$
125	throw new RuntimeException(e);
126	}
127	}
128
129	/* (non-Javadoc)
130	* @see org.eclipse.core.databinding.beans.IBeanObservable#getObserved()
131	*/
132	public Object getObserved() {
133	return keySet();
134	}
135
136	/* (non-Javadoc)
137	* @see org.eclipse.core.databinding.beans.IBeanObservable#getPropertyDescriptor()
138	*/
139	public PropertyDescriptor getPropertyDescriptor() {
140	return propertyDescriptor;
141	}
142	}

Removed Link Here

(-)src/org/eclipse/core/internal/databinding/beans/JavaBeanObservableList.java (-410 lines)
1	/*******************************************************************************
2	* Copyright (c) 2006-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	* Brad Reynolds - bug 171616
11	* Matthew Hall - bugs 208858, 221351, 213145, 223164
12	* Mike Evans - bug 217558
13	*******************************************************************************/
14
15	package org.eclipse.core.internal.databinding.beans;
16
17	import java.beans.PropertyChangeListener;
18	import java.beans.PropertyDescriptor;
19	import java.lang.reflect.Array;
20	import java.lang.reflect.InvocationTargetException;
21	import java.lang.reflect.Method;
22	import java.util.ArrayList;
23	import java.util.Arrays;
24	import java.util.Collection;
25	import java.util.Iterator;
26	import java.util.List;
27
28	import org.eclipse.core.databinding.BindingException;
29	import org.eclipse.core.databinding.beans.IBeanObservable;
30	import org.eclipse.core.databinding.observable.Diffs;
31	import org.eclipse.core.databinding.observable.Realm;
32	import org.eclipse.core.databinding.observable.list.ListDiffEntry;
33	import org.eclipse.core.databinding.observable.list.ObservableList;
34
35	/**
36	* @since 1.0
37	*
38	*/
39	public class JavaBeanObservableList extends ObservableList implements
40	IBeanObservable {
41
42	private final Object object;
43
44	private PropertyChangeListener collectionListener = new PropertyChangeListener() {
45	public void propertyChange(java.beans.PropertyChangeEvent event) {
46	if (!updating) {
47	getRealm().exec(new Runnable() {
48	public void run() {
49	updateWrappedList( new ArrayList( Arrays.asList(getValues() ) ) );
50	}
51	});
52	}
53	}
54	};
55
56	private boolean updating = false;
57
58	private PropertyDescriptor descriptor;
59
60	private ListenerSupport collectionListenSupport;
61
62	private boolean attachListeners;
63
64	/**
65	* @param realm
66	* @param object
67	* @param descriptor
68	* @param elementType
69	*/
70	public JavaBeanObservableList(Realm realm, Object object,
71	PropertyDescriptor descriptor, Class elementType) {
72	this(realm, object, descriptor, elementType, true);
73	}
74
75	/**
76	* @param realm
77	* @param object
78	* @param descriptor
79	* @param elementType
80	* @param attachListeners
81	*/
82	public JavaBeanObservableList(Realm realm, Object object,
83	PropertyDescriptor descriptor, Class elementType,
84	boolean attachListeners) {
85
86	super(realm, new ArrayList(), elementType);
87	this.object = object;
88	this.descriptor = descriptor;
89	this.attachListeners = attachListeners;
90
91	if (attachListeners) {
92	this.collectionListenSupport = new ListenerSupport(
93	collectionListener, descriptor.getName());
94	}
95
96	// initialize list without firing events
97	wrappedList.addAll(Arrays.asList(getValues()));
98	}
99
100	protected void firstListenerAdded() {
101	if (attachListeners) {
102	collectionListenSupport.hookListener(this.object);
103	}
104	}
105
106	protected void lastListenerRemoved() {
107	if (collectionListenSupport != null) {
108	collectionListenSupport.dispose();
109	}
110	}
111
112	public void dispose() {
113	super.dispose();
114	lastListenerRemoved();
115	}
116
117	private Object primGetValues() {
118	Exception ex = null;
119	try {
120	Method readMethod = descriptor.getReadMethod();
121	if (!readMethod.isAccessible()) {
122	readMethod.setAccessible(true);
123	}
124	return readMethod.invoke(object, new Object[0]);
125	} catch (IllegalArgumentException e) {
126	ex = e;
127	} catch (IllegalAccessException e) {
128	ex = e;
129	} catch (InvocationTargetException e) {
130	ex = e;
131	}
132	throw new BindingException("Could not read collection values", ex); //$NON-NLS-1$
133	}
134
135	private Object[] getValues() {
136	Object[] values = null;
137
138	Object result = primGetValues();
139	if (descriptor.getPropertyType().isArray())
140	values = (Object[]) result;
141	else {
142	// TODO add jUnit for POJO (var. SettableValue) collections
143	Collection list = (Collection) result;
144	if (list != null) {
145	values = list.toArray();
146	}
147	}
148	if (values == null)
149	values = new Object[0];
150	return values;
151	}
152
153	public Object getObserved() {
154	return object;
155	}
156
157	public PropertyDescriptor getPropertyDescriptor() {
158	return descriptor;
159	}
160
161	private void setValues() {
162	if (descriptor.getPropertyType().isArray()) {
163	Class componentType = descriptor.getPropertyType()
164	.getComponentType();
165	Object[] newArray = (Object[]) Array.newInstance(componentType,
166	wrappedList.size());
167	wrappedList.toArray(newArray);
168	primSetValues(newArray);
169	} else {
170	// assume that it is a java.util.List
171	primSetValues(new ArrayList(wrappedList));
172	}
173	}
174
175	private void primSetValues(Object newValue) {
176	Exception ex = null;
177	try {
178	Method writeMethod = descriptor.getWriteMethod();
179	if (!writeMethod.isAccessible()) {
180	writeMethod.setAccessible(true);
181	}
182	writeMethod.invoke(object, new Object[] { newValue });
183	return;
184	} catch (IllegalArgumentException e) {
185	ex = e;
186	} catch (IllegalAccessException e) {
187	ex = e;
188	} catch (InvocationTargetException e) {
189	ex = e;
190	}
191	throw new BindingException("Could not write collection values", ex); //$NON-NLS-1$
192	}
193
194	public Object set(int index, Object element) {
195	getterCalled();
196	updating = true;
197	try {
198	Object oldElement = wrappedList.set(index, element);
199	setValues();
200	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
201	index, false, oldElement), Diffs.createListDiffEntry(index,
202	true, element)));
203	return oldElement;
204	} finally {
205	updating = false;
206	}
207	}
208
209	public Object move(int oldIndex, int newIndex) {
210	getterCalled();
211	updating = true;
212	try {
213	int size = wrappedList.size();
214	if (oldIndex < 0 \|\| oldIndex >= size)
215	throw new IndexOutOfBoundsException(
216	"oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
217	if (newIndex < 0 \|\| newIndex >= size)
218	throw new IndexOutOfBoundsException(
219	"newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
220	if (oldIndex == newIndex)
221	return wrappedList.get(oldIndex);
222	Object element = wrappedList.remove(oldIndex);
223	wrappedList.add(newIndex, element);
224	setValues();
225	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
226	oldIndex, false, element), Diffs.createListDiffEntry(
227	newIndex, true, element)));
228	return element;
229	} finally {
230	updating = false;
231	}
232	}
233
234	public Object remove(int index) {
235	getterCalled();
236	updating = true;
237	try {
238	Object oldElement = wrappedList.remove(index);
239	setValues();
240	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
241	index, false, oldElement)));
242	return oldElement;
243	} finally {
244	updating = false;
245	}
246	}
247
248	public boolean add(Object element) {
249	updating = true;
250	try {
251	int index = wrappedList.size();
252	boolean result = wrappedList.add(element);
253	setValues();
254	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
255	index, true, element)));
256	return result;
257	} finally {
258	updating = false;
259	}
260	}
261
262	public void add(int index, Object element) {
263	updating = true;
264	try {
265	wrappedList.add(index, element);
266	setValues();
267	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
268	index, true, element)));
269	} finally {
270	updating = false;
271	}
272	}
273
274	public boolean addAll(Collection c) {
275	if (c.isEmpty()) {
276	return false;
277	}
278	updating = true;
279	try {
280	int index = wrappedList.size();
281	boolean result = wrappedList.addAll(c);
282	setValues();
283	ListDiffEntry[] entries = new ListDiffEntry[c.size()];
284	int i = 0;
285	for (Iterator it = c.iterator(); it.hasNext();) {
286	Object o = it.next();
287	entries[i++] = Diffs.createListDiffEntry(index++, true, o);
288	}
289	fireListChange(Diffs.createListDiff(entries));
290	return result;
291	} finally {
292	updating = false;
293	}
294	}
295
296	public boolean addAll(int index, Collection c) {
297	if (c.isEmpty()) {
298	return false;
299	}
300	updating = true;
301	try {
302	boolean result = wrappedList.addAll(index, c);
303	setValues();
304	ListDiffEntry[] entries = new ListDiffEntry[c.size()];
305	int i = 0;
306	for (Iterator it = c.iterator(); it.hasNext();) {
307	Object o = it.next();
308	entries[i++] = Diffs.createListDiffEntry(index++, true, o);
309	}
310	fireListChange(Diffs.createListDiff(entries));
311	return result;
312	} finally {
313	updating = false;
314	}
315	}
316
317	public boolean remove(Object o) {
318	getterCalled();
319	int index = wrappedList.indexOf(o);
320	if (index == -1) {
321	return false;
322	}
323	updating = true;
324	try {
325	Object oldElement = wrappedList.remove(index);
326	setValues();
327	fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
328	index, false, oldElement)));
329	return true;
330	} finally {
331	updating = false;
332	}
333	}
334
335	public boolean removeAll(Collection c) {
336	getterCalled();
337	boolean changed = false;
338	updating = true;
339	try {
340	List diffEntries = new ArrayList();
341	for (Iterator it = c.iterator(); it.hasNext();) {
342	Object o = it.next();
343	int index = wrappedList.indexOf(o);
344	if (index != -1) {
345	changed = true;
346	Object oldElement = wrappedList.remove(index);
347	diffEntries.add(Diffs.createListDiffEntry(index, false,
348	oldElement));
349	}
350	}
351	if (changed) {
352	setValues();
353	fireListChange(Diffs
354	.createListDiff((ListDiffEntry[]) diffEntries
355	.toArray(new ListDiffEntry[diffEntries.size()])));
356	}
357	return changed;
358	} finally {
359	updating = false;
360	}
361	}
362
363	public boolean retainAll(Collection c) {
364	getterCalled();
365	boolean changed = false;
366	updating = true;
367	try {
368	List diffEntries = new ArrayList();
369	int index = 0;
370	for (Iterator it = wrappedList.iterator(); it.hasNext();) {
371	Object o = it.next();
372	boolean retain = c.contains(o);
373	if (retain) {
374	index++;
375	} else {
376	changed = true;
377	it.remove();
378	diffEntries.add(Diffs.createListDiffEntry(index, false, o));
379	}
380	}
381	if (changed) {
382	setValues();
383	fireListChange(Diffs
384	.createListDiff((ListDiffEntry[]) diffEntries
385	.toArray(new ListDiffEntry[diffEntries.size()])));
386	}
387	return changed;
388	} finally {
389	updating = false;
390	}
391	}
392
393	public void clear() {
394	updating = true;
395	try {
396	List diffEntries = new ArrayList();
397	for (Iterator it = wrappedList.iterator(); it.hasNext();) {
398	Object o = it.next();
399	diffEntries.add(Diffs.createListDiffEntry(0, false, o));
400	}
401	wrappedList.clear();
402	setValues();
403	fireListChange(Diffs.createListDiff((ListDiffEntry[]) diffEntries
404	.toArray(new ListDiffEntry[diffEntries.size()])));
405	} finally {
406	updating = false;
407	}
408	}
409
410	}

Lines 8-24 Link Here

(-)src/org/eclipse/core/databinding/beans/BeansObservables.java (-114 / +60 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Brad Reynolds - bugs 164268, 171616, 147515	10	* Brad Reynolds - bugs 164268, 171616, 147515
11	* Matthew Hall - bug 221704, 234686, 246625	11	* Matthew Hall - bug 221704, 234686, 246625, 194734
12	* Thomas Kratz - bug 213787	12	* Thomas Kratz - bug 213787
13	*******************************************************************************/	13	*******************************************************************************/
14	package org.eclipse.core.databinding.beans;	14	package org.eclipse.core.databinding.beans;
15		15
16	import java.beans.BeanInfo;
17	import java.beans.IntrospectionException;
18	import java.beans.Introspector;
19	import java.beans.PropertyDescriptor;	16	import java.beans.PropertyDescriptor;
20		17
21	import org.eclipse.core.databinding.BindingException;
22	import org.eclipse.core.databinding.observable.IObservable;	18	import org.eclipse.core.databinding.observable.IObservable;
23	import org.eclipse.core.databinding.observable.Realm;	19	import org.eclipse.core.databinding.observable.Realm;
24	import org.eclipse.core.databinding.observable.list.IObservableList;	20	import org.eclipse.core.databinding.observable.list.IObservableList;
Lines 27-41 Link Here
27	import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;	23	import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
28	import org.eclipse.core.databinding.observable.set.IObservableSet;	24	import org.eclipse.core.databinding.observable.set.IObservableSet;
29	import org.eclipse.core.databinding.observable.value.IObservableValue;	25	import org.eclipse.core.databinding.observable.value.IObservableValue;
		26	import org.eclipse.core.databinding.property.IListProperty;
		27	import org.eclipse.core.databinding.property.IMapProperty;
		28	import org.eclipse.core.databinding.property.ISetProperty;
		29	import org.eclipse.core.databinding.property.IValueProperty;
		30	import org.eclipse.core.databinding.property.PropertyObservables;
30	import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;	31	import org.eclipse.core.internal.databinding.beans.BeanObservableListDecorator;
31	import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;	32	import org.eclipse.core.internal.databinding.beans.BeanObservableMapDecorator;
32	import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;	33	import org.eclipse.core.internal.databinding.beans.BeanObservableSetDecorator;
33	import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;	34	import org.eclipse.core.internal.databinding.beans.BeanObservableValueDecorator;
34	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableList;	35	import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
35	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableMap;
36	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableSet;
37	import org.eclipse.core.internal.databinding.beans.JavaBeanObservableValue;
38	import org.eclipse.core.internal.databinding.beans.JavaBeanPropertyObservableMap;
39	import org.eclipse.core.runtime.Assert;	36	import org.eclipse.core.runtime.Assert;
40		37
41	/**	38	/**
Lines 83-91 Link Here
83	*/	80	*/
84	public static IObservableValue observeValue(Realm realm, Object bean,	81	public static IObservableValue observeValue(Realm realm, Object bean,
85	String propertyName) {	82	String propertyName) {
86	PropertyDescriptor descriptor = getPropertyDescriptor(bean.getClass(),	83	IValueProperty property = BeanProperties.valueProperty(bean.getClass(),
87	propertyName);	84	propertyName);
88	return new JavaBeanObservableValue(realm, bean, descriptor);	85	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		86	.getPropertyDescriptor();
		87	return new BeanObservableValueDecorator(PropertyObservables
		88	.observeValue(realm, bean, property), propertyDescriptor);
89	}	89	}
90		90
91	/**	91	/**
Lines 103-111 Link Here
103	*/	103	*/
104	public static IObservableMap observeMap(IObservableSet domain,	104	public static IObservableMap observeMap(IObservableSet domain,
105	Class beanClass, String propertyName) {	105	Class beanClass, String propertyName) {
106	PropertyDescriptor descriptor = getPropertyDescriptor(beanClass,	106	IValueProperty property = BeanProperties.valueProperty(beanClass,
107	propertyName);	107	propertyName);
108	return new JavaBeanObservableMap(domain, descriptor);	108	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		109	.getPropertyDescriptor();
		110	return new BeanObservableMapDecorator(PropertyObservables.observeDetailValues(
		111	domain, property), propertyDescriptor);
109	}	112	}
110		113
111	/**	114	/**
Lines 124-132 Link Here
124	*/	127	*/
125	public static IObservableMap observeMap(Realm realm, Object bean,	128	public static IObservableMap observeMap(Realm realm, Object bean,
126	String propertyName) {	129	String propertyName) {
127	PropertyDescriptor descriptor = getPropertyDescriptor(bean.getClass(),	130	IMapProperty property = BeanProperties.mapProperty(bean.getClass(),
128	propertyName);	131	propertyName);
129	return new JavaBeanPropertyObservableMap(realm, bean, descriptor);	132	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
		133	.getPropertyDescriptor();
		134	return new BeanObservableMapDecorator(PropertyObservables.observeMap(
		135	bean, property), propertyDescriptor);
130	}	136	}
131		137
132	/**	138	/**
Lines 145-171 Link Here
145	return observeMap(Realm.getDefault(), bean, propertyName);	151	return observeMap(Realm.getDefault(), bean, propertyName);
146	}	152	}
147		153
148	/package/ static PropertyDescriptor getPropertyDescriptor(Class beanClass,
149	String propertyName) {
150	BeanInfo beanInfo;
151	try {
152	beanInfo = Introspector.getBeanInfo(beanClass);
153	} catch (IntrospectionException e) {
154	// cannot introspect, give up
155	return null;
156	}
157	PropertyDescriptor[] propertyDescriptors = beanInfo
158	.getPropertyDescriptors();
159	for (int i = 0; i < propertyDescriptors.length; i++) {
160	PropertyDescriptor descriptor = propertyDescriptors[i];
161	if (descriptor.getName().equals(propertyName)) {
162	return descriptor;
163	}
164	}
165	throw new BindingException(
166	"Could not find property with name " + propertyName + " in class " + beanClass); //$NON-NLS-1$ //$NON-NLS-2$
167	}
168
169	/**	154	/**
170	* Returns an array of observable maps in the default realm tracking the	155	* Returns an array of observable maps in the default realm tracking the
171	* current values of the named propertys for the beans in the given set.	156	* current values of the named propertys for the beans in the given set.
Lines 231-239 Link Here
231	* collection-typed named property of the given bean object. The returned	216	* collection-typed named property of the given bean object. The returned
232	* list is mutable. When an item is added or removed the setter is invoked	217	* list is mutable. When an item is added or removed the setter is invoked
233	* for the list on the parent bean to provide notification to other	218	* for the list on the parent bean to provide notification to other
234	* listeners via <code>PropertyChangeEvents</code>. This is done to	219	* listeners via <code>PropertyChangeEvents</code>. This is done to provide
235	* provide the same behavior as is expected from arrays as specified in the	220	* the same behavior as is expected from arrays as specified in the bean
236	* bean spec in section 7.2.	221	* spec in section 7.2.
237	*	222	*
238	* @param realm	223	* @param realm
239	* the realm	224	* the realm
Lines 242-249 Link Here
242	* @param propertyName	227	* @param propertyName
243	* the name of the property	228	* the name of the property
244	* @param elementType	229	* @param elementType
245	* type of the elements in the list. If <code>null</code> and	230	* type of the elements in the list. If <code>null</code> and the
246	* the property is an array the type will be inferred. If	231	* property is an array the type will be inferred. If
247	* <code>null</code> and the property type cannot be inferred	232	* <code>null</code> and the property type cannot be inferred
248	* element type will be <code>null</code>.	233	* element type will be <code>null</code>.
249	* @return an observable list tracking the collection-typed named property	234	* @return an observable list tracking the collection-typed named property
Lines 251-262 Link Here
251	*/	236	*/
252	public static IObservableList observeList(Realm realm, Object bean,	237	public static IObservableList observeList(Realm realm, Object bean,
253	String propertyName, Class elementType) {	238	String propertyName, Class elementType) {
254	PropertyDescriptor propertyDescriptor = getPropertyDescriptor(bean	239	IListProperty property = BeanProperties.listProperty(bean.getClass(),
255	.getClass(), propertyName);	240	propertyName, elementType);
256	elementType = getCollectionElementType(elementType, propertyDescriptor);	241	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
257		242	.getPropertyDescriptor();
258	return new JavaBeanObservableList(realm, bean, propertyDescriptor,	243	return new BeanObservableListDecorator(PropertyObservables.observeList(
259	elementType);	244	realm, bean, property), propertyDescriptor);
260	}	245	}
261		246
262	/**	247	/**
Lines 436-448 Link Here
436	*/	421	*/
437	public static IObservableValue observeDetailValue(Realm realm,	422	public static IObservableValue observeDetailValue(Realm realm,
438	IObservableValue master, String propertyName, Class propertyType) {	423	IObservableValue master, String propertyName, Class propertyType) {
439
440	IObservableValue value = MasterDetailObservables.detailValue(master,	424	IObservableValue value = MasterDetailObservables.detailValue(master,
441	valueFactory(realm, propertyName), propertyType);	425	valueFactory(realm, propertyName), propertyType);
442	BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(	426	return new BeanObservableValueDecorator(value, BeanPropertyHelper
443	value, getValueTypePropertyDescriptor(master, propertyName));	427	.getValueTypePropertyDescriptor(master, propertyName));
444
445	return decorator;
446	}	428	}
447		429
448	/**	430	/**
Lines 468-477 Link Here
468	/**	450	/**
469	* Helper method for	451	* Helper method for
470	* <code>MasterDetailObservables.detailValue(master, valueFactory(realm,	452	* <code>MasterDetailObservables.detailValue(master, valueFactory(realm,
471	* propertyName), propertyType)</code>.	453	* propertyName), propertyType)</code>. This method returns an
472	* This method returns an {@link IBeanObservable} with a	454	* {@link IBeanObservable} with a {@link PropertyDescriptor} based on the
473	* {@link PropertyDescriptor} based on the given master type and property	455	* given master type and property name.
474	* name.
475	*	456	*
476	* @param realm	457	* @param realm
477	* the realm	458	* the realm
Lines 491-504 Link Here
491	* @since 1.1	472	* @since 1.1
492	*/	473	*/
493	public static IObservableValue observeDetailValue(Realm realm,	474	public static IObservableValue observeDetailValue(Realm realm,
494	IObservableValue master, Class masterType, String propertyName, Class propertyType) {	475	IObservableValue master, Class masterType, String propertyName,
		476	Class propertyType) {
495	Assert.isNotNull(masterType, "masterType cannot be null"); //$NON-NLS-1$	477	Assert.isNotNull(masterType, "masterType cannot be null"); //$NON-NLS-1$
496	IObservableValue value = MasterDetailObservables.detailValue(master,	478	IObservableValue value = MasterDetailObservables.detailValue(master,
497	valueFactory(realm, propertyName), propertyType);	479	valueFactory(realm, propertyName), propertyType);
498	BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(	480	return new BeanObservableValueDecorator(value, BeanPropertyHelper
499	value, getPropertyDescriptor(masterType, propertyName));	481	.getPropertyDescriptor(masterType, propertyName));
500
501	return decorator;
502	}	482	}
503		483
504	/**	484	/**
Lines 549-559 Link Here
549	IObservableList observableList = MasterDetailObservables.detailList(	529	IObservableList observableList = MasterDetailObservables.detailList(
550	master, listFactory(realm, propertyName, propertyType),	530	master, listFactory(realm, propertyName, propertyType),
551	propertyType);	531	propertyType);
552	BeanObservableListDecorator decorator = new BeanObservableListDecorator(	532	return new BeanObservableListDecorator(observableList,
553	observableList, getValueTypePropertyDescriptor(master,	533	BeanPropertyHelper.getValueTypePropertyDescriptor(master,
554	propertyName));	534	propertyName));
555
556	return decorator;
557	}	535	}
558		536
559	/**	537	/**
Lines 593-607 Link Here
593	*/	571	*/
594	public static IObservableSet observeDetailSet(Realm realm,	572	public static IObservableSet observeDetailSet(Realm realm,
595	IObservableValue master, String propertyName, Class propertyType) {	573	IObservableValue master, String propertyName, Class propertyType) {
596
597	IObservableSet observableSet = MasterDetailObservables.detailSet(	574	IObservableSet observableSet = MasterDetailObservables.detailSet(
598	master, setFactory(realm, propertyName, propertyType),	575	master, setFactory(realm, propertyName, propertyType),
599	propertyType);	576	propertyType);
600	BeanObservableSetDecorator decorator = new BeanObservableSetDecorator(	577	return new BeanObservableSetDecorator(observableSet, BeanPropertyHelper
601	observableSet, getValueTypePropertyDescriptor(master,	578	.getValueTypePropertyDescriptor(master, propertyName));
602	propertyName));
603
604	return decorator;
605	}	579	}
606		580
607	/**	581	/**
Lines 640-649 Link Here
640	IObservableValue master, String propertyName) {	614	IObservableValue master, String propertyName) {
641	IObservableMap observableMap = MasterDetailObservables.detailMap(	615	IObservableMap observableMap = MasterDetailObservables.detailMap(
642	master, mapPropertyFactory(realm, propertyName));	616	master, mapPropertyFactory(realm, propertyName));
643	BeanObservableMapDecorator decorator = new BeanObservableMapDecorator(	617	return new BeanObservableMapDecorator(observableMap, BeanPropertyHelper
644	observableMap, getValueTypePropertyDescriptor(master,	618	.getValueTypePropertyDescriptor(master, propertyName));
645	propertyName));
646	return decorator;
647	}	619	}
648		620
649	/**	621	/**
Lines 686-697 Link Here
686	*/	658	*/
687	public static IObservableSet observeSet(Realm realm, Object bean,	659	public static IObservableSet observeSet(Realm realm, Object bean,
688	String propertyName, Class elementType) {	660	String propertyName, Class elementType) {
689	PropertyDescriptor propertyDescriptor = getPropertyDescriptor(bean	661	ISetProperty property = BeanProperties.setProperty(bean.getClass(),
690	.getClass(), propertyName);	662	propertyName, elementType);
691	elementType = getCollectionElementType(elementType, propertyDescriptor);	663	PropertyDescriptor propertyDescriptor = ((IBeanProperty) property)
692		664	.getPropertyDescriptor();
693	return new JavaBeanObservableSet(realm, bean, propertyDescriptor,	665	return new BeanObservableSetDecorator(PropertyObservables.observeSet(
694	elementType);	666	realm, bean, property), propertyDescriptor);
695	}	667	}
696		668
697	/**	669	/**
Lines 778-794 Link Here
778	* @param propertyName	750	* @param propertyName
779	* the name of the property	751	* the name of the property
780	* @return a factory for creating {@link IObservableMap} objects	752	* @return a factory for creating {@link IObservableMap} objects
781	*	753	*
782	* @since 1.1	754	* @since 1.1
783	*/	755	*/
784	public static IObservableFactory setToMapFactory(final Class beanClass, final String propertyName) {	756	public static IObservableFactory setToMapFactory(final Class beanClass,
		757	final String propertyName) {
785	return new IObservableFactory() {	758	return new IObservableFactory() {
786	public IObservable createObservable(Object target) {	759	public IObservable createObservable(Object target) {
787	return observeMap((IObservableSet) target, beanClass, propertyName);	760	return observeMap((IObservableSet) target, beanClass,
		761	propertyName);
788	}	762	}
789	};	763	};
790	}	764	}
791		765
792	/**	766	/**
793	* Returns a factory for creating an observable map. The factory, when	767	* Returns a factory for creating an observable map. The factory, when
794	* provided with a bean object, will create an {@link IObservableMap} in the	768	* provided with a bean object, will create an {@link IObservableMap} in the
Lines 826-857 Link Here
826	public static IObservableFactory mapPropertyFactory(String propertyName) {	800	public static IObservableFactory mapPropertyFactory(String propertyName) {
827	return mapPropertyFactory(Realm.getDefault(), propertyName);	801	return mapPropertyFactory(Realm.getDefault(), propertyName);
828	}	802	}
829
830	/**
831	* @param elementType
832	* can be <code>null</code>
833	* @param propertyDescriptor
834	* @return type of the items in a collection/array property
835	*/
836	/package/ static Class getCollectionElementType(Class elementType,
837	PropertyDescriptor propertyDescriptor) {
838	if (elementType == null) {
839	Class propertyType = propertyDescriptor.getPropertyType();
840	elementType = propertyType.isArray() ? propertyType
841	.getComponentType() : Object.class;
842	}
843
844	return elementType;
845	}
846
847	/**
848	* @param observable
849	* @param propertyName
850	* @return property descriptor or <code>null</code>
851	*/
852	/* package*/ static PropertyDescriptor getValueTypePropertyDescriptor(
853	IObservableValue observable, String propertyName) {
854	return (observable.getValueType() != null) ? getPropertyDescriptor(
855	(Class) observable.getValueType(), propertyName) : null;
856	}
857	}	803	}