Attachment #107041 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 14-19 Link Here

(-)META-INF/MANIFEST.MF (+1 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,
17	org.eclipse.core.databinding.util,	18	org.eclipse.core.databinding.util,
18	org.eclipse.core.databinding.validation;x-internal:=false,	19	org.eclipse.core.databinding.validation;x-internal:=false,
19	org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",	20	org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",




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

package org.eclipse.core.databinding.property;

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

/**
 * @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);
	}

	protected final void fireValueChange(Object source, ValueDiff diff) {
		getChangeSupport().fireChange(
				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
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * @since 1.2
 * 
 */
public interface IValuePropertyChangeListener {
	/**
	 * @param event
	 */
	public void handleValuePropertyChange(ValuePropertyChangeEvent 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
 ******************************************************************************/

package org.eclipse.core.databinding.property;

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

/**
 * @since 1.2
 * 
 */
public class ValuePropertyChangeEvent extends PropertyChangeEvent {
	private final IValueProperty property;
	private final ValueDiff diff;

	/**
	 * @param source
	 * @param property
	 * @param diff
	 */
	public ValuePropertyChangeEvent(Object source, IValueProperty property,
			ValueDiff diff) {
		super(source);
		this.property = property;
		this.diff = diff;
	}

	/**
	 * @return Returns the property.
	 */
	public IValueProperty getProperty() {
		return property;
	}

	/**
	 * @return Returns the diff.
	 */
	public ValueDiff getDiff() {
		return diff;
	}

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




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

/**
 * @since 1.2
 *
 */
public abstract class PropertyChangeEvent {
	private final Object source;
	
	/**
	 * @param source
	 */
	public PropertyChangeEvent(Object source) {
		this.source = source;
	}

	protected abstract void dispatch(Object listener);

	/**
	 * @return Returns the source.
	 */
	public final Object getSource() {
		return source;
	}
}




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

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.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 {
	private Object source;
	private IValueProperty property;

	private volatile 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.getDiff());
					}
				});
			}
		}
	};

	/**
	 * @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(source);
	}

	public synchronized void dispose() {
		if (!disposed) {
			disposed = true;
			property.removeValueChangeListener(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
 ******************************************************************************/

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 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.IdentityHashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.core.runtime.ListenerList;

/**
 * @since 1.2
 */
public class PropertyChangeSupport {
	private Property property;
	private Map changeListeners;

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

