Attachment #121020 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 13-23 Link Here

(-)src/org/eclipse/core/databinding/beans/PojoProperties.java (-11 / +153 lines)
13		13
14	import java.beans.PropertyChangeEvent;	14	import java.beans.PropertyChangeEvent;
15		15
16	import org.eclipse.core.databinding.property.list.IListProperty;	16	import org.eclipse.core.databinding.property.list.SimpleListProperty;
17	import org.eclipse.core.databinding.property.map.IMapProperty;	17	import org.eclipse.core.databinding.property.map.SimpleMapProperty;
18	import org.eclipse.core.databinding.property.set.ISetProperty;	18	import org.eclipse.core.databinding.property.set.SimpleSetProperty;
19	import org.eclipse.core.databinding.property.value.IValueProperty;	19	import org.eclipse.core.databinding.property.value.SimpleValueProperty;
20	import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;	20	import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
		21	import org.eclipse.core.internal.databinding.beans.AnonymousPojoListProperty;
		22	import org.eclipse.core.internal.databinding.beans.AnonymousPojoMapProperty;
		23	import org.eclipse.core.internal.databinding.beans.AnonymousPojoSetProperty;
		24	import org.eclipse.core.internal.databinding.beans.AnonymousPojoValueProperty;
21	import org.eclipse.core.internal.databinding.beans.PojoListProperty;	25	import org.eclipse.core.internal.databinding.beans.PojoListProperty;
22	import org.eclipse.core.internal.databinding.beans.PojoMapProperty;	26	import org.eclipse.core.internal.databinding.beans.PojoMapProperty;
23	import org.eclipse.core.internal.databinding.beans.PojoSetProperty;	27	import org.eclipse.core.internal.databinding.beans.PojoSetProperty;
Lines 33-38 Link Here
33	*/	37	*/
34	public class PojoProperties {	38	public class PojoProperties {
35	/**	39	/**
		40	* Returns a value property for the given property name of an arbitrary bean
		41	* class. Objects lacking the named property are treated the same as if the
		42	* property always contains null.
		43	*
		44	* @param propertyName
		45	* the property name
		46	* @return a value property for the given property name of an arbitrary bean
		47	* class.
		48	*/
		49	public static SimpleValueProperty value(String propertyName) {
		50	return value(propertyName, null);
		51	}
		52
		53	/**
		54	* Returns a value property for the given property name of an arbitrary bean
		55	* class. Objects lacking the named property are treated the same as if the
		56	* property always contains null.
		57	*
		58	* @param propertyName
		59	* the property name
		60	* @param valueType
		61	* the value type of the returned value property
		62	* @return a value property for the given property name of an arbitrary bean
		63	* class.
		64	*/
		65	public static SimpleValueProperty value(String propertyName, Class valueType) {
		66	return new AnonymousPojoValueProperty(propertyName, valueType);
		67	}
		68
		69	/**
36	* Returns a value property for the given property name of the given bean	70	* Returns a value property for the given property name of the given bean
37	* class.	71	* class.
38	*	72	*
Lines 43-49 Link Here
43	* @return a value property for the given property name of the given bean	77	* @return a value property for the given property name of the given bean
44	* class.	78	* class.
45	*/	79	*/
46	public static IValueProperty value(Class beanClass, String propertyName) {	80	public static SimpleValueProperty value(Class beanClass, String propertyName) {
47	return value(beanClass, propertyName, null);	81	return value(beanClass, propertyName, null);
48	}	82	}
49		83
Lines 60-72 Link Here
60	* @return a value property for the given property name of the given bean	94	* @return a value property for the given property name of the given bean
61	* class.	95	* class.
62	*/	96	*/
63	public static IValueProperty value(Class beanClass, String propertyName,	97	public static SimpleValueProperty value(Class beanClass, String propertyName,
64	Class valueType) {	98	Class valueType) {
65	return new PojoValueProperty(BeanPropertyHelper.getPropertyDescriptor(	99	return new PojoValueProperty(BeanPropertyHelper.getPropertyDescriptor(
66	beanClass, propertyName), valueType);	100	beanClass, propertyName), valueType);
67	}	101	}
68		102
69	/**	103	/**
		104	* Returns a set property for the given property name of an arbitrary bean
		105	* class. Objects lacking the named property are treated the same as if the
		106	* property always contains an empty set.
		107	*
		108	* @param propertyName
		109	* the property name
		110	* @return a set property for the given property name of an arbitrary bean
		111	* class.
		112	*/
		113	public static SimpleSetProperty set(String propertyName) {
		114	return set(propertyName, null);
		115	}
		116
		117	/**
		118	* Returns a set property for the given property name of an arbitrary bean
		119	* class. Objects lacking the named property are treated the same as if the
		120	* property always contains an empty set.
		121	*
		122	* @param propertyName
		123	* the property name
		124	* @param elementType
		125	* the element type of the returned set property
		126	* @return a set property for the given property name of an arbitrary bean
		127	* class.
		128	*/
		129	public static SimpleSetProperty set(String propertyName, Class elementType) {
		130	return new AnonymousPojoSetProperty(propertyName, elementType);
		131	}
		132
		133	/**
70	* Returns a set property for the given property name of the given bean	134	* Returns a set property for the given property name of the given bean
71	* class.	135	* class.
72	*	136	*
Lines 77-83 Link Here
77	* @return a set property for the given property name of the given bean	141	* @return a set property for the given property name of the given bean
78	* class.	142	* class.
79	*/	143	*/
80	public static ISetProperty set(Class beanClass, String propertyName) {	144	public static SimpleSetProperty set(Class beanClass, String propertyName) {
81	return set(beanClass, propertyName, null);	145	return set(beanClass, propertyName, null);
82	}	146	}
83		147
Lines 94-106 Link Here
94	* @return a set property for the given property name of the given bean	158	* @return a set property for the given property name of the given bean
95	* class.	159	* class.
96	*/	160	*/
97	public static ISetProperty set(Class beanClass, String propertyName,	161	public static SimpleSetProperty set(Class beanClass, String propertyName,
98	Class elementType) {	162	Class elementType) {
99	return new PojoSetProperty(BeanPropertyHelper.getPropertyDescriptor(	163	return new PojoSetProperty(BeanPropertyHelper.getPropertyDescriptor(
100	beanClass, propertyName), elementType);	164	beanClass, propertyName), elementType);
101	}	165	}
102		166
103	/**	167	/**
		168	* Returns a list property for the given property name of an arbitrary bean
		169	* class. Objects lacking the named property are treated the same as if the
		170	* property always contains an empty list.
		171	*
		172	* @param propertyName
		173	* the property name
		174	* @return a list property for the given property name of an arbitrary bean
		175	* class.
		176	*/
		177	public static SimpleListProperty list(String propertyName) {
		178	return list(propertyName, null);
		179	}
		180
		181	/**
		182	* Returns a list property for the given property name of an arbitrary bean
		183	* class. Objects lacking the named property are treated the same as if the
		184	* property always contains an empty list.
		185	*
		186	* @param propertyName
		187	* the property name
		188	* @param elementType
		189	* the element type of the returned list property
		190	* @return a list property for the given property name of the given bean
		191	* class.
		192	*/
		193	public static SimpleListProperty list(String propertyName, Class elementType) {
		194	return new AnonymousPojoListProperty(propertyName, elementType);
		195	}
		196
		197	/**
104	* Returns a list property for the given property name of the given bean	198	* Returns a list property for the given property name of the given bean
105	* class.	199	* class.
106	*	200	*
Lines 111-117 Link Here
111	* @return a list property for the given property name of the given bean	205	* @return a list property for the given property name of the given bean
112	* class.	206	* class.
113	*/	207	*/
114	public static IListProperty list(Class beanClass, String propertyName) {	208	public static SimpleListProperty list(Class beanClass, String propertyName) {
115	return list(beanClass, propertyName, null);	209	return list(beanClass, propertyName, null);
116	}	210	}
117		211
Lines 128-140 Link Here
128	* @return a list property for the given property name of the given bean	222	* @return a list property for the given property name of the given bean
129	* class.	223	* class.
130	*/	224	*/
131	public static IListProperty list(Class beanClass, String propertyName,	225	public static SimpleListProperty list(Class beanClass, String propertyName,
132	Class elementType) {	226	Class elementType) {
133	return new PojoListProperty(BeanPropertyHelper.getPropertyDescriptor(	227	return new PojoListProperty(BeanPropertyHelper.getPropertyDescriptor(
134	beanClass, propertyName), elementType);	228	beanClass, propertyName), elementType);
135	}	229	}
136		230
137	/**	231	/**
		232	* Returns a map property for the given property name of an arbitrary bean
		233	* class. Objects lacking the named property are treated the same as if the
		234	* property always contains an empty map.
		235	*
		236	* @param propertyName
		237	* the property name
		238	* @return a map property for the given property name of an arbitrary bean
		239	* class.
		240	*/
		241	public static SimpleMapProperty map(String propertyName) {
		242	return map(propertyName, null, null);
		243	}
		244
		245	/**
		246	* Returns a map property for the given property name of an arbitrary bean
		247	* class. Objects lacking the named property are treated the same as if the
		248	* property always contains an empty map.
		249	*
		250	* @param propertyName
		251	* the property name
		252	* @param keyType
		253	* the key type for the returned map property
		254	* @param valueType
		255	* the value type for the returned map property
		256	* @return a map property for the given property name of an arbitrary bean
		257	* class.
		258	*/
		259	public static SimpleMapProperty map(String propertyName, Class keyType,
		260	Class valueType) {
		261	return new AnonymousPojoMapProperty(propertyName, keyType, valueType);
		262	}
		263
		264	/**
		265	* Returns a map property for the given property name of the given bean
		266	* class.
		267	*
		268	* @param beanClass
		269	* the bean class
		270	* @param propertyName
		271	* the property name
		272	* @return a map property for the given property name of the given bean
		273	* class.
		274	*/
		275	public static SimpleMapProperty map(Class beanClass, String propertyName) {
		276	return map(beanClass, propertyName, null, null);
		277	}
		278
		279	/**
138	* Returns a map property for the given property name of the given bean	280	* Returns a map property for the given property name of the given bean
139	* class.	281	* class.
140	*	282	*
Lines 149-155 Link Here
149	* @return a map property for the given property name of the given bean	291	* @return a map property for the given property name of the given bean
150	* class.	292	* class.
151	*/	293	*/
152	public static IMapProperty map(Class beanClass, String propertyName,	294	public static SimpleMapProperty map(Class beanClass, String propertyName,
153	Class keyType, Class valueType) {	295	Class keyType, Class valueType) {
154	return new PojoMapProperty(BeanPropertyHelper.getPropertyDescriptor(	296	return new PojoMapProperty(BeanPropertyHelper.getPropertyDescriptor(
155	beanClass, propertyName), keyType, valueType);	297	beanClass, propertyName), keyType, valueType);




	}

	/**
	 * Returns an observable map in the given observable set's realm tracking
	 * the current values of the named property for the beans in the given set.
	 * Elements in the set which do not have the named property will have null
	 * values, and attempts to {@link IObservableMap#put(Object, Object) put}
	 * values to these elements will be ignored.
	 * 
	 * @param domain
	 *            the set of bean objects
	 * @param propertyName
	 *            the name of the property
	 * @return an observable map tracking the current values of the named
	 *         property for the beans in the given domain set
	 */
	public static IObservableMap observeMap(IObservableSet domain,
			String propertyName) {
		return BeanProperties.value(propertyName).observeDetailValues(domain);
	}

	/**
	 * Returns an observable map in the given observable set's realm tracking
	 * the current values of the named property for the beans in the given set.
	 * 
	 * @param domain
	 *            the set of bean objects

	}

	/**
	 * Returns an array of observable maps in the given observable set's realm
	 * tracking the current values of the named properties for the beans in the
	 * given set. Elements in the set which do not have the named property will
	 * have null values, and attempts to
	 * {@link IObservableMap#put(Object, Object) put} values to these elements
	 * will be ignored.
	 * 
	 * @param domain
	 *            the set of objects
	 * @param propertyNames
	 *            the array of property names
	 * @return an array of observable maps tracking the current values of the
	 *         named propertys for the beans in the given domain set
	 */
	public static IObservableMap[] observeMaps(IObservableSet domain,
			String[] propertyNames) {
		IObservableMap[] result = new IObservableMap[propertyNames.length];
		for (int i = 0; i < propertyNames.length; i++) {
			result[i] = observeMap(domain, propertyNames[i]);
		}
		return result;
	}

	/**
	 * Returns an array of observable maps in the given observable set's realm
	 * tracking the current values of the named properties for the beans in the
	 * given set.
	 * 
	 * @param domain
	 *            the set of objects

Lines 7-20 Link Here

(-)src/org/eclipse/core/databinding/beans/BeanProperties.java (-11 / +154 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 194734)	9	* Matthew Hall - initial API and implementation (bug 194734)
		10	* Matthew Hall - bug 247997
10	******************************************************************************/	11	******************************************************************************/
11		12
12	package org.eclipse.core.databinding.beans;	13	package org.eclipse.core.databinding.beans;
13		14
14	import org.eclipse.core.databinding.property.list.IListProperty;	15	import org.eclipse.core.databinding.property.list.SimpleListProperty;
15	import org.eclipse.core.databinding.property.map.IMapProperty;	16	import org.eclipse.core.databinding.property.map.SimpleMapProperty;
16	import org.eclipse.core.databinding.property.set.ISetProperty;	17	import org.eclipse.core.databinding.property.set.SimpleSetProperty;
17	import org.eclipse.core.databinding.property.value.IValueProperty;	18	import org.eclipse.core.databinding.property.value.SimpleValueProperty;
		19	import org.eclipse.core.internal.databinding.beans.AnonymousBeanListProperty;
		20	import org.eclipse.core.internal.databinding.beans.AnonymousBeanMapProperty;
		21	import org.eclipse.core.internal.databinding.beans.AnonymousBeanSetProperty;
		22	import org.eclipse.core.internal.databinding.beans.AnonymousBeanValueProperty;
18	import org.eclipse.core.internal.databinding.beans.BeanListProperty;	23	import org.eclipse.core.internal.databinding.beans.BeanListProperty;
19	import org.eclipse.core.internal.databinding.beans.BeanMapProperty;	24	import org.eclipse.core.internal.databinding.beans.BeanMapProperty;
20	import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;	25	import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
Lines 30-35 Link Here
30	*/	35	*/
31	public class BeanProperties {	36	public class BeanProperties {
32	/**	37	/**
		38	* Returns a value property for the given property name of an arbitrary bean
		39	* class. Objects lacking the named property are treated the same as if the
		40	* property always contains null.
		41	*
		42	* @param propertyName
		43	* the property name
		44	* @return a value property for the given property name of an arbitrary bean
		45	* class.
		46	*/
		47	public static SimpleValueProperty value(String propertyName) {
		48	return value(propertyName, null);
		49	}
		50
		51	/**
		52	* Returns a value property for the given property name of an arbitrary bean
		53	* class. Objects lacking the named property are treated the same as if the
		54	* property always contains null.
		55	*
		56	* @param propertyName
		57	* the property name
		58	* @param valueType
		59	* the value type of the returned value property
		60	* @return a value property for the given property name of an arbitrary bean
		61	* class.
		62	*/
		63	public static SimpleValueProperty value(String propertyName, Class valueType) {
		64	return new AnonymousBeanValueProperty(propertyName, valueType);
		65	}
		66
		67	/**
33	* Returns a value property for the given property name of the given bean	68	* Returns a value property for the given property name of the given bean
34	* class.	69	* class.
35	*	70	*
Lines 40-46 Link Here
40	* @return a value property for the given property name of the given bean	75	* @return a value property for the given property name of the given bean
41	* class.	76	* class.
42	*/	77	*/
43	public static IValueProperty value(Class beanClass, String propertyName) {	78	public static SimpleValueProperty value(Class beanClass, String propertyName) {
44	return value(beanClass, propertyName, null);	79	return value(beanClass, propertyName, null);
45	}	80	}
46		81
Lines 57-69 Link Here
57	* @return a value property for the given property name of the given bean	92	* @return a value property for the given property name of the given bean
58	* class.	93	* class.
59	*/	94	*/
60	public static IValueProperty value(Class beanClass, String propertyName,	95	public static SimpleValueProperty value(Class beanClass, String propertyName,
61	Class valueType) {	96	Class valueType) {
62	return new BeanValueProperty(BeanPropertyHelper.getPropertyDescriptor(	97	return new BeanValueProperty(BeanPropertyHelper.getPropertyDescriptor(
63	beanClass, propertyName), valueType);	98	beanClass, propertyName), valueType);
64	}	99	}
65		100
66	/**	101	/**
		102	* Returns a set property for the given property name of an arbitrary bean
		103	* class. Objects lacking the named property are treated the same as if the
		104	* property always contains an empty set.
		105	*
		106	* @param propertyName
		107	* the property name
		108	* @return a set property for the given property name of an arbitrary bean
		109	* class.
		110	*/
		111	public static SimpleSetProperty set(String propertyName) {
		112	return set(propertyName, null);
		113	}
		114
		115	/**
		116	* Returns a set property for the given property name of an arbitrary bean
		117	* class. Objects lacking the named property are treated the same as if the
		118	* property always contains an empty set.
		119	*
		120	* @param propertyName
		121	* the property name
		122	* @param elementType
		123	* the element type of the returned set property
		124	* @return a set property for the given property name of an arbitrary bean
		125	* class.
		126	*/
		127	public static SimpleSetProperty set(String propertyName, Class elementType) {
		128	return new AnonymousBeanSetProperty(propertyName, elementType);
		129	}
		130
		131	/**
67	* Returns a set property for the given property name of the given bean	132	* Returns a set property for the given property name of the given bean
68	* class.	133	* class.
69	*	134	*
Lines 74-80 Link Here
74	* @return a set property for the given property name of the given bean	139	* @return a set property for the given property name of the given bean
75	* class.	140	* class.
76	*/	141	*/
77	public static ISetProperty set(Class beanClass, String propertyName) {	142	public static SimpleSetProperty set(Class beanClass, String propertyName) {
78	return set(beanClass, propertyName, null);	143	return set(beanClass, propertyName, null);
79	}	144	}
80		145
Lines 91-103 Link Here
91	* @return a set property for the given property name of the given bean	156	* @return a set property for the given property name of the given bean
92	* class.	157	* class.
93	*/	158	*/
94	public static ISetProperty set(Class beanClass, String propertyName,	159	public static SimpleSetProperty set(Class beanClass, String propertyName,
95	Class elementType) {	160	Class elementType) {
96	return new BeanSetProperty(BeanPropertyHelper.getPropertyDescriptor(	161	return new BeanSetProperty(BeanPropertyHelper.getPropertyDescriptor(
97	beanClass, propertyName), elementType);	162	beanClass, propertyName), elementType);
98	}	163	}
99		164
100	/**	165	/**
		166	* Returns a list property for the given property name of an arbitrary bean
		167	* class. Objects lacking the named property are treated the same as if the
		168	* property always contains an empty list.
		169	*
		170	* @param propertyName
		171	* the property name
		172	* @return a list property for the given property name of an arbitrary bean
		173	* class.
		174	*/
		175	public static SimpleListProperty list(String propertyName) {
		176	return list(propertyName, null);
		177	}
		178
		179	/**
		180	* Returns a list property for the given property name of an arbitrary bean
		181	* class. Objects lacking the named property are treated the same as if the
		182	* property always contains an empty list.
		183	*
		184	* @param propertyName
		185	* the property name
		186	* @param elementType
		187	* the element type of the returned list property
		188	* @return a list property for the given property name of the given bean
		189	* class.
		190	*/
		191	public static SimpleListProperty list(String propertyName, Class elementType) {
		192	return new AnonymousBeanListProperty(propertyName, elementType);
		193	}
		194
		195	/**
101	* Returns a list property for the given property name of the given bean	196	* Returns a list property for the given property name of the given bean
102	* class.	197	* class.
103	*	198	*
Lines 108-114 Link Here
108	* @return a list property for the given property name of the given bean	203	* @return a list property for the given property name of the given bean
109	* class.	204	* class.
110	*/	205	*/
111	public static IListProperty list(Class beanClass, String propertyName) {	206	public static SimpleListProperty list(Class beanClass, String propertyName) {
112	return list(beanClass, propertyName, null);	207	return list(beanClass, propertyName, null);
113	}	208	}
114		209
Lines 125-137 Link Here
125	* @return a list property for the given property name of the given bean	220	* @return a list property for the given property name of the given bean
126	* class.	221	* class.
127	*/	222	*/
128	public static IListProperty list(Class beanClass, String propertyName,	223	public static SimpleListProperty list(Class beanClass, String propertyName,
129	Class elementType) {	224	Class elementType) {
130	return new BeanListProperty(BeanPropertyHelper.getPropertyDescriptor(	225	return new BeanListProperty(BeanPropertyHelper.getPropertyDescriptor(
131	beanClass, propertyName), elementType);	226	beanClass, propertyName), elementType);
132	}	227	}
133		228
134	/**	229	/**
		230	* Returns a map property for the given property name of an arbitrary bean
		231	* class. Objects lacking the named property are treated the same as if the
		232	* property always contains an empty map.
		233	*
		234	* @param propertyName
		235	* the property name
		236	* @return a map property for the given property name of an arbitrary bean
		237	* class.
		238	*/
		239	public static SimpleMapProperty map(String propertyName) {
		240	return map(propertyName, null, null);
		241	}
		242
		243	/**
		244	* Returns a map property for the given property name of an arbitrary bean
		245	* class. Objects lacking the named property are treated the same as if the
		246	* property always contains an empty map.
		247	*
		248	* @param propertyName
		249	* the property name
		250	* @param keyType
		251	* the key type for the returned map property
		252	* @param valueType
		253	* the value type for the returned map property
		254	* @return a map property for the given property name of an arbitrary bean
		255	* class.
		256	*/
		257	public static SimpleMapProperty map(String propertyName, Class keyType,
		258	Class valueType) {
		259	return new AnonymousBeanMapProperty(propertyName, keyType, valueType);
		260	}
		261
		262	/**
		263	* Returns a map property for the given property name of the given bean
		264	* class.
		265	*
		266	* @param beanClass
		267	* the bean class
		268	* @param propertyName
		269	* the property name
		270	* @return a map property for the given property name of the given bean
		271	* class.
		272	*/
		273	public static SimpleMapProperty map(Class beanClass, String propertyName) {
		274	return map(beanClass, propertyName, null, null);
		275	}
		276
		277	/**
135	* Returns a map property for the given property name of the given bean	278	* Returns a map property for the given property name of the given bean
136	* class.	279	* class.
137	*	280	*
Lines 146-152 Link Here
146	* @return a map property for the given property name of the given bean	289	* @return a map property for the given property name of the given bean
147	* class.	290	* class.
148	*/	291	*/
149	public static IMapProperty map(Class beanClass, String propertyName,	292	public static SimpleMapProperty map(Class beanClass, String propertyName,
150	Class keyType, Class valueType) {	293	Class keyType, Class valueType) {
151	return new BeanMapProperty(BeanPropertyHelper.getPropertyDescriptor(	294	return new BeanMapProperty(BeanPropertyHelper.getPropertyDescriptor(
152	beanClass, propertyName), keyType, valueType);	295	beanClass, propertyName), keyType, valueType);




	}

	/**
	 * Returns an observable map in the given observable set's realm tracking
	 * the current values of the named property for the beans in the given set.
	 * Elements in the set which do not have the named property will have null
	 * values, and attempts to {@link IObservableMap#put(Object, Object) put}
	 * values to these elements will be ignored.
	 * 
	 * @param domain
	 *            the set of bean objects
	 * @param propertyName
	 *            the name of the property
	 * @return an observable map tracking the current values of the named
	 *         property for the beans in the given domain set
	 */
	public static IObservableMap observeMap(IObservableSet domain,
			String propertyName) {
		return PojoProperties.value(propertyName).observeDetailValues(domain);
	}

	/**
	 * Returns an observable map in the given observable set's realm tracking
	 * the current values of the named property for the pojos in the given set.
	 * 
	 * @param domain
	 *            the set of pojo objects

	}

	/**
	 * Returns an array of observable maps in the given observable set's realm
	 * tracking the current values of the named properties for the beans in the
	 * given set. Elements in the set which do not have the named property will
	 * have null values, and attempts to
	 * {@link IObservableMap#put(Object, Object) put} values to these elements
	 * will be ignored.
	 * 
	 * @param domain
	 *            the set of objects
	 * @param propertyNames
	 *            the array of property names
	 * @return an array of observable maps tracking the current values of the
	 *         named propertys for the beans in the given domain set
	 */
	public static IObservableMap[] observeMaps(IObservableSet domain,
			String[] propertyNames) {
		IObservableMap[] result = new IObservableMap[propertyNames.length];
		for (int i = 0; i < propertyNames.length; i++) {
			result[i] = observeMap(domain, propertyNames[i]);
		}
		return result;
	}

	/**
	 * Returns an array of observable maps in the given observable set's realm
	 * tracking the current values of the named propertys for the pojos in the
	 * given set.
	 * 
	 * @param domain
	 *            the set of objects




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.property.list.DelegatingListProperty;
import org.eclipse.core.databinding.property.list.SimpleListProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousBeanListProperty extends DelegatingListProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param elementType
	 */
	public AnonymousBeanListProperty(String propertyName, Class elementType) {
		super(elementType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleListProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class beanClass = source.getClass();
		if (delegates.containsKey(beanClass))
			return (BeanListProperty) delegates.get(beanClass);

		BeanListProperty delegate;
		try {
			delegate = (BeanListProperty) BeanProperties.list(beanClass,
					propertyName, (Class) getElementType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(beanClass, delegate);
		return delegate;
	}

	public String toString() {
		String s = "{{Generic Bean}}." + propertyName + "[]"; //$NON-NLS-1$ //$NON-NLS-2$

		Class elementType = (Class) getElementType();
		if (elementType != null)
			s += " <" + elementType.getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$

		return s;
	}
}




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.PojoProperties;
import org.eclipse.core.databinding.property.set.DelegatingSetProperty;
import org.eclipse.core.databinding.property.set.SimpleSetProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousPojoSetProperty extends DelegatingSetProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param elementType
	 */
	public AnonymousPojoSetProperty(String propertyName, Class elementType) {
		super(elementType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleSetProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class beanClass = source.getClass();
		if (delegates.containsKey(beanClass))
			return (PojoSetProperty) delegates.get(beanClass);

		PojoSetProperty delegate;
		try {
			delegate = (PojoSetProperty) PojoProperties.set(beanClass,
					propertyName, (Class) getElementType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(beanClass, delegate);
		return delegate;
	}

	public String toString() {
		String s = "{{Generic POJO}}." + propertyName + "{}"; //$NON-NLS-1$ //$NON-NLS-2$

		Class elementType = (Class) getElementType();
		if (elementType != null)
			s += " <" + elementType.getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$

		return s;
	}
}




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.property.value.DelegatingValueProperty;
import org.eclipse.core.databinding.property.value.SimpleValueProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousBeanValueProperty extends DelegatingValueProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param valueType
	 */
	public AnonymousBeanValueProperty(String propertyName, Class valueType) {
		super(valueType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleValueProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class beanClass = source.getClass();
		if (delegates.containsKey(beanClass))
			return (BeanValueProperty) delegates.get(beanClass);

		BeanValueProperty delegate;
		try {
			delegate = (BeanValueProperty) BeanProperties.value(beanClass,
					propertyName, (Class) getValueType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(beanClass, delegate);
		return delegate;
	}

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

		Class valueType = (Class) getValueType();
		if (valueType != null)
			s += " <" + valueType.getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$

		return s;
	}
}




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.property.map.DelegatingMapProperty;
import org.eclipse.core.databinding.property.map.SimpleMapProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousBeanMapProperty extends DelegatingMapProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param keyType
	 * @param valueType
	 */
	public AnonymousBeanMapProperty(String propertyName, Class keyType,
			Class valueType) {
		super(keyType, valueType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleMapProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class beanClass = source.getClass();
		if (delegates.containsKey(beanClass))
			return (BeanMapProperty) delegates.get(beanClass);

		BeanMapProperty delegate;
		try {
			delegate = (BeanMapProperty) BeanProperties.map(beanClass,
					propertyName, (Class) getKeyType(), (Class) getValueType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(beanClass, delegate);
		return delegate;
	}

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

		Class keyType = (Class) getKeyType();
		Class valueType = (Class) getValueType();
		if (keyType != null || valueType != null) {
			s += " <" + keyType + ", " + valueType + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		}

		return s;
	}
}




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.PojoProperties;
import org.eclipse.core.databinding.property.map.DelegatingMapProperty;
import org.eclipse.core.databinding.property.map.SimpleMapProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousPojoMapProperty extends DelegatingMapProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param keyType
	 * @param valueType
	 */
	public AnonymousPojoMapProperty(String propertyName, Class keyType,
			Class valueType) {
		super(keyType, valueType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleMapProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class beanClass = source.getClass();
		if (delegates.containsKey(beanClass))
			return (PojoMapProperty) delegates.get(beanClass);

		PojoMapProperty delegate;
		try {
			delegate = (PojoMapProperty) PojoProperties.map(beanClass,
					propertyName, (Class) getKeyType(), (Class) getValueType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(beanClass, delegate);
		return delegate;
	}

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

		Class keyType = (Class) getKeyType();
		Class valueType = (Class) getValueType();
		if (keyType != null || valueType != null) {
			s += " <" + keyType + ", " + valueType + ">"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		}

		return s;
	}
}




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.PojoProperties;
import org.eclipse.core.databinding.property.value.DelegatingValueProperty;
import org.eclipse.core.databinding.property.value.SimpleValueProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousPojoValueProperty extends DelegatingValueProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param valueType
	 */
	public AnonymousPojoValueProperty(String propertyName, Class valueType) {
		super(valueType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleValueProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class pojoClass = source.getClass();
		if (delegates.containsKey(pojoClass))
			return (PojoValueProperty) delegates.get(pojoClass);

		PojoValueProperty delegate;
		try {
			delegate = (PojoValueProperty) PojoProperties.value(pojoClass,
					propertyName, (Class) getValueType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(pojoClass, delegate);
		return delegate;
	}

	public String toString() {
		String s = "{{Generic POJO}}." + propertyName; //$NON-NLS-1$
		Class valueType = (Class) getValueType();
		if (valueType != null)
			s += " <" + valueType.getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$
		return s;
	}
}




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.PojoProperties;
import org.eclipse.core.databinding.property.list.DelegatingListProperty;
import org.eclipse.core.databinding.property.list.SimpleListProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousPojoListProperty extends DelegatingListProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param elementType
	 */
	public AnonymousPojoListProperty(String propertyName, Class elementType) {
		super(elementType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleListProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class beanClass = source.getClass();
		if (delegates.containsKey(beanClass))
			return (PojoListProperty) delegates.get(beanClass);

		PojoListProperty delegate;
		try {
			delegate = (PojoListProperty) PojoProperties.list(beanClass,
					propertyName, (Class) getElementType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(beanClass, delegate);
		return delegate;
	}

	public String toString() {
		String s = "{{Generic POJO}}." + propertyName + "[]"; //$NON-NLS-1$ //$NON-NLS-2$

		Class elementType = (Class) getElementType();
		if (elementType != null)
			s += " <" + elementType.getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$

		return s;
	}
}




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

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

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

import org.eclipse.core.databinding.BindingException;
import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.property.set.DelegatingSetProperty;
import org.eclipse.core.databinding.property.set.SimpleSetProperty;

/**
 * @since 3.3
 * 
 */
public class AnonymousBeanSetProperty extends DelegatingSetProperty {
	private final String propertyName;

	private Map delegates;

	/**
	 * @param propertyName
	 * @param elementType
	 */
	public AnonymousBeanSetProperty(String propertyName, Class elementType) {
		super(elementType);
		this.propertyName = propertyName;
		this.delegates = new HashMap();
	}

	protected SimpleSetProperty getDelegate(Object source) {
		if (source == null)
			return null;

		Class beanClass = source.getClass();
		if (delegates.containsKey(beanClass))
			return (BeanSetProperty) delegates.get(beanClass);

		BeanSetProperty delegate;
		try {
			delegate = (BeanSetProperty) BeanProperties.set(beanClass,
					propertyName, (Class) getElementType());
		} catch (BindingException noSuchProperty) {
			delegate = null;
		}
		delegates.put(beanClass, delegate);
		return delegate;
	}

	public String toString() {
		String s = "{{Generic Bean}}." + propertyName + "{}"; //$NON-NLS-1$ //$NON-NLS-2$

		Class elementType = (Class) getElementType();
		if (elementType != null)
			s += " <" + elementType.getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$

		return s;
	}
}




/*******************************************************************************
 * 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.examples.databinding.snippets;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
import java.util.TreeSet;

import org.eclipse.core.databinding.beans.BeanProperties;
import org.eclipse.core.databinding.observable.Diffs;
import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;
import org.eclipse.core.databinding.property.set.DelegatingSetProperty;
import org.eclipse.core.databinding.property.set.ISetPropertyChangeListener;
import org.eclipse.core.databinding.property.set.SetPropertyChangeEvent;
import org.eclipse.core.databinding.property.set.SimpleSetProperty;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
import org.eclipse.jface.databinding.viewers.ObservableSetTreeContentProvider;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;

/**
 * @since 3.2
 * 
 */
public class Snippet026AnonymousBeanProperties {
	private TreeViewer viewer;

	public static void main(String[] args) {
		Display display = new Display();
		Realm.runWithDefault(SWTObservables.getRealm(display), new Runnable() {
			public void run() {
				try {
					Snippet026AnonymousBeanProperties window = new Snippet026AnonymousBeanProperties();
					window.open();
				} catch (Exception e) {
					e.printStackTrace();
				}
			}
		});
	}

	private ApplicationModel model;
	private Shell shell;
	private Tree tree;

	// Minimal JavaBeans support
	public static abstract class AbstractModelObject {
		private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(
				this);

		public void addPropertyChangeListener(PropertyChangeListener listener) {
			propertyChangeSupport.addPropertyChangeListener(listener);
		}

		public void addPropertyChangeListener(String propertyName,
				PropertyChangeListener listener) {
			propertyChangeSupport.addPropertyChangeListener(propertyName,
					listener);
		}

		public void removePropertyChangeListener(PropertyChangeListener listener) {
			propertyChangeSupport.removePropertyChangeListener(listener);
		}

		public void removePropertyChangeListener(String propertyName,
				PropertyChangeListener listener) {
			propertyChangeSupport.removePropertyChangeListener(propertyName,
					listener);
		}

		protected void firePropertyChange(String propertyName, Object oldValue,
				Object newValue) {
			propertyChangeSupport.firePropertyChange(propertyName, oldValue,
					newValue);
		}
	}

	public static class ContactGroup extends AbstractModelObject implements
			Comparable {
		private String name;
		private Set contacts = new TreeSet();

		ContactGroup(String name) {
			this.name = checkNull(name);
		}

		private String checkNull(String string) {
			if (string == null)
				throw new NullPointerException();
			return string;
		}

		public String getName() {
			return name;
		}

		public void setName(String name) {
			firePropertyChange("name", this.name, this.name = checkNull(name));
		}

		public Set getContacts() {
			return new TreeSet(contacts);
		}

		public void addContact(Contact contact) {
			Set oldValue = getContacts();
			contacts.add(contact);
			Set newValue = getContacts();
			firePropertyChange("contacts", oldValue, newValue);
		}

		public void removeContact(Contact contact) {
			Set oldValue = getContacts();
			contacts.remove(contact);
			Set newValue = getContacts();
			firePropertyChange("contacts", oldValue, newValue);
		}

		public int compareTo(Object o) {
			ContactGroup that = (ContactGroup) o;
			return this.name.compareTo(that.name);
		}
	}

	public static class Contact extends AbstractModelObject implements
			Comparable {
		private String name;
		private String status;

		private String checkNull(String string) {
			if (string == null)
				throw new NullPointerException();
			return string;
		}

		public Contact(String name, String status) {
			this.name = checkNull(name);
			this.status = checkNull(status);
		}

		public String getName() {
			return name;
		}

		public void setName(String name) {
			firePropertyChange("name", this.name, this.name = checkNull(name));
		}

		public String getStatus() {
			return status;
		}

		public void setStatus(String status) {
			firePropertyChange("status", this.status,
					this.status = checkNull(status));
		}

		public int compareTo(Object o) {
			Contact that = (Contact) o;
			int result = this.name.compareTo(that.name);
			if (result == 0)
				result = this.status.compareTo(that.status);
			return result;
		}
	}

	public static class ApplicationModel extends AbstractModelObject {
		private Set groups = new TreeSet();

		public Set getGroups() {
			return new TreeSet(groups);
		}

		public void setGroups(Set groups) {
			Set oldValue = getGroups();
			this.groups = new TreeSet(groups);
			Set newValue = getGroups();
			firePropertyChange("groups", oldValue, newValue);
		}
	}

	/**
	 * List property for the "contacts" property of a ContactGroup. Since
	 * ContactGroup does not have a setContacts() method we have to write our
	 * own property to apply list changes incrementally through the addContact
	 * and removeContact methods.
	 */
	public static class ContactGroupContactsProperty extends SimpleSetProperty {
		protected Object getElementType() {
			return Contact.class;
		}

		protected Set doGetSet(Object source) {
			if (source == null)
				return Collections.EMPTY_SET;
			return ((ContactGroup) source).getContacts();
		}

		protected boolean setSet(Object source, Set set, SetDiff diff) {
			if (source == null)
				return false;
			ContactGroup group = (ContactGroup) source;
			for (Iterator it = diff.getRemovals().iterator(); it.hasNext();) {
				Contact contact = (Contact) it.next();
				group.removeContact(contact);
			}
			for (Iterator it = diff.getAdditions().iterator(); it.hasNext();) {
				Contact contact = (Contact) it.next();
				group.addContact(contact);
			}
			return true;
		}

		protected INativePropertyListener adaptListener(
				final ISetPropertyChangeListener listener) {
			return new Listener(listener);
		}

		private class Listener implements INativePropertyListener,
				PropertyChangeListener {
			private final ISetPropertyChangeListener listener;

			Listener(ISetPropertyChangeListener listener) {
				this.listener = listener;
			}

			public void propertyChange(PropertyChangeEvent evt) {
				Object source = evt.getSource();
				SimpleSetProperty property = ContactGroupContactsProperty.this;
				SetDiff diff = Diffs.computeSetDiff((Set) evt.getOldValue(),
						(Set) evt.getNewValue());
				listener.handleSetPropertyChange(new SetPropertyChangeEvent(
						source, property, diff));
			}
		}

		protected void addListener(Object source,
				INativePropertyListener listener) {
			if (source != null) {
				((ContactGroup) source).addPropertyChangeListener("contacts",
						(Listener) listener);
			}
		}

		protected void removeListener(Object source,
				INativePropertyListener listener) {
			if (source != null) {
				((ContactGroup) source).removePropertyChangeListener(
						"contacts", (Listener) listener);
			}
		}
	}

	public void open() {
		model = createDefaultModel();

		final Display display = Display.getDefault();
		createContents();
		bindUI();
		shell.open();
		shell.layout();
		while (!shell.isDisposed()) {
			if (!display.readAndDispatch())
				display.sleep();
		}
	}

	/**
	 * @return
	 */
	private ApplicationModel createDefaultModel() {
		ContactGroup swtGroup = new ContactGroup("SWT");
		swtGroup.addContact(new Contact("Steve Northover", "Busy"));
		swtGroup.addContact(new Contact("Grant Gayed", "Online"));
		swtGroup.addContact(new Contact("Veronika Irvine", "Offline"));
		swtGroup.addContact(new Contact("Mike Wilson", "Online"));
		swtGroup.addContact(new Contact("Christophe Cornu", "Idle"));
		swtGroup.addContact(new Contact("Lynne Kues", "Online"));
		swtGroup.addContact(new Contact("Silenio Quarti", "Idle"));

		ContactGroup jdbGroup = new ContactGroup("JFace Data Binding");
		jdbGroup.addContact(new Contact("Boris Bokowski", "Online"));
		jdbGroup.addContact(new Contact("Matthew Hall", "Idle"));

		Set groups = new TreeSet();
		groups.add(swtGroup);
		groups.add(jdbGroup);
		ApplicationModel model = new ApplicationModel();
		model.setGroups(groups);

		return model;
	}

	/**
	 * Create contents of the window
	 */
	protected void createContents() {
		shell = new Shell();
		shell.setSize(379, 393);
		shell.setText("Snippet026AnonymousBeanProperties");
		shell.setLayout(new GridLayout());

		viewer = new TreeViewer(shell, SWT.BORDER);
		tree = viewer.getTree();
		tree.setHeaderVisible(true);
		tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

		final TreeColumn nameColumn = new TreeColumn(tree, SWT.NONE);
		nameColumn.setWidth(163);
		nameColumn.setText("Name");

		final TreeColumn newColumnTreeColumn = new TreeColumn(tree, SWT.NONE);
		newColumnTreeColumn.setWidth(100);
		newColumnTreeColumn.setText("Status");
	}

	private void bindUI() {
		IObservableFactory treeElementFactory = new DelegatingSetProperty() {
			SimpleSetProperty modelGroups = BeanProperties.set(
					ApplicationModel.class, "groups");
			SimpleSetProperty groupContacts = BeanProperties.set(
					ContactGroup.class, "contacts");

			protected SimpleSetProperty getDelegate(Object source) {
				if (source instanceof ApplicationModel)
					return modelGroups;
				if (source instanceof ContactGroup)
					return groupContacts;
				return null;
			}
		}.setFactory();

		ObservableSetTreeContentProvider cp = new ObservableSetTreeContentProvider(
				treeElementFactory, null);
		viewer.setContentProvider(cp);

		IObservableSet knownElements = cp.getKnownElements();
		IObservableMap[] labelMaps = new IObservableMap[] {
				BeanProperties.value("name").observeDetailValues(knownElements),
				BeanProperties.value("status").observeDetailValues(
						knownElements) };
		viewer.setLabelProvider(new ObservableMapLabelProvider(labelMaps));

		viewer.setInput(model);

		viewer.expandAll();
	}
}




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

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

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.IObservableMap;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;

/**
 * @since 3.3
 * 
 */
public abstract class DelegatingMapProperty extends SimpleMapProperty {
	private final Object keyType;
	private final Object valueType;

	protected DelegatingMapProperty() {
		this(null, null);
	}

	protected DelegatingMapProperty(Object keyType, Object valueType) {
		this.keyType = keyType;
		this.valueType = valueType;
	}

	protected abstract SimpleMapProperty getDelegate(Object source);

	protected Object getKeyType() {
		return keyType;
	}

	protected Object getValueType() {
		return valueType;
	}

	protected Map doGetMap(Object source) {
		SimpleMapProperty delegate = getDelegate(source);
		if (delegate == null)
			return Collections.EMPTY_MAP;
		return delegate.doGetMap(source);
	}

	protected boolean setMap(Object source, Map map, MapDiff diff) {
		SimpleMapProperty delegate = getDelegate(source);
		if (delegate == null)
			return false;
		return delegate.setMap(source, map, diff);
	}

	protected INativePropertyListener adaptListener(
			IMapPropertyChangeListener listener) {
		return new Listener(listener);
	}

	private class Listener implements INativePropertyListener,
			IMapPropertyChangeListener {
		private final IMapPropertyChangeListener listener;

		private Map nativeListeners;

		private Listener(IMapPropertyChangeListener listener) {
			this.listener = listener;
			this.nativeListeners = new HashMap();
		}

		public void handleMapPropertyChange(MapPropertyChangeEvent event) {
			listener.handleMapPropertyChange(event);
		}

		private INativePropertyListener getNativeListener(
				SimpleMapProperty delegate) {
			if (nativeListeners.containsKey(delegate))
				return (INativePropertyListener) nativeListeners.get(delegate);

			INativePropertyListener nativeListener = delegate
					.adaptListener(this);
			nativeListeners.put(delegate, nativeListener);
			return nativeListener;
		}

		private void addListener(Object source) {
			SimpleMapProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}

		private void removeListener(Object source) {
			SimpleMapProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}
	}

	protected void addListener(Object source, INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).addListener(source);
	}

	protected void removeListener(Object source,
			INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).removeListener(source);
	}

	public IObservableMap observeMap(Realm realm, Object source) {
		SimpleMapProperty delegate = getDelegate(source);
		if (delegate != null)
			return delegate.observeMap(realm, source);
		return super.observeMap(realm, 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.databinding.property.list;

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

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.IObservableList;
import org.eclipse.core.databinding.observable.list.ListDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;

/**
 * @since 3.3
 * 
 */
public abstract class DelegatingListProperty extends SimpleListProperty {
	private final Object elementType;

	protected DelegatingListProperty() {
		this(null);
	}

	protected DelegatingListProperty(Object elementType) {
		this.elementType = elementType;
	}

	protected abstract SimpleListProperty getDelegate(Object source);

	protected Object getElementType() {
		return elementType;
	}

	protected List doGetList(Object source) {
		SimpleListProperty delegate = getDelegate(source);
		if (delegate == null)
			return Collections.EMPTY_LIST;
		return delegate.doGetList(source);
	}

	protected boolean setList(Object source, List list, ListDiff diff) {
		SimpleListProperty delegate = getDelegate(source);
		if (delegate == null)
			return false;
		return delegate.setList(source, list, diff);
	}

	protected INativePropertyListener adaptListener(
			IListPropertyChangeListener listener) {
		return new Listener(listener);
	}

	private class Listener implements INativePropertyListener,
			IListPropertyChangeListener {
		private final IListPropertyChangeListener listener;

		private Map nativeListeners;

		private Listener(IListPropertyChangeListener listener) {
			this.listener = listener;
			this.nativeListeners = new HashMap();
		}

		public void handleListPropertyChange(ListPropertyChangeEvent event) {
			listener.handleListPropertyChange(event);
		}

		private INativePropertyListener getNativeListener(
				SimpleListProperty delegate) {
			if (nativeListeners.containsKey(delegate))
				return (INativePropertyListener) nativeListeners.get(delegate);

			INativePropertyListener nativeListener = delegate
					.adaptListener(this);
			nativeListeners.put(delegate, nativeListener);
			return nativeListener;
		}

		private void addListener(Object source) {
			SimpleListProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}

		private void removeListener(Object source) {
			SimpleListProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}
	}

	protected void addListener(Object source, INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).addListener(source);
	}

	protected void removeListener(Object source,
			INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).removeListener(source);
	}

	public IObservableList observeList(Realm realm, Object source) {
		SimpleListProperty delegate = getDelegate(source);
		if (delegate != null)
			return delegate.observeList(realm, source);
		return super.observeList(realm, 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.databinding.property.value;

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

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.property.INativePropertyListener;

/**
 * @since 3.3
 * 
 */
public abstract class DelegatingValueProperty extends SimpleValueProperty {
	private final Object valueType;

	protected DelegatingValueProperty() {
		this(null);
	}

	protected DelegatingValueProperty(Object valueType) {
		this.valueType = valueType;
	}

	protected abstract SimpleValueProperty getDelegate(Object source);

	protected Object getValueType() {
		return valueType;
	}

	protected Object getValue(Object source) {
		SimpleValueProperty delegate = getDelegate(source);
		if (delegate == null)
			return null;
		return delegate.getValue(source);
	}

	protected boolean setValue(Object source, Object value) {
		SimpleValueProperty delegate = getDelegate(source);
		if (delegate == null)
			return false;
		return delegate.setValue(source, value);
	}

	public INativePropertyListener adaptListener(
			final IValuePropertyChangeListener listener) {
		return new Listener(listener);
	}

	private class Listener implements INativePropertyListener,
			IValuePropertyChangeListener {
		private final IValuePropertyChangeListener listener;

		private Map nativeListeners;

		private Listener(IValuePropertyChangeListener listener) {
			this.listener = listener;
			this.nativeListeners = new HashMap();
		}

		public void handleValuePropertyChange(ValuePropertyChangeEvent event) {
			listener.handleValuePropertyChange(event);
		}

		private INativePropertyListener getNativeListener(
				SimpleValueProperty delegate) {
			if (nativeListeners.containsKey(delegate))
				return (INativePropertyListener) nativeListeners.get(delegate);

			INativePropertyListener nativeListener = delegate
					.adaptListener(this);
			nativeListeners.put(delegate, nativeListener);
			return nativeListener;
		}

		private void addListener(Object source) {
			SimpleValueProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}

		private void removeListener(Object source) {
			SimpleValueProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}
	}

	public void addListener(Object source, INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).addListener(source);
	}

	public void removeListener(Object source, INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).removeListener(source);
	}

	public IObservableValue observeValue(Realm realm, Object source) {
		SimpleValueProperty delegate = getDelegate(source);
		if (delegate != null)
			return delegate.observeValue(realm, source);
		return super.observeValue(realm, 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.databinding.property.set;

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

import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.set.IObservableSet;
import org.eclipse.core.databinding.observable.set.SetDiff;
import org.eclipse.core.databinding.property.INativePropertyListener;

/**
 * @since 3.3
 * 
 */
public abstract class DelegatingSetProperty extends SimpleSetProperty {
	private final Object elementType;

	protected DelegatingSetProperty() {
		this(null);
	}

	protected DelegatingSetProperty(Object elementType) {
		this.elementType = elementType;
	}

	protected abstract SimpleSetProperty getDelegate(Object source);

	protected Object getElementType() {
		return elementType;
	}

	protected Set doGetSet(Object source) {
		SimpleSetProperty delegate = getDelegate(source);
		if (delegate == null)
			return Collections.EMPTY_SET;
		return delegate.doGetSet(source);
	}

	protected boolean setSet(Object source, Set set, SetDiff diff) {
		SimpleSetProperty delegate = getDelegate(source);
		if (delegate == null)
			return false;
		return delegate.setSet(source, set, diff);
	}

	protected INativePropertyListener adaptListener(
			ISetPropertyChangeListener listener) {
		return new Listener(listener);
	}

	private class Listener implements INativePropertyListener,
			ISetPropertyChangeListener {
		private final ISetPropertyChangeListener listener;

		private Map nativeListeners;

		private Listener(ISetPropertyChangeListener listener) {
			this.listener = listener;
			this.nativeListeners = new HashMap();
		}

		public void handleSetPropertyChange(SetPropertyChangeEvent event) {
			listener.handleSetPropertyChange(event);
		}

		private INativePropertyListener getNativeListener(
				SimpleSetProperty delegate) {
			if (nativeListeners.containsKey(delegate))
				return (INativePropertyListener) nativeListeners.get(delegate);

			INativePropertyListener nativeListener = delegate
					.adaptListener(this);
			nativeListeners.put(delegate, nativeListener);
			return nativeListener;
		}

		private void addListener(Object source) {
			SimpleSetProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}

		private void removeListener(Object source) {
			SimpleSetProperty delegate = getDelegate(source);
			if (delegate != null) {
				delegate.addListener(source, getNativeListener(delegate));
			}
		}
	}

	protected void addListener(Object source, INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).addListener(source);
	}

	protected void removeListener(Object source,
			INativePropertyListener listener) {
		if (listener != null)
			((Listener) listener).removeListener(source);
	}

	public IObservableSet observeSet(Realm realm, Object source) {
		SimpleSetProperty delegate = getDelegate(source);
		if (delegate != null)
			return delegate.observeSet(realm, source);
		return super.observeSet(realm, source);
	}
}

Return to bug 194734

Lines 92-99 Link Here

(-)src/org/eclipse/core/databinding/beans/BeansObservables.java (-4 / +48 lines)
92	}	92	}
93		93
94	/**	94	/**
95	* Returns an observable map in the default realm tracking the current	95	* Returns an observable map in the given observable set's realm tracking
96	* values of the named property for the beans in the given set.	96	* the current values of the named property for the beans in the given set.
		97	* Elements in the set which do not have the named property will have null
		98	* values, and attempts to {@link IObservableMap#put(Object, Object) put}
		99	* values to these elements will be ignored.
		100	*
		101	* @param domain
		102	* the set of bean objects
		103	* @param propertyName
		104	* the name of the property
		105	* @return an observable map tracking the current values of the named
		106	* property for the beans in the given domain set
		107	*/
		108	public static IObservableMap observeMap(IObservableSet domain,
		109	String propertyName) {
		110	return BeanProperties.value(propertyName).observeDetailValues(domain);
		111	}
		112
		113	/**
		114	* Returns an observable map in the given observable set's realm tracking
		115	* the current values of the named property for the beans in the given set.
97	*	116	*
98	* @param domain	117	* @param domain
99	* the set of bean objects	118	* the set of bean objects
Lines 204-211 Link Here
204	}	223	}
205		224
206	/**	225	/**
207	* Returns an array of observable maps in the default realm tracking the	226	* Returns an array of observable maps in the given observable set's realm
208	* current values of the named propertys for the beans in the given set.	227	* tracking the current values of the named properties for the beans in the
		228	* given set. Elements in the set which do not have the named property will
		229	* have null values, and attempts to
		230	* {@link IObservableMap#put(Object, Object) put} values to these elements
		231	* will be ignored.
		232	*
		233	* @param domain
		234	* the set of objects
		235	* @param propertyNames
		236	* the array of property names
		237	* @return an array of observable maps tracking the current values of the
		238	* named propertys for the beans in the given domain set
		239	*/
		240	public static IObservableMap[] observeMaps(IObservableSet domain,
		241	String[] propertyNames) {
		242	IObservableMap[] result = new IObservableMap[propertyNames.length];
		243	for (int i = 0; i < propertyNames.length; i++) {
		244	result[i] = observeMap(domain, propertyNames[i]);
		245	}
		246	return result;
		247	}
		248
		249	/**
		250	* Returns an array of observable maps in the given observable set's realm
		251	* tracking the current values of the named properties for the beans in the
		252	* given set.
209	*	253	*
210	* @param domain	254	* @param domain
211	* the set of objects	255	* the set of objects

Added Link Here

(-)src/org/eclipse/core/internal/databinding/beans/AnonymousBeanListProperty.java (+69 lines)
1	/*******************************************************************************
2	* Copyright (c) 2008 Matthew Hall and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Matthew Hall - initial API and implementation (bug 247997)
10	******************************************************************************/
11
12	package org.eclipse.core.internal.databinding.beans;
13
14	import java.util.HashMap;
15	import java.util.Map;
16
17	import org.eclipse.core.databinding.BindingException;
18	import org.eclipse.core.databinding.beans.BeanProperties;
19	import org.eclipse.core.databinding.property.list.DelegatingListProperty;
20	import org.eclipse.core.databinding.property.list.SimpleListProperty;
21
22	/**
23	* @since 3.3
24	*
25	*/
26	public class AnonymousBeanListProperty extends DelegatingListProperty {
27	private final String propertyName;
28
29	private Map delegates;
30
31	/**
32	* @param propertyName
33	* @param elementType
34	*/
35	public AnonymousBeanListProperty(String propertyName, Class elementType) {
36	super(elementType);
37	this.propertyName = propertyName;
38	this.delegates = new HashMap();
39	}
40
41	protected SimpleListProperty getDelegate(Object source) {
42	if (source == null)
43	return null;
44
45	Class beanClass = source.getClass();
46	if (delegates.containsKey(beanClass))
47	return (BeanListProperty) delegates.get(beanClass);
48
49	BeanListProperty delegate;
50	try {
51	delegate = (BeanListProperty) BeanProperties.list(beanClass,
52	propertyName, (Class) getElementType());
53	} catch (BindingException noSuchProperty) {
54	delegate = null;
55	}
56	delegates.put(beanClass, delegate);
57	return delegate;
58	}
59
60	public String toString() {
61	String s = "{{Generic Bean}}." + propertyName + "[]"; //$NON-NLS-1$ //$NON-NLS-2$
62
63	Class elementType = (Class) getElementType();
64	if (elementType != null)
65	s += " <" + elementType.getName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$
66
67	return s;
68	}
69	}

Added Link Here

(-)src/org/eclipse/jface/examples/databinding/snippets/Snippet026AnonymousBeanProperties.java (+373 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.jface.examples.databinding.snippets;
13
14	import java.beans.PropertyChangeEvent;
15	import java.beans.PropertyChangeListener;
16	import java.beans.PropertyChangeSupport;
17	import java.util.Collections;
18	import java.util.Iterator;
19	import java.util.Set;
20	import java.util.TreeSet;
21
22	import org.eclipse.core.databinding.beans.BeanProperties;
23	import org.eclipse.core.databinding.observable.Diffs;
24	import org.eclipse.core.databinding.observable.Realm;
25	import org.eclipse.core.databinding.observable.map.IObservableMap;
26	import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
27	import org.eclipse.core.databinding.observable.set.IObservableSet;
28	import org.eclipse.core.databinding.observable.set.SetDiff;
29	import org.eclipse.core.databinding.property.INativePropertyListener;
30	import org.eclipse.core.databinding.property.set.DelegatingSetProperty;
31	import org.eclipse.core.databinding.property.set.ISetPropertyChangeListener;
32	import org.eclipse.core.databinding.property.set.SetPropertyChangeEvent;
33	import org.eclipse.core.databinding.property.set.SimpleSetProperty;
34	import org.eclipse.jface.databinding.swt.SWTObservables;
35	import org.eclipse.jface.databinding.viewers.ObservableMapLabelProvider;
36	import org.eclipse.jface.databinding.viewers.ObservableSetTreeContentProvider;
37	import org.eclipse.jface.viewers.TreeViewer;
38	import org.eclipse.swt.SWT;
39	import org.eclipse.swt.layout.GridData;
40	import org.eclipse.swt.layout.GridLayout;
41	import org.eclipse.swt.widgets.Display;
42	import org.eclipse.swt.widgets.Shell;
43	import org.eclipse.swt.widgets.Tree;
44	import org.eclipse.swt.widgets.TreeColumn;
45
46	/**
47	* @since 3.2
48	*
49	*/
50	public class Snippet026AnonymousBeanProperties {
51	private TreeViewer viewer;
52
53	public static void main(String[] args) {
54	Display display = new Display();
55	Realm.runWithDefault(SWTObservables.getRealm(display), new Runnable() {
56	public void run() {
57	try {
58	Snippet026AnonymousBeanProperties window = new Snippet026AnonymousBeanProperties();
59	window.open();
60	} catch (Exception e) {
61	e.printStackTrace();
62	}
63	}
64	});
65	}
66
67	private ApplicationModel model;
68	private Shell shell;
69	private Tree tree;
70
71	// Minimal JavaBeans support
72	public static abstract class AbstractModelObject {
73	private PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(
74	this);
75
76	public void addPropertyChangeListener(PropertyChangeListener listener) {
77	propertyChangeSupport.addPropertyChangeListener(listener);
78	}
79
80	public void addPropertyChangeListener(String propertyName,
81	PropertyChangeListener listener) {
82	propertyChangeSupport.addPropertyChangeListener(propertyName,
83	listener);
84	}
85
86	public void removePropertyChangeListener(PropertyChangeListener listener) {
87	propertyChangeSupport.removePropertyChangeListener(listener);
88	}
89
90	public void removePropertyChangeListener(String propertyName,
91	PropertyChangeListener listener) {
92	propertyChangeSupport.removePropertyChangeListener(propertyName,
93	listener);
94	}
95
96	protected void firePropertyChange(String propertyName, Object oldValue,
97	Object newValue) {
98	propertyChangeSupport.firePropertyChange(propertyName, oldValue,
99	newValue);
100	}
101	}
102
103	public static class ContactGroup extends AbstractModelObject implements
104	Comparable {
105	private String name;
106	private Set contacts = new TreeSet();
107
108	ContactGroup(String name) {
109	this.name = checkNull(name);
110	}
111
112	private String checkNull(String string) {
113	if (string == null)
114	throw new NullPointerException();
115	return string;
116	}
117
118	public String getName() {
119	return name;
120	}
121
122	public void setName(String name) {
123	firePropertyChange("name", this.name, this.name = checkNull(name));
124	}
125
126	public Set getContacts() {
127	return new TreeSet(contacts);
128	}
129
130	public void addContact(Contact contact) {
131	Set oldValue = getContacts();
132	contacts.add(contact);
133	Set newValue = getContacts();
134	firePropertyChange("contacts", oldValue, newValue);
135	}
136
137	public void removeContact(Contact contact) {
138	Set oldValue = getContacts();
139	contacts.remove(contact);
140	Set newValue = getContacts();
141	firePropertyChange("contacts", oldValue, newValue);
142	}
143
144	public int compareTo(Object o) {
145	ContactGroup that = (ContactGroup) o;
146	return this.name.compareTo(that.name);
147	}
148	}
149
150	public static class Contact extends AbstractModelObject implements
151	Comparable {
152	private String name;
153	private String status;
154
155	private String checkNull(String string) {
156	if (string == null)
157	throw new NullPointerException();
158	return string;
159	}
160
161	public Contact(String name, String status) {
162	this.name = checkNull(name);
163	this.status = checkNull(status);
164	}
165
166	public String getName() {
167	return name;
168	}
169
170	public void setName(String name) {
171	firePropertyChange("name", this.name, this.name = checkNull(name));
172	}
173
174	public String getStatus() {
175	return status;
176	}
177
178	public void setStatus(String status) {
179	firePropertyChange("status", this.status,
180	this.status = checkNull(status));
181	}
182
183	public int compareTo(Object o) {
184	Contact that = (Contact) o;
185	int result = this.name.compareTo(that.name);
186	if (result == 0)
187	result = this.status.compareTo(that.status);
188	return result;
189	}
190	}
191
192	public static class ApplicationModel extends AbstractModelObject {
193	private Set groups = new TreeSet();
194
195	public Set getGroups() {
196	return new TreeSet(groups);
197	}
198
199	public void setGroups(Set groups) {
200	Set oldValue = getGroups();
201	this.groups = new TreeSet(groups);
202	Set newValue = getGroups();
203	firePropertyChange("groups", oldValue, newValue);
204	}
205	}
206
207	/**
208	* List property for the "contacts" property of a ContactGroup. Since
209	* ContactGroup does not have a setContacts() method we have to write our
210	* own property to apply list changes incrementally through the addContact
211	* and removeContact methods.
212	*/
213	public static class ContactGroupContactsProperty extends SimpleSetProperty {
214	protected Object getElementType() {
215	return Contact.class;
216	}
217
218	protected Set doGetSet(Object source) {
219	if (source == null)
220	return Collections.EMPTY_SET;
221	return ((ContactGroup) source).getContacts();
222	}
223
224	protected boolean setSet(Object source, Set set, SetDiff diff) {
225	if (source == null)
226	return false;
227	ContactGroup group = (ContactGroup) source;
228	for (Iterator it = diff.getRemovals().iterator(); it.hasNext();) {
229	Contact contact = (Contact) it.next();
230	group.removeContact(contact);
231	}
232	for (Iterator it = diff.getAdditions().iterator(); it.hasNext();) {
233	Contact contact = (Contact) it.next();
234	group.addContact(contact);
235	}
236	return true;
237	}
238
239	protected INativePropertyListener adaptListener(
240	final ISetPropertyChangeListener listener) {
241	return new Listener(listener);
242	}
243
244	private class Listener implements INativePropertyListener,
245	PropertyChangeListener {
246	private final ISetPropertyChangeListener listener;
247
248	Listener(ISetPropertyChangeListener listener) {
249	this.listener = listener;
250	}
251
252	public void propertyChange(PropertyChangeEvent evt) {
253	Object source = evt.getSource();
254	SimpleSetProperty property = ContactGroupContactsProperty.this;
255	SetDiff diff = Diffs.computeSetDiff((Set) evt.getOldValue(),
256	(Set) evt.getNewValue());
257	listener.handleSetPropertyChange(new SetPropertyChangeEvent(
258	source, property, diff));
259	}
260	}
261
262	protected void addListener(Object source,
263	INativePropertyListener listener) {
264	if (source != null) {
265	((ContactGroup) source).addPropertyChangeListener("contacts",
266	(Listener) listener);
267	}
268	}
269
270	protected void removeListener(Object source,
271	INativePropertyListener listener) {
272	if (source != null) {
273	((ContactGroup) source).removePropertyChangeListener(
274	"contacts", (Listener) listener);
275	}
276	}
277	}
278
279	public void open() {
280	model = createDefaultModel();
281
282	final Display display = Display.getDefault();
283	createContents();
284	bindUI();
285	shell.open();
286	shell.layout();
287	while (!shell.isDisposed()) {
288	if (!display.readAndDispatch())
289	display.sleep();
290	}
291	}
292
293	/**
294	* @return
295	*/
296	private ApplicationModel createDefaultModel() {
297	ContactGroup swtGroup = new ContactGroup("SWT");
298	swtGroup.addContact(new Contact("Steve Northover", "Busy"));
299	swtGroup.addContact(new Contact("Grant Gayed", "Online"));
300	swtGroup.addContact(new Contact("Veronika Irvine", "Offline"));
301	swtGroup.addContact(new Contact("Mike Wilson", "Online"));
302	swtGroup.addContact(new Contact("Christophe Cornu", "Idle"));
303	swtGroup.addContact(new Contact("Lynne Kues", "Online"));
304	swtGroup.addContact(new Contact("Silenio Quarti", "Idle"));
305
306	ContactGroup jdbGroup = new ContactGroup("JFace Data Binding");
307	jdbGroup.addContact(new Contact("Boris Bokowski", "Online"));
308	jdbGroup.addContact(new Contact("Matthew Hall", "Idle"));
309
310	Set groups = new TreeSet();
311	groups.add(swtGroup);
312	groups.add(jdbGroup);
313	ApplicationModel model = new ApplicationModel();
314	model.setGroups(groups);
315
316	return model;
317	}
318
319	/**
320	* Create contents of the window
321	*/
322	protected void createContents() {
323	shell = new Shell();
324	shell.setSize(379, 393);
325	shell.setText("Snippet026AnonymousBeanProperties");
326	shell.setLayout(new GridLayout());
327
328	viewer = new TreeViewer(shell, SWT.BORDER);
329	tree = viewer.getTree();
330	tree.setHeaderVisible(true);
331	tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
332
333	final TreeColumn nameColumn = new TreeColumn(tree, SWT.NONE);
334	nameColumn.setWidth(163);
335	nameColumn.setText("Name");
336
337	final TreeColumn newColumnTreeColumn = new TreeColumn(tree, SWT.NONE);
338	newColumnTreeColumn.setWidth(100);
339	newColumnTreeColumn.setText("Status");
340	}
341
342	private void bindUI() {
343	IObservableFactory treeElementFactory = new DelegatingSetProperty() {
344	SimpleSetProperty modelGroups = BeanProperties.set(
345	ApplicationModel.class, "groups");
346	SimpleSetProperty groupContacts = BeanProperties.set(
347	ContactGroup.class, "contacts");
348
349	protected SimpleSetProperty getDelegate(Object source) {
350	if (source instanceof ApplicationModel)
351	return modelGroups;
352	if (source instanceof ContactGroup)
353	return groupContacts;
354	return null;
355	}
356	}.setFactory();
357
358	ObservableSetTreeContentProvider cp = new ObservableSetTreeContentProvider(
359	treeElementFactory, null);
360	viewer.setContentProvider(cp);
361
362	IObservableSet knownElements = cp.getKnownElements();
363	IObservableMap[] labelMaps = new IObservableMap[] {
364	BeanProperties.value("name").observeDetailValues(knownElements),
365	BeanProperties.value("status").observeDetailValues(
366	knownElements) };
367	viewer.setLabelProvider(new ObservableMapLabelProvider(labelMaps));
368
369	viewer.setInput(model);
370
371	viewer.expandAll();
372	}
373	}

Added Link Here

(-)src/org/eclipse/core/databinding/property/map/DelegatingMapProperty.java (+127 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.property.map;
13
14	import java.util.Collections;
15	import java.util.HashMap;
16	import java.util.Map;
17
18	import org.eclipse.core.databinding.observable.Realm;
19	import org.eclipse.core.databinding.observable.map.IObservableMap;
20	import org.eclipse.core.databinding.observable.map.MapDiff;
21	import org.eclipse.core.databinding.property.INativePropertyListener;
22
23	/**
24	* @since 3.3
25	*
26	*/
27	public abstract class DelegatingMapProperty extends SimpleMapProperty {
28	private final Object keyType;
29	private final Object valueType;
30
31	protected DelegatingMapProperty() {
32	this(null, null);
33	}
34
35	protected DelegatingMapProperty(Object keyType, Object valueType) {
36	this.keyType = keyType;
37	this.valueType = valueType;
38	}
39
40	protected abstract SimpleMapProperty getDelegate(Object source);
41
42	protected Object getKeyType() {
43	return keyType;
44	}
45
46	protected Object getValueType() {
47	return valueType;
48	}
49
50	protected Map doGetMap(Object source) {
51	SimpleMapProperty delegate = getDelegate(source);
52	if (delegate == null)
53	return Collections.EMPTY_MAP;
54	return delegate.doGetMap(source);
55	}
56
57	protected boolean setMap(Object source, Map map, MapDiff diff) {
58	SimpleMapProperty delegate = getDelegate(source);
59	if (delegate == null)
60	return false;
61	return delegate.setMap(source, map, diff);
62	}
63
64	protected INativePropertyListener adaptListener(
65	IMapPropertyChangeListener listener) {
66	return new Listener(listener);
67	}
68
69	private class Listener implements INativePropertyListener,
70	IMapPropertyChangeListener {
71	private final IMapPropertyChangeListener listener;
72
73	private Map nativeListeners;
74
75	private Listener(IMapPropertyChangeListener listener) {
76	this.listener = listener;
77	this.nativeListeners = new HashMap();
78	}
79
80	public void handleMapPropertyChange(MapPropertyChangeEvent event) {
81	listener.handleMapPropertyChange(event);
82	}
83
84	private INativePropertyListener getNativeListener(
85	SimpleMapProperty delegate) {
86	if (nativeListeners.containsKey(delegate))
87	return (INativePropertyListener) nativeListeners.get(delegate);
88
89	INativePropertyListener nativeListener = delegate
90	.adaptListener(this);
91	nativeListeners.put(delegate, nativeListener);
92	return nativeListener;
93	}
94
95	private void addListener(Object source) {
96	SimpleMapProperty delegate = getDelegate(source);
97	if (delegate != null) {
98	delegate.addListener(source, getNativeListener(delegate));
99	}
100	}
101
102	private void removeListener(Object source) {
103	SimpleMapProperty delegate = getDelegate(source);
104	if (delegate != null) {
105	delegate.addListener(source, getNativeListener(delegate));
106	}
107	}
108	}
109
110	protected void addListener(Object source, INativePropertyListener listener) {
111	if (listener != null)
112	((Listener) listener).addListener(source);
113	}
114
115	protected void removeListener(Object source,
116	INativePropertyListener listener) {
117	if (listener != null)
118	((Listener) listener).removeListener(source);
119	}
120
121	public IObservableMap observeMap(Realm realm, Object source) {
122	SimpleMapProperty delegate = getDelegate(source);
123	if (delegate != null)
124	return delegate.observeMap(realm, source);
125	return super.observeMap(realm, source);
126	}
127	}