FIXED bug 198201 - [DataBinding] Provide POJO observables
https://bugs.eclipse.org/bugs/show_bug.cgi?id=198201
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java
index b569266..1de4981 100644
--- a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/BeansObservables.java
@@ -104,7 +104,7 @@
return new JavaBeanObservableMap(domain, descriptor);
}
- private static PropertyDescriptor getPropertyDescriptor(Class beanClass,
+ /*package*/ static PropertyDescriptor getPropertyDescriptor(Class beanClass,
String propertyName) {
BeanInfo beanInfo;
try {
@@ -399,7 +399,7 @@
* @param propertyDescriptor
* @return type of the items in a collection/array property
*/
- private static Class getCollectionElementType(Class elementType,
+ /*package*/ static Class getCollectionElementType(Class elementType,
PropertyDescriptor propertyDescriptor) {
if (elementType == null) {
Class propertyType = propertyDescriptor.getPropertyType();
@@ -415,7 +415,7 @@
* @param propertyName
* @return property descriptor or <code>null</code>
*/
- private static PropertyDescriptor getValueTypePropertyDescriptor(
+ /* package*/ static PropertyDescriptor getValueTypePropertyDescriptor(
IObservableValue observable, String propertyName) {
return (observable.getValueType() != null) ? getPropertyDescriptor(
(Class) observable.getValueType(), propertyName) : null;
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java
new file mode 100644
index 0000000..08741f8
--- /dev/null
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/databinding/beans/PojoObservables.java
@@ -0,0 +1,368 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.core.databinding.beans;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyDescriptor;
+
+import org.eclipse.core.databinding.observable.IObservable;
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.map.IObservableMap;
+import org.eclipse.core.databinding.observable.masterdetail.IObservableFactory;
+import org.eclipse.core.databinding.observable.masterdetail.MasterDetailObservables;
+import org.eclipse.core.databinding.observable.set.IObservableSet;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.internal.databinding.internal.beans.BeanObservableListDecorator;
+import org.eclipse.core.internal.databinding.internal.beans.BeanObservableSetDecorator;
+import org.eclipse.core.internal.databinding.internal.beans.BeanObservableValueDecorator;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableList;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableMap;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableSet;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableValue;
+
+/**
+ * A factory for creating observable objects for POJOs (plain old java objects)
+ * that conform to idea of an object with getters and setters but does not
+ * provide {@link PropertyChangeEvent property change events} on change. This
+ * factory is identical to {@link BeansObservables} except for this fact.
+ *
+ * @since 1.2
+ */
+final public class PojoObservables {
+
+ /**
+ * Returns an observable value in the default realm tracking the current
+ * value of the named property of the given pojo.
+ *
+ * @param pojo
+ * the object
+ * @param propertyName
+ * the name of the property
+ * @return an observable value tracking the current value of the named
+ * property of the given pojo
+ */
+ public static IObservableValue observeValue(Object pojo, String propertyName) {
+ return observeValue(Realm.getDefault(), pojo, propertyName);
+ }
+
+ /**
+ * Returns an observable value in the given realm tracking the current value
+ * of the named property of the given pojo.
+ *
+ * @param realm
+ * the realm
+ * @param pojo
+ * the object
+ * @param propertyName
+ * the name of the property
+ * @return an observable value tracking the current value of the named
+ * property of the given pojo
+ */
+ public static IObservableValue observeValue(Realm realm, Object pojo,
+ String propertyName) {
+
+ PropertyDescriptor descriptor = BeansObservables.getPropertyDescriptor(
+ pojo.getClass(), propertyName);
+ return new JavaBeanObservableValue(realm, pojo, descriptor, false);
+ }
+
+ /**
+ * Returns an observable map in the default realm tracking the current
+ * values of the named property for the pojos in the given set.
+ *
+ * @param domain
+ * the set of pojo objects
+ * @param pojoClass
+ * the common base type of pojo objects that may be in the set
+ * @param propertyName
+ * the name of the property
+ * @return an observable map tracking the current values of the named
+ * property for the pojos in the given domain set
+ */
+ public static IObservableMap observeMap(IObservableSet domain,
+ Class pojoClass, String propertyName) {
+ PropertyDescriptor descriptor = BeansObservables.getPropertyDescriptor(
+ pojoClass, propertyName);
+ return new JavaBeanObservableMap(domain, descriptor, false);
+ }
+
+ /**
+ * Returns an array of observable maps in the default realm tracking the
+ * current values of the named propertys for the pojos in the given set.
+ *
+ * @param domain
+ * the set of objects
+ * @param pojoClass
+ * the common base type of objects that may be in the set
+ * @param propertyNames
+ * the array of property names
+ * @return an array of observable maps tracking the current values of the
+ * named propertys for the pojos in the given domain set
+ */
+ public static IObservableMap[] observeMaps(IObservableSet domain,
+ Class pojoClass, String[] propertyNames) {
+ IObservableMap[] result = new IObservableMap[propertyNames.length];
+ for (int i = 0; i < propertyNames.length; i++) {
+ result[i] = observeMap(domain, pojoClass, propertyNames[i]);
+ }
+ return result;
+ }
+
+ /**
+ * Returns an observable list in the given realm tracking the
+ * collection-typed named property of the given pojo object. The returned
+ * list is mutable.
+ *
+ * @param realm
+ * the realm
+ * @param pojo
+ * the object
+ * @param propertyName
+ * the name of the collection-typed property
+ * @return an observable list tracking the collection-typed named property
+ * of the given pojo object
+ * @see #observeList(Realm, Object, String, Class)
+ */
+ public static IObservableList observeList(Realm realm, Object pojo,
+ String propertyName) {
+ return observeList(realm, pojo, propertyName, null);
+ }
+
+ /**
+ * Returns an observable list in the given realm tracking the
+ * collection-typed named property of the given bean object. The returned
+ * list is mutable. When an item is added or removed the setter is invoked
+ * for the list on the parent bean to provide notification to other
+ * listeners via <code>PropertyChangeEvents</code>. This is done to
+ * provide the same behavior as is expected from arrays as specified in the
+ * bean spec in section 7.2.
+ *
+ * @param realm
+ * the realm
+ * @param pojo
+ * the bean object
+ * @param propertyName
+ * the name of the property
+ * @param elementType
+ * type of the elements in the list. If <code>null</code> and
+ * the property is an array the type will be inferred. If
+ * <code>null</code> and the property type cannot be inferred
+ * element type will be <code>null</code>.
+ * @return an observable list tracking the collection-typed named property
+ * of the given bean object
+ */
+ public static IObservableList observeList(Realm realm, Object pojo,
+ String propertyName, Class elementType) {
+ PropertyDescriptor propertyDescriptor = BeansObservables
+ .getPropertyDescriptor(pojo.getClass(), propertyName);
+ elementType = BeansObservables.getCollectionElementType(elementType,
+ propertyDescriptor);
+
+ return new JavaBeanObservableList(realm, pojo, propertyDescriptor,
+ elementType, false);
+ }
+
+ /**
+ * Returns an observable set in the given realm tracking the
+ * collection-typed named property of the given pojo object.
+ *
+ * @param realm
+ * the realm
+ * @param pojo
+ * the pojo object
+ * @param propertyName
+ * the name of the property
+ * @return an observable set tracking the collection-typed named property of
+ * the given pojo object
+ */
+ public static IObservableSet observeSet(Realm realm, Object pojo,
+ String propertyName) {
+ return observeSet(realm, pojo, propertyName, null);
+ }
+
+ /**
+ * @param realm
+ * @param pojo
+ * @param propertyName
+ * @param elementType
+ * can be <code>null</code>
+ * @return an observable set that tracks the current value of the named
+ * property for given pojo object
+ */
+ public static IObservableSet observeSet(Realm realm, Object pojo,
+ String propertyName, Class elementType) {
+ PropertyDescriptor propertyDescriptor = BeansObservables
+ .getPropertyDescriptor(pojo.getClass(), propertyName);
+ elementType = BeansObservables.getCollectionElementType(elementType,
+ propertyDescriptor);
+
+ return new JavaBeanObservableSet(realm, pojo, propertyDescriptor,
+ elementType, false);
+ }
+
+ /**
+ * Returns a factory for creating obervable values tracking the given
+ * property of a particular pojo object
+ *
+ * @param realm
+ * the realm to use
+ * @param propertyName
+ * the name of the property
+ * @return an observable value factory
+ */
+ public static IObservableFactory valueFactory(final Realm realm,
+ final String propertyName) {
+ return new IObservableFactory() {
+ public IObservable createObservable(Object target) {
+ return observeValue(realm, target, propertyName);
+ }
+ };
+ }
+
+ /**
+ * Returns a factory for creating obervable lists tracking the given
+ * property of a particular pojo object
+ *
+ * @param realm
+ * the realm to use
+ * @param propertyName
+ * the name of the property
+ * @param elementType
+ * @return an observable list factory
+ */
+ public static IObservableFactory listFactory(final Realm realm,
+ final String propertyName, final Class elementType) {
+ return new IObservableFactory() {
+ public IObservable createObservable(Object target) {
+ return observeList(realm, target, propertyName, elementType);
+ }
+ };
+ }
+
+ /**
+ * Returns a factory for creating obervable sets tracking the given property
+ * of a particular pojo object
+ *
+ * @param realm
+ * the realm to use
+ * @param propertyName
+ * the name of the property
+ * @return an observable set factory
+ */
+ public static IObservableFactory setFactory(final Realm realm,
+ final String propertyName) {
+ return new IObservableFactory() {
+ public IObservable createObservable(Object target) {
+ return observeSet(realm, target, propertyName);
+ }
+ };
+ }
+
+ /**
+ * @param realm
+ * @param propertyName
+ * @param elementType
+ * can be <code>null</code>
+ * @return an observable set factory for creating observable sets
+ */
+ public static IObservableFactory setFactory(final Realm realm,
+ final String propertyName, final Class elementType) {
+ return new IObservableFactory() {
+ public IObservable createObservable(Object target) {
+ return observeSet(realm, target, propertyName, elementType);
+ }
+ };
+ }
+
+ /**
+ * Helper method for
+ * <code>MasterDetailObservables.detailValue(master, valueFactory(realm,
+ propertyName), propertyType)</code>
+ *
+ * @param realm
+ * @param master
+ * @param propertyName
+ * @param propertyType
+ * can be <code>null</code>
+ * @return an observable value that tracks the current value of the named
+ * property for the current value of the master observable value
+ *
+ * @see MasterDetailObservables
+ */
+ public static IObservableValue observeDetailValue(Realm realm,
+ IObservableValue master, String propertyName, Class propertyType) {
+
+ IObservableValue value = MasterDetailObservables.detailValue(master,
+ valueFactory(realm, propertyName), propertyType);
+ BeanObservableValueDecorator decorator = new BeanObservableValueDecorator(
+ value, master, BeansObservables.getValueTypePropertyDescriptor(
+ master, propertyName));
+
+ return decorator;
+ }
+
+ /**
+ * Helper method for
+ * <code>MasterDetailObservables.detailList(master, listFactory(realm,
+ propertyName, propertyType), propertyType)</code>
+ *
+ * @param realm
+ * @param master
+ * @param propertyName
+ * @param propertyType
+ * can be <code>null</code>
+ * @return an observable list that tracks the named property for the current
+ * value of the master observable value
+ *
+ * @see MasterDetailObservables
+ */
+ public static IObservableList observeDetailList(Realm realm,
+ IObservableValue master, String propertyName, Class propertyType) {
+ IObservableList observableList = MasterDetailObservables.detailList(
+ master, listFactory(realm, propertyName, propertyType),
+ propertyType);
+ BeanObservableListDecorator decorator = new BeanObservableListDecorator(
+ observableList, master, BeansObservables
+ .getValueTypePropertyDescriptor(master, propertyName));
+
+ return decorator;
+ }
+
+ /**
+ * Helper method for
+ * <code>MasterDetailObservables.detailSet(master, setFactory(realm,
+ propertyName), propertyType)</code>
+ *
+ * @param realm
+ * @param master
+ * @param propertyName
+ * @param propertyType
+ * can be <code>null</code>
+ * @return an observable set that tracks the named property for the current
+ * value of the master observable value
+ *
+ * @see MasterDetailObservables
+ */
+ public static IObservableSet observeDetailSet(Realm realm,
+ IObservableValue master, String propertyName, Class propertyType) {
+
+ IObservableSet observableSet = MasterDetailObservables.detailSet(
+ master, setFactory(realm, propertyName, propertyType),
+ propertyType);
+ BeanObservableSetDecorator decorator = new BeanObservableSetDecorator(
+ observableSet, master, BeansObservables
+ .getValueTypePropertyDescriptor(master, propertyName));
+
+ return decorator;
+ }
+}
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableList.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableList.java
index b510f3a..45c4eee 100644
--- a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableList.java
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableList.java
@@ -53,6 +53,8 @@
private ListenerSupport collectionListenSupport;
+ private boolean attachListeners;
+
/**
* @param realm
* @param object
@@ -61,18 +63,38 @@
*/
public JavaBeanObservableList(Realm realm, Object object,
PropertyDescriptor descriptor, Class elementType) {
+ this(realm, object, descriptor, elementType, true);
+ }
+
+ /**
+ * @param realm
+ * @param object
+ * @param descriptor
+ * @param elementType
+ * @param attachListeners
+ */
+ public JavaBeanObservableList(Realm realm, Object object,
+ PropertyDescriptor descriptor, Class elementType,
+ boolean attachListeners) {
+
super(realm, new ArrayList(), elementType);
this.object = object;
this.descriptor = descriptor;
- this.collectionListenSupport = new ListenerSupport(collectionListener,
- descriptor.getName());
+ this.attachListeners = attachListeners;
+
+ if (attachListeners) {
+ this.collectionListenSupport = new ListenerSupport(
+ collectionListener, descriptor.getName());
+ }
// initialize list without firing events
wrappedList.addAll(Arrays.asList(getValues()));
}
protected void firstListenerAdded() {
- collectionListenSupport.hookListener(this.object);
+ if (attachListeners) {
+ collectionListenSupport.hookListener(this.object);
+ }
}
protected void lastListenerRemoved() {
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableMap.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableMap.java
index e8dfb77..7fa1d72 100644
--- a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableMap.java
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableMap.java
@@ -28,7 +28,8 @@
* @since 1.0
*
*/
-public class JavaBeanObservableMap extends ComputedObservableMap implements IBeanObservable {
+public class JavaBeanObservableMap extends ComputedObservableMap implements
+ IBeanObservable {
private PropertyDescriptor propertyDescriptor;
@@ -46,26 +47,45 @@
private boolean updating = false;
+ private boolean attachListeners;
+
/**
* @param domain
* @param propertyDescriptor
*/
public JavaBeanObservableMap(IObservableSet domain,
PropertyDescriptor propertyDescriptor) {
+ this(domain, propertyDescriptor, true);
+ }
+
+ /**
+ * @param domain
+ * @param propertyDescriptor
+ * @param attachListeners
+ */
+ public JavaBeanObservableMap(IObservableSet domain,
+ PropertyDescriptor propertyDescriptor, boolean attachListeners) {
super(domain);
-
+
this.propertyDescriptor = propertyDescriptor;
- this.listenerSupport = new ListenerSupport(elementListener,
- propertyDescriptor.getName());
+ this.attachListeners = attachListeners;
+ if (attachListeners) {
+ this.listenerSupport = new ListenerSupport(elementListener,
+ propertyDescriptor.getName());
+ }
init();
}
protected void hookListener(Object domainElement) {
- listenerSupport.hookListener(domainElement);
+ if (attachListeners) {
+ listenerSupport.hookListener(domainElement);
+ }
}
protected void unhookListener(Object domainElement) {
- listenerSupport.unhookListener(domainElement);
+ if (attachListeners) {
+ listenerSupport.unhookListener(domainElement);
+ }
}
protected Object doGet(Object key) {
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableSet.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableSet.java
index d81213d..0aaeb1e 100644
--- a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableSet.java
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableSet.java
@@ -58,24 +58,45 @@
private ListenerSupport collectionListenSupport;
+ private boolean attachListeners;
+
/**
- * @param realm
+ * @param realm
* @param object
* @param descriptor
* @param elementType
*/
- public JavaBeanObservableSet(Realm realm, Object object, PropertyDescriptor descriptor,
- Class elementType) {
+ public JavaBeanObservableSet(Realm realm, Object object,
+ PropertyDescriptor descriptor, Class elementType) {
+ this(realm, object, descriptor, elementType, true);
+ }
+
+ /**
+ * @param realm
+ * @param object
+ * @param descriptor
+ * @param elementType
+ * @param attachListeners
+ */
+ public JavaBeanObservableSet(Realm realm, Object object,
+ PropertyDescriptor descriptor, Class elementType,
+ boolean attachListeners) {
super(realm, new HashSet(), elementType);
this.object = object;
this.descriptor = descriptor;
- this.collectionListenSupport = new ListenerSupport(collectionListener, descriptor.getName());
-
+ this.attachListeners = attachListeners;
+ if (attachListeners) {
+ this.collectionListenSupport = new ListenerSupport(
+ collectionListener, descriptor.getName());
+ }
+
wrappedSet.addAll(Arrays.asList(getValues()));
}
protected void firstListenerAdded() {
- collectionListenSupport.hookListener(this.object);
+ if (attachListeners) {
+ collectionListenSupport.hookListener(this.object);
+ }
}
protected void lastListenerRemoved() {
diff --git a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableValue.java b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableValue.java
index ef6e181..643c5c4 100644
--- a/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableValue.java
+++ b/bundles/org.eclipse.core.databinding.beans/src/org/eclipse/core/internal/databinding/internal/beans/JavaBeanObservableValue.java
@@ -25,6 +25,7 @@
import org.eclipse.core.databinding.observable.value.AbstractObservableValue;
import org.eclipse.core.databinding.observable.value.ValueDiff;
import org.eclipse.core.databinding.util.Policy;
+import org.eclipse.core.internal.databinding.Util;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -39,6 +40,8 @@
private final PropertyDescriptor propertyDescriptor;
private ListenerSupport listenerSupport;
+ private boolean attachListeners;
+
/**
* @param realm
* @param object
@@ -46,12 +49,28 @@
*/
public JavaBeanObservableValue(Realm realm, Object object,
PropertyDescriptor descriptor) {
+ this(realm, object, descriptor, true);
+ }
+
+ /**
+ * @param realm
+ * @param object
+ * @param descriptor
+ * @param attachListeners
+ */
+ public JavaBeanObservableValue(Realm realm, Object object,
+ PropertyDescriptor descriptor, boolean attachListeners) {
super(realm);
this.object = object;
this.propertyDescriptor = descriptor;
+ this.attachListeners = attachListeners;
}
protected void firstListenerAdded() {
+ if (!attachListeners) {
+ return;
+ }
+
PropertyChangeListener listener = new PropertyChangeListener() {
public void propertyChange(java.beans.PropertyChangeEvent event) {
if (!updating) {
@@ -76,6 +95,11 @@
updating = true;
try {
Object oldValue = doGetValue();
+
+ if (Util.equals(oldValue, value)) {
+ return;
+ }
+
Method writeMethod = propertyDescriptor.getWriteMethod();
if (!writeMethod.isAccessible()) {
writeMethod.setAccessible(true);
diff --git a/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF
index 86770a9..5d09dda 100644
--- a/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.databinding/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@
org.eclipse.core.databinding.observable.value;x-internal:=false,
org.eclipse.core.databinding.util,
org.eclipse.core.databinding.validation;x-internal:=false,
- org.eclipse.core.internal.databinding;x-internal:=true,
+ org.eclipse.core.internal.databinding;x-friends:="org.eclipse.core.databinding.beans",
org.eclipse.core.internal.databinding.conversion;x-friends:="org.eclipse.jface.tests.databinding",
org.eclipse.core.internal.databinding.observable;x-internal:=true,
org.eclipse.core.internal.databinding.observable.masterdetail;x-friends:="org.eclipse.jface.tests.databinding",
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java
new file mode 100644
index 0000000..f0f3f08
--- /dev/null
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/beans/PojoObservablesTest.java
@@ -0,0 +1,187 @@
+/*******************************************************************************
+ * Copyright (c) 2007 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ ******************************************************************************/
+
+package org.eclipse.core.tests.databinding.beans;
+
+import org.eclipse.core.databinding.beans.PojoObservables;
+import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.core.databinding.observable.list.IObservableList;
+import org.eclipse.core.databinding.observable.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.WritableSet;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableList;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableMap;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableSet;
+import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableValue;
+import org.eclipse.core.tests.internal.databinding.internal.beans.Bean;
+import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
+import org.eclipse.jface.databinding.conformance.util.CurrentRealm;
+import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
+
+/**
+ * @since 3.2
+ */
+public class PojoObservablesTest extends AbstractDefaultRealmTestCase {
+ private Bean pojo;
+ private String propertyName;
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ pojo = new Bean();
+ propertyName = "value";
+ }
+
+ public void testObserveValue_ReturnsJavaBeanObservableValue()
+ throws Exception {
+ IObservableValue value = PojoObservables.observeValue(pojo, propertyName);
+
+ assertNotNull(value);
+ assertTrue(value instanceof JavaBeanObservableValue);
+ }
+
+ public void testObserveValue_DoesNotAttachListeners() throws Exception {
+ IObservableValue value = PojoObservables.observeValue(pojo, propertyName);
+
+ ChangeEventTracker.observe(value);
+ assertFalse(pojo.hasListeners(propertyName));
+ }
+
+ public void testObservableValueWithRealm_ReturnsJavaBeanObservable()
+ throws Exception {
+ CurrentRealm realm = new CurrentRealm(true);
+ IObservableValue value = PojoObservables.observeValue(realm, pojo,
+ propertyName);
+
+ assertNotNull(value);
+ assertTrue(value instanceof JavaBeanObservableValue);
+ }
+
+ public void testObservableMap_ReturnsJavaBeanObservableMap()
+ throws Exception {
+ IObservableSet set = new WritableSet();
+ set.add(new Bean());
+
+ IObservableMap map = PojoObservables.observeMap(set, Bean.class,
+ propertyName);
+ assertNotNull(map);
+ assertTrue(map instanceof JavaBeanObservableMap);
+ }
+
+ public void testObservableMap_DoesNotAttachListeners() throws Exception {
+ IObservableSet set = new WritableSet();
+ set.add(pojo);
+
+ IObservableMap map = PojoObservables.observeMap(set, Bean.class, propertyName);
+ assertFalse(pojo.hasListeners(propertyName));
+ ChangeEventTracker.observe(map);
+ assertFalse(pojo.hasListeners(propertyName));
+ }
+
+ public void testObserveMaps_ReturnsMaps() throws Exception {
+ IObservableSet set = new WritableSet();
+ set.add(pojo);
+
+ IObservableMap[] maps = PojoObservables.observeMaps(set, Bean.class, new String[] {"value", "class"});
+ assertEquals(2, maps.length);
+ }
+
+ public void testObserveListWithElementType_ReturnsJavaBeanObservableList() throws Exception {
+ IObservableList list = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);
+ assertTrue(list instanceof JavaBeanObservableList);
+ }
+
+ public void testObserveListWithElementType_DoesNotAttachListeners() throws Exception {
+ IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list", String.class);
+ assertFalse(pojo.hasListeners("list"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("list"));
+ }
+
+ public void testObserveList_ReturnsJavaBeanObservableList() throws Exception {
+ IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");
+ assertTrue(observable instanceof JavaBeanObservableList);
+ }
+
+ public void testObserveList_DoesNotAttachListeners() throws Exception {
+ IObservableList observable = PojoObservables.observeList(Realm.getDefault(), pojo, "list");
+ assertFalse(pojo.hasListeners("list"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("list"));
+ }
+
+ public void testObserveSetWithElementType_ReturnsJavaBeanObservableList() throws Exception {
+ IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);
+ assertTrue(list instanceof JavaBeanObservableSet);
+ }
+
+ public void testObserveSetWithElementType_DoesNotAttachListeners() throws Exception {
+ IObservableSet observable = PojoObservables.observeSet(Realm.getDefault(), pojo, "set", String.class);
+ assertFalse(pojo.hasListeners("set"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("set"));
+ }
+
+ public void testObserveSet_ReturnsJavaBeanObservableList() throws Exception {
+ IObservableSet list = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");
+ assertTrue(list instanceof JavaBeanObservableSet);
+ }
+
+ public void testObserveSet_DoesNotAttachListeners() throws Exception {
+ IObservableSet observable = PojoObservables.observeSet(Realm.getDefault(), pojo, "set");
+ assertFalse(pojo.hasListeners("set"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("set"));
+ }
+
+ public void testValueFactory_DoesNotAttachListeners() throws Exception {
+ IObservableFactory factory = PojoObservables.valueFactory(Realm.getDefault(), "value");
+ IObservableValue observable = (IObservableValue) factory.createObservable(pojo);
+
+ assertFalse(pojo.hasListeners("value"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("value"));
+ }
+
+ public void testListFactory_DoesNotAttachListeners() throws Exception {
+ IObservableFactory factory = PojoObservables.listFactory(Realm.getDefault(), "list", String.class);
+ IObservableList observable = (IObservableList) factory.createObservable(pojo);
+
+ assertFalse(pojo.hasListeners("value"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("value"));
+ }
+
+ public void testSetFactory_DoesNotAttachListeners() throws Exception {
+ IObservableFactory factory = PojoObservables.setFactory(Realm.getDefault(), propertyName);
+ IObservableSet observable = (IObservableSet) factory.createObservable(pojo);
+
+ assertFalse(pojo.hasListeners("set"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("set"));
+ }
+
+ public void testSetFactoryWithElementType_DoesNotAttachListeners() throws Exception {
+ IObservableFactory factory = PojoObservables.setFactory(Realm.getDefault(), propertyName, String.class);
+ IObservableSet observable = (IObservableSet) factory.createObservable(pojo);
+
+ assertFalse(pojo.hasListeners("set"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(pojo.hasListeners("set"));
+ }
+}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/Bean.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/Bean.java
index da8baab..505db63 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/Bean.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/Bean.java
@@ -73,4 +73,8 @@
public void setSet(Set set) {
changeSupport.firePropertyChange("set", this.set, this.set = set);
}
+
+ public boolean hasListeners(String propertyName) {
+ return changeSupport.hasListeners(propertyName);
+ }
}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableListTest.java
index c8e18af..f2615dc 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableListTest.java
@@ -19,9 +19,11 @@
import java.util.Collection;
import java.util.List;
+import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.list.ListChangeEvent;
import org.eclipse.core.databinding.observable.list.ListDiffEntry;
import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableList;
+import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
import org.eclipse.jface.databinding.conformance.util.ListChangeEventTracker;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
@@ -424,6 +426,28 @@
assertEquals(1, listener.count);
}
+ public void testConstructor_RegistersListener() throws Exception {
+ Bean bean = new Bean();
+ JavaBeanObservableList observable = new JavaBeanObservableList(Realm
+ .getDefault(), bean,
+ new PropertyDescriptor("list", Bean.class), Bean.class);
+
+ assertFalse(bean.hasListeners("list"));
+ ChangeEventTracker.observe(observable);
+ assertTrue(bean.hasListeners("list"));
+ }
+
+ public void testConstructor_SkipsRegisterListener() throws Exception {
+ Bean bean = new Bean();
+ JavaBeanObservableList observable = new JavaBeanObservableList(Realm
+ .getDefault(), bean,
+ new PropertyDescriptor("list", Bean.class), Bean.class, false);
+
+ assertFalse(bean.hasListeners("list"));
+ ChangeEventTracker.observe(observable);
+ assertFalse(bean.hasListeners("list"));
+ }
+
private static void assertEntry(ListDiffEntry entry, boolean addition,
int position, Object element) {
assertEquals("addition", addition, entry.isAddition());
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableMapTest.java
index 384f40f..c0e0a7a 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableMapTest.java
@@ -16,12 +16,15 @@
import junit.framework.TestCase;
+import org.eclipse.core.databinding.observable.Realm;
import org.eclipse.core.databinding.observable.map.IMapChangeListener;
import org.eclipse.core.databinding.observable.map.MapChangeEvent;
import org.eclipse.core.databinding.observable.map.MapDiff;
import org.eclipse.core.databinding.observable.set.WritableSet;
import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableMap;
import org.eclipse.core.tests.databinding.observable.ThreadRealm;
+import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
+import org.eclipse.jface.databinding.conformance.util.CurrentRealm;
/**
* @since 3.2
@@ -129,6 +132,30 @@
public void testGetPropertyDescriptor() throws Exception {
assertEquals(propertyDescriptor, map.getPropertyDescriptor());
}
+
+ public void testConstructor_SkipRegisterListeners() throws Exception {
+ Realm realm = new CurrentRealm(true);
+ WritableSet set = new WritableSet(realm);
+ Bean bean = new Bean();
+ set.add(bean);
+
+ JavaBeanObservableMap observable = new JavaBeanObservableMap(set, new PropertyDescriptor("value", Bean.class), false);
+ ChangeEventTracker.observe(observable);
+
+ assertFalse(bean.hasListeners("value"));
+ }
+
+ public void testConstructor_RegistersListeners() throws Exception {
+ Realm realm = new CurrentRealm(true);
+ WritableSet set = new WritableSet(realm);
+ Bean bean = new Bean();
+ set.add(bean);
+
+ JavaBeanObservableMap observable = new JavaBeanObservableMap(set, new PropertyDescriptor("value", Bean.class));
+ ChangeEventTracker.observe(observable);
+
+ assertTrue(bean.hasListeners("value"));
+ }
private static class MapChangeListener implements IMapChangeListener {
int count;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableSetTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableSetTest.java
index 77e7be0..c11c405 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableSetTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableSetTest.java
@@ -20,6 +20,8 @@
import org.eclipse.core.databinding.observable.set.ISetChangeListener;
import org.eclipse.core.databinding.observable.set.SetChangeEvent;
import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableSet;
+import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
+import org.eclipse.jface.databinding.conformance.util.CurrentRealm;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Display;
@@ -81,6 +83,26 @@
bean.setSet(new HashSet(Arrays.asList(new String[] {"1"})));
assertEquals(1, listener.count);
}
+
+ public void testConstructor_RegisterListeners() throws Exception {
+ bean = new Bean();
+
+ observableSet = new JavaBeanObservableSet(new CurrentRealm(true), bean,
+ propertyDescriptor, Bean.class);
+ assertFalse(bean.hasListeners(propertyName));
+ ChangeEventTracker.observe(observableSet);
+ assertTrue(bean.hasListeners(propertyName));
+ }
+
+ public void testConstructore_SkipsRegisterListeners() throws Exception {
+ bean = new Bean();
+
+ observableSet = new JavaBeanObservableSet(new CurrentRealm(true), bean,
+ propertyDescriptor, Bean.class, false);
+ assertFalse(bean.hasListeners(propertyName));
+ ChangeEventTracker.observe(observableSet);
+ assertFalse(bean.hasListeners(propertyName));
+ }
static class SetChangeListener implements ISetChangeListener {
int count;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableValueTest.java
index de6326b..07fce79 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/internal/beans/JavaBeanObservableValueTest.java
@@ -26,8 +26,10 @@
import org.eclipse.core.databinding.observable.value.ComputedValue;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.internal.databinding.internal.beans.JavaBeanObservableValue;
+import org.eclipse.jface.databinding.conformance.MutableObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.ObservableValueContractTest;
import org.eclipse.jface.databinding.conformance.delegate.AbstractObservableValueContractDelegate;
+import org.eclipse.jface.databinding.conformance.util.ChangeEventTracker;
import org.eclipse.jface.databinding.conformance.util.SuiteBuilder;
import org.eclipse.jface.examples.databinding.model.SimplePerson;
import org.eclipse.jface.tests.databinding.AbstractDefaultRealmTestCase;
@@ -52,13 +54,6 @@
propertyDescriptor = new PropertyDescriptor(propertyName, Bean.class);
observableValue = new JavaBeanObservableValue(Realm.getDefault(), bean, propertyDescriptor);
}
-
- public void testSetsValueInBean() throws Exception {
- String value = "value";
- assertNull(observableValue.getValue());
- observableValue.setValue(value);
- assertEquals("value", value, observableValue.getValue());
- }
public void testGetObserved() throws Exception {
assertEquals(bean, observableValue.getObserved());
@@ -112,11 +107,28 @@
person.setName("foo");
}
+ public void testConstructor_RegistersListeners() throws Exception {
+ JavaBeanObservableValue observable = new JavaBeanObservableValue(Realm.getDefault(), bean, propertyDescriptor);
+ ChangeEventTracker.observe(observable);
+
+ assertTrue(bean.hasListeners(propertyName));
+ }
+
+ public void testConstructor_SkipRegisterListeners() throws Exception {
+ JavaBeanObservableValue observable = new JavaBeanObservableValue(Realm.getDefault(), bean, propertyDescriptor, false);
+ ChangeEventTracker.observe(observable);
+
+ assertFalse(bean.hasListeners(propertyName));
+ }
+
public static Test suite() {
Object[] params = new Object[] {new Delegate()};
return new SuiteBuilder().addTests(JavaBeanObservableValueTest.class)
- .addParameterizedTests(ObservableValueContractTest.class, params).build();
+ .addParameterizedTests(ObservableValueContractTest.class,
+ params).addParameterizedTests(
+ MutableObservableValueContractTest.class, params)
+ .build();
}
/* package */ static class Delegate extends AbstractObservableValueContractDelegate {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java
index 41ca6f0..e9b1d20 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/jface/tests/databinding/BindingTestSuite.java
@@ -28,6 +28,7 @@
import org.eclipse.core.tests.databinding.UpdateValueStrategyTest;
import org.eclipse.core.tests.databinding.ValueBindingTest;
import org.eclipse.core.tests.databinding.beans.BeansObservablesTest;
+import org.eclipse.core.tests.databinding.beans.PojoObservablesTest;
import org.eclipse.core.tests.databinding.conversion.NumberToStringConverterTest;
import org.eclipse.core.tests.databinding.conversion.StringToNumberConverterTest;
import org.eclipse.core.tests.databinding.observable.AbstractObservableTest;
@@ -161,6 +162,7 @@
// org.eclipse.core.tests.databinding.beans
addTestSuite(BeansObservablesTest.class);
+ addTestSuite(PojoObservablesTest.class);
// org.eclipse.core.tests.databinding.conversion
addTestSuite(NumberToStringConverterTest.class);