	protected final void addListener(Object source, Object listener) {
		boolean wasListening = changeListeners.containsKey(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 (!wasListening)
			property.addListenerTo(source);
	}

	protected final void removeListener(Object source, Object 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 fireChange(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(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
 ******************************************************************************/

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.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.property.PropertyObservableValue;

/**
 * @since 1.2
 * 
 */
public class PropertyObservables {
	/**
	 * @param source
	 * @param property
	 * @return an observable value 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);
	}

	/**
	 * @param realm
	 * @param source
	 * @param property
	 * @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 obervable values 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 valueFactory(IValueProperty property) {
		return valueFactory(Realm.getDefault(), property);
	}

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




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

package org.eclipse.core.databinding.property;

/**
 * @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);

	public synchronized void dispose() {
		if (changeSupport != null) {
			changeSupport.dispose();
			changeSupport = 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
 ******************************************************************************/

package org.eclipse.core.databinding.property;

/**
 * Interface for observing a value property of a source object.
 * 
 * @since 1.2
 */
public interface IValueProperty extends IProperty {
	/**
	 * @param source
	 * @return the value type
	 */
	public Object getValueType(Object source);

	/**
	 * @param source
	 * @return the property value
	 */
	public Object getValue(Object source);

	/**
	 * @param source
	 * @param value
	 */
	public void setValue(Object source, Object value);

	/**
	 * @param source
	 * @param listener
	 */
	public void addValueChangeListener(Object source,
			IValuePropertyChangeListener listener);

	/**
	 * @param source
	 * @param 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
 ******************************************************************************/

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

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyDescriptor;

import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.property.ValueProperty;
import org.eclipse.core.internal.databinding.Util;

/**
 * @since 3.3
 * 
 */
public class BeanValueProperty extends ValueProperty {
	private PropertyDescriptor propertyDescriptor;
	private final boolean attachListener;

	private boolean updating;

	private ListenerSupport listenerSupport;

	/**
	 * @param propertyDescriptor
	 */
	public BeanValueProperty(PropertyDescriptor propertyDescriptor) {
		this(propertyDescriptor, true);
	}

	/**
	 * @param propertyDescriptor
	 * @param attachListener
	 */
	public BeanValueProperty(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) {
							if (!updating) {
								fireValueChange(evt.getSource(), Diffs
										.createValueDiff(evt.getOldValue(), evt
												.getNewValue()));
							}
						}
					};
					listenerSupport = new ListenerSupport(
							propertyChangeListener, propertyDescriptor
									.getName());
				}
			}
		}
	}

	protected void addListenerTo(Object source) {
		if (attachListener) {
			initListenerSupport();
			listenerSupport.hookListener(source);
		}
	}

	protected void removeListenerFrom(Object source) {
		if (attachListener && listenerSupport != null) {
			listenerSupport.unhookListener(source);
		}
	}

	public Object getValueType(Object source) {
		return propertyDescriptor.getPropertyType();
	}

	public Object getValue(Object source) {
		return BeanPropertyHelper.getProperty(source, propertyDescriptor);
	}

	public void setValue(Object source, Object value) {
		Object oldValue = getValue(source);

		if (Util.equals(oldValue, value)) {
			return;
		}

		updating = true;
		try {
			BeanPropertyHelper.setProperty(source, propertyDescriptor, value);
		} finally {
			updating = false;
		}

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

	public synchronized void dispose() {
		if (listenerSupport != null) {
			listenerSupport.dispose();
			listenerSupport = null;
		}
		propertyDescriptor = 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
 ******************************************************************************/

package org.eclipse.core.databinding.beans;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.beans.BeanValueProperty;

/**
 * @since 1.2
 * 
 */
public class PojoProperties {
	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a bean value property for the given property name.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName) {
		return new BeanValueProperty(BeansObservables.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
 ******************************************************************************/

package org.eclipse.core.databinding.beans;

import org.eclipse.core.databinding.property.IValueProperty;
import org.eclipse.core.internal.databinding.beans.BeanValueProperty;

/**
 * @since 1.2
 * 
 */
public class BeanProperties {
	/**
	 * @param beanClass
	 * @param propertyName
	 * @return a value property for the given property name of the given bean
	 *         class.
	 */
	public static IValueProperty valueProperty(Class beanClass,
			String propertyName) {
		return new BeanValueProperty(BeansObservables.getPropertyDescriptor(
				beanClass, propertyName));
	}
}




/*******************************************************************************
 * 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.internal.databinding.beans;

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.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;
		}
	}
}

Return to bug 194734

Added Link Here

(-)src/org/eclipse/core/databinding/property/PropertyChangeSupport.java (+106 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.IdentityHashMap;
16	import java.util.Iterator;
17	import java.util.Map;
18
19	import org.eclipse.core.runtime.ListenerList;
20
21	/**
22	* @since 1.2
23	*/
24	public class PropertyChangeSupport {
25	private Property property;
26	private Map changeListeners;
27
28	PropertyChangeSupport(Property property) {
29	this.property = property;
30	this.changeListeners = null;
31	}
32
33	protected final void addListener(Object source, Object listener) {
34	boolean wasListening = changeListeners.containsKey(source);
35
36	if (changeListeners == null) {
37	synchronized (this) {
38	if (changeListeners == null) {
39	changeListeners = Collections
40	.synchronizedMap(new IdentityHashMap());
41	}
42	}
43	}
44
45	ListenerList listeners;
46	synchronized (changeListeners) {
47	if (changeListeners.containsKey(source)) {
48	listeners = (ListenerList) changeListeners.get(source);
49	} else {
50	changeListeners.put(source, listeners = new ListenerList());
51	}
52	}
53
54	synchronized (listeners) {
55	listeners.add(listener);
56	}
57
58	if (!wasListening)
59	property.addListenerTo(source);
60	}
61
62	protected final void removeListener(Object source, Object listener) {
63	if (changeListeners != null) {
64	ListenerList listeners = (ListenerList) changeListeners.get(source);
65	if (listeners != null) {
66	listeners.remove(listener);
67	if (listeners.isEmpty()) {
68	synchronized (listeners) {
69	if (listeners.isEmpty()) {
70	changeListeners.remove(source);
71	property.removeListenerFrom(source);
72	}
73	}
74	}
75	}
76	}
77	}
78
79	protected final void fireChange(PropertyChangeEvent event) {
80	ListenerList listenerList;
81	synchronized (this) {
82	if (changeListeners == null)
83	return;
84	listenerList = (ListenerList) changeListeners
85	.get(event.getSource());
86	}
87	if (listenerList != null) {
88	Object[] listeners = listenerList.getListeners();
89	for (int i = 0; i < listeners.length; i++) {
90	event.dispatch(listeners[i]);
91	}
92	}
93	}
94
95	void dispose() {
96	if (changeListeners != null) {
97	for (Iterator iterator = changeListeners.keySet().iterator(); iterator
98	.hasNext();) {
99	Object source = iterator.next();
100	property.removeListenerFrom(source);
101	iterator.remove();
102	}
103	changeListeners = null;
104	}
105	}
106	}

Added Link Here

(-)src/org/eclipse/core/internal/databinding/beans/BeanValueProperty.java (+122 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
10	******************************************************************************/
11
12	package org.eclipse.core.internal.databinding.beans;
13
14	import java.beans.PropertyChangeEvent;
15	import java.beans.PropertyChangeListener;
16	import java.beans.PropertyDescriptor;
17
18	import org.eclipse.core.databinding.observable.Diffs;
19	import org.eclipse.core.databinding.property.ValueProperty;
20	import org.eclipse.core.internal.databinding.Util;
21
22	/**
23	* @since 3.3
24	*
25	*/
26	public class BeanValueProperty extends ValueProperty {
27	private PropertyDescriptor propertyDescriptor;
28	private final boolean attachListener;
29
30	private boolean updating;
31
32	private ListenerSupport listenerSupport;
33
34	/**
35	* @param propertyDescriptor
36	*/
37	public BeanValueProperty(PropertyDescriptor propertyDescriptor) {
38	this(propertyDescriptor, true);
39	}
40
41	/**
42	* @param propertyDescriptor
43	* @param attachListener
44	*/
45	public BeanValueProperty(PropertyDescriptor propertyDescriptor,
46	boolean attachListener) {
47	this.propertyDescriptor = propertyDescriptor;
48	this.attachListener = attachListener;
49
50	}
51
52	private void initListenerSupport() {
53	if (listenerSupport == null) {
54	synchronized (this) {
55	if (listenerSupport != null) {
56	PropertyChangeListener propertyChangeListener = new PropertyChangeListener() {
57	public void propertyChange(PropertyChangeEvent evt) {
58	if (!updating) {
59	fireValueChange(evt.getSource(), Diffs
60	.createValueDiff(evt.getOldValue(), evt
61	.getNewValue()));
62	}
63	}
64	};
65	listenerSupport = new ListenerSupport(
66	propertyChangeListener, propertyDescriptor
67	.getName());
68	}
69	}
70	}
71	}
72
73	protected void addListenerTo(Object source) {
74	if (attachListener) {
75	initListenerSupport();
76	listenerSupport.hookListener(source);
77	}
78	}
79
80	protected void removeListenerFrom(Object source) {
81	if (attachListener && listenerSupport != null) {
82	listenerSupport.unhookListener(source);
83	}
84	}
85
86	public Object getValueType(Object source) {
87	return propertyDescriptor.getPropertyType();
88	}
89
90	public Object getValue(Object source) {
91	return BeanPropertyHelper.getProperty(source, propertyDescriptor);
92	}
93
94	public void setValue(Object source, Object value) {
95	Object oldValue = getValue(source);
96
97	if (Util.equals(oldValue, value)) {
98	return;
99	}
100
101	updating = true;
102	try {
103	BeanPropertyHelper.setProperty(source, propertyDescriptor, value);
104	} finally {
105	updating = false;
106	}
107
108	Object newValue = getValue(source);
109	if (!Util.equals(oldValue, newValue)) {
110	fireValueChange(source, Diffs.createValueDiff(oldValue, newValue));
111	}
112	}
113
114	public synchronized void dispose() {
115	if (listenerSupport != null) {
116	listenerSupport.dispose();
117	listenerSupport = null;
118	}
119	propertyDescriptor = null;
120	super.dispose();
121	}
122	}

Added Link Here

(-)src/org/eclipse/core/databinding/beans/PojoProperties.java (+32 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
10	******************************************************************************/
11
12	package org.eclipse.core.databinding.beans;
13
14	import org.eclipse.core.databinding.property.IValueProperty;
15	import org.eclipse.core.internal.databinding.beans.BeanValueProperty;
16
17	/**
18	* @since 1.2
19	*
20	*/
21	public class PojoProperties {
22	/**
23	* @param beanClass
24	* @param propertyName
25	* @return a bean value property for the given property name.
26	*/
27	public static IValueProperty valueProperty(Class beanClass,
28	String propertyName) {
29	return new BeanValueProperty(BeansObservables.getPropertyDescriptor(
30	beanClass, propertyName), false);
31	}
32	}