Bug 434283 - Update the JFace databinding snippets

Change-Id: I1f50e6dacfd5a5c343556244d9835c0b1c0369e6
Signed-off-by: Simon Scholz <simon.scholz@vogella.com>

13 files changed, 105 insertions, 93 deletions

diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/nestedselection/TestMasterDetail.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/nestedselection/TestMasterDetail.java
index 256db2df781..2feb331e7c8 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/nestedselection/TestMasterDetail.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/nestedselection/TestMasterDetail.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2014 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
@@ -9,6 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Brad Reynolds - bug 116920
  *     Matthew Hall - bugs 260329, 260337
+ *     Simon Scholz <simon.scholz@vogella.com> - Bug 434283
  *******************************************************************************/
 
 package org.eclipse.jface.examples.databinding.nestedselection;
@@ -17,7 +18,6 @@ import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.conversion.IConverter;
 import org.eclipse.core.databinding.observable.IObserving;
 import org.eclipse.core.databinding.observable.Realm;
@@ -29,6 +29,7 @@ import org.eclipse.core.internal.databinding.conversion.ObjectToStringConverter;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.databinding.swt.SWTObservables;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.databinding.viewers.ViewerSupport;
 import org.eclipse.jface.databinding.viewers.ViewersObservables;
 import org.eclipse.jface.examples.databinding.model.SimpleModel;
@@ -260,33 +261,36 @@ public class TestMasterDetail {
 				return Status.OK_STATUS;
 			}
 		};
-		Binding b = dbc.bindValue(SWTObservables.observeText(name, SWT.Modify),
-				BeansObservables.observeDetailValue(selectedPerson, "name",
-						String.class), new CustomUpdateValueStrategy()
+		Binding b = dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(name),
+				BeanProperties.value((Class) selectedPerson.getValueType(), "name", String.class).observeDetail(
+								selectedPerson), new CustomUpdateValueStrategy()
 						.setConverter(upperCaseConverter).setAfterGetValidator(
 								vowelValidator), null);
 
 		// AggregateValidationStatus status = new AggregateValidationStatus(dbc
 		// .getBindings(), AggregateValidationStatus.MAX_SEVERITY);
-		dbc.bindValue(SWTObservables.observeText(validationStatus, SWT.NONE), b
+		dbc.bindValue(WidgetProperties.text().observe(validationStatus), b
 				.getValidationStatus(), null, new UpdateValueStrategy()
 				.setConverter(new ObjectToStringConverter()));
 
-		dbc.bindValue(SWTObservables.observeText(address, SWT.Modify),
-				BeansObservables.observeDetailValue(selectedPerson, "address",
-						String.class));
+		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(address),
+				BeanProperties.value((Class) selectedPerson.getValueType(), "address", String.class).observeDetail(
+						selectedPerson));
 
-		dbc.bindValue(SWTObservables.observeText(city, SWT.Modify),
-				BeansObservables.observeDetailValue(selectedPerson, "city",
-						String.class));
+		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(city),
+				BeanProperties.value((Class) selectedPerson.getValueType(), "city", String.class).observeDetail(
+						selectedPerson));
 
-		dbc.bindValue(SWTObservables.observeText(state, SWT.Modify),
-				BeansObservables.observeDetailValue(selectedPerson, "state",
-						String.class));
+		dbc.bindValue(
+				WidgetProperties.text(SWT.Modify).observe(state),
+				BeanProperties.value((Class) selectedPerson.getValueType(), "state", String.class).observeDetail(
+				selectedPerson));
 
 		TableViewer ordersViewer = new TableViewer(ordersTable);
-		ViewerSupport.bind(ordersViewer, BeansObservables.observeDetailList(
-				selectedPerson, "orders", SimpleOrder.class), BeanProperties
+		ViewerSupport.bind(ordersViewer, BeanProperties
+				.list((Class) selectedPerson.getValueType(),
+						"orders", SimpleOrder.class).observeDetail(selectedPerson),
+				BeanProperties
 				.values(SimpleOrder.class,
 						new String[] { "orderNumber", "date" }));
 	}
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java
index 149f4cc3b0c..f359888459c 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet001NestedSelectionWithCombo.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.observable.Observables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
@@ -183,9 +183,9 @@ public class Snippet001NestedSelectionWithCombo {
 			Combo city = new Combo(shell, SWT.BORDER | SWT.READ_ONLY);
 
 			ListViewer peopleListViewer = new ListViewer(peopleList);
-			IObservableMap attributeMap = BeansObservables.observeMap(
+			IObservableMap attributeMap = BeanProperties.value(Person.class, "name").observeDetail(
 					Observables.staticObservableSet(realm, new HashSet(
-							viewModel.getPeople())), Person.class, "name");
+							viewModel.getPeople())));
 			peopleListViewer.setLabelProvider(new ObservableMapLabelProvider(
 					attributeMap));
 			peopleListViewer.setContentProvider(new ArrayContentProvider());
@@ -194,9 +194,14 @@ public class Snippet001NestedSelectionWithCombo {
 			DataBindingContext dbc = new DataBindingContext(realm);
 			IObservableValue selectedPerson = ViewersObservables
 					.observeSingleSelection(peopleListViewer);
-			dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(name),
-					BeansObservables.observeDetailValue(selectedPerson,
-							"name", String.class));
+			Class selectedPersonValueType = null;
+			if (selectedPerson.getValueType() instanceof Class<?>) {
+				selectedPersonValueType = (Class) selectedPerson.getValueType();
+			}
+			dbc.bindValue(
+					WidgetProperties.text(SWT.Modify).observe(name),
+					BeanProperties.value(selectedPersonValueType, "name", String.class)
+					.observeDetail(selectedPerson));
 
 			ComboViewer cityViewer = new ComboViewer(city);
 			cityViewer.setContentProvider(new ArrayContentProvider());
@@ -204,8 +209,8 @@ public class Snippet001NestedSelectionWithCombo {
 
 			IObservableValue citySelection = ViewersObservables
 					.observeSingleSelection(cityViewer);
-			dbc.bindValue(citySelection, BeansObservables.observeDetailValue(
-					selectedPerson, "city", String.class));
+			dbc.bindValue(citySelection, BeanProperties.value(selectedPersonValueType, "city", String.class)
+					.observeDetail(selectedPerson));
 
 			GridLayoutFactory.swtDefaults().applyTo(shell);
 			// Open and return the Shell
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet002UpdateComboRetainSelection.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet002UpdateComboRetainSelection.java
index 0d101793625..388c2042350 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet002UpdateComboRetainSelection.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet002UpdateComboRetainSelection.java
@@ -21,7 +21,7 @@ import java.util.Collection;
 import java.util.List;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -165,11 +165,13 @@ public class Snippet002UpdateComboRetainSelection {
 
             DataBindingContext dbc = new DataBindingContext();
 
-            IObservableList list = MasterDetailObservables.detailList(BeansObservables.observeValue(viewModel, "choices"),
+            IObservableList list = MasterDetailObservables.detailList(BeanProperties.value(viewModel.getClass(), "choices").observe(
+            		viewModel),
                     getListDetailFactory(),
                     String.class);
 			dbc.bindList(WidgetProperties.items().observe(combo), list);
-			dbc.bindValue(WidgetProperties.text().observe(combo), BeansObservables.observeValue(viewModel, "text"));
+			dbc.bindValue(WidgetProperties.text().observe(combo), BeanProperties.value(viewModel.getClass(), "text")
+					.observe(viewModel));
 
             // Open and return the Shell
             shell.pack();
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet003UpdateComboBindUsingViewer.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet003UpdateComboBindUsingViewer.java
index 7bed5992761..7d1a38557ba 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet003UpdateComboBindUsingViewer.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet003UpdateComboBindUsingViewer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 The Pampered Chef, Inc. and others.
+ * Copyright (c) 2006, 2014 The Pampered Chef, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -9,6 +9,7 @@
  *     The Pampered Chef, Inc. - initial API and implementation
  *     Brad Reynolds - bug 116920
  *     Matthew Hall - bugs 260329, 260337
+ *     Simon Scholz <simon.scholz@vogella.com> - Bug 434283
  ******************************************************************************/
 
 package org.eclipse.jface.examples.databinding.snippets;
@@ -19,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.property.Properties;
 import org.eclipse.jface.databinding.swt.SWTObservables;
@@ -161,12 +162,13 @@ public class Snippet003UpdateComboBindUsingViewer {
 			System.out.println(viewModel.getText());
 
 			DataBindingContext dbc = new DataBindingContext();
-			ViewerSupport.bind(viewer, BeansObservables.observeList(viewModel,
-					"choices", String.class), Properties
+			ViewerSupport.bind(viewer,
+					BeanProperties.list(viewModel.getClass(), "choices", String.class).observe(viewModel),
+					Properties
 					.selfValue(String.class));
 
-			dbc.bindValue(ViewersObservables.observeSingleSelection(viewer),
-					BeansObservables.observeValue(viewModel, "text"));
+			dbc.bindValue(ViewersObservables.observeSingleSelection(viewer), BeanProperties.value(viewModel.getClass(), "text").observe(
+					viewModel));
 
 			// Open and return the Shell
 			shell.pack();
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java
index e65fa9526b3..fc5ba16cfe0 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet007ColorLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2009 Brad Reynolds and others.
+ * Copyright (c) 2006, 2014 Brad Reynolds and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     Brad Reynolds - initial API and implementation
  *     IBM Corporation - see bug 137934
+ *     Simon Scholz <simon.scholz@vogella.com> - Bug 434283
  ******************************************************************************/
 
 package org.eclipse.jface.examples.databinding.snippets;
@@ -17,7 +18,7 @@ import java.beans.PropertyChangeSupport;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.observable.Observables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.list.IObservableList;
@@ -88,9 +89,11 @@ public class Snippet007ColorLabelProvider {
 
 				// this does not have to correspond to the columns in the table,
 				// we just list all attributes that affect the table content.
-				IObservableMap[] attributes = BeansObservables.observeMaps(
-						contentProvider.getKnownElements(), Person.class,
-						new String[] { "name", "gender" });
+				IObservableMap[] attributes = new IObservableMap[2];
+				attributes[0] = BeanProperties.value(Person.class, "name").observeDetail(
+						contentProvider.getKnownElements());
+				attributes[1] = BeanProperties.value(Person.class, "gender").observeDetail(
+						contentProvider.getKnownElements());
 
 				class ColorLabelProvider extends ObservableMapLabelProvider
 						implements ITableColorProvider {
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet010MasterDetail.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet010MasterDetail.java
index 095523fd6dc..4b973b19d6e 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet010MasterDetail.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet010MasterDetail.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2009 Brad Reynolds and others.
+ * Copyright (c) 2007, 2014 Brad Reynolds and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -8,6 +8,7 @@
  * Contributors:
  *     Brad Reynolds - initial API and implementation
  *     Matthew Hall - bug 260329
+ *     Simon Scholz <simon.scholz@vogella.com> - Bug 434283
  ******************************************************************************/
 
 package org.eclipse.jface.examples.databinding.snippets;
@@ -17,7 +18,7 @@ import java.beans.PropertyChangeSupport;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.jface.databinding.swt.SWTObservables;
@@ -58,8 +59,9 @@ public class Snippet010MasterDetail {
 						.observeSingleSelection(viewer);
 
 				// 2. Observe the name property of the current selection.
-				IObservableValue detailObservable = BeansObservables
-						.observeDetailValue(selection, "name", String.class);
+				IObservableValue detailObservable = BeanProperties.value((Class) selection.getValueType(), "name",
+						String.class)
+						.observeDetail(selection);
 
 				// 3. Bind the Text widget to the name detail (selection's
 				// name).
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java
index a33764ca2d7..a581bde4c89 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet013TableViewerEditing.java
@@ -21,7 +21,6 @@ import java.util.List;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.list.WritableList;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -179,7 +178,7 @@ public class Snippet013TableViewerEditing {
 		@Override
 		protected IObservableValue doCreateElementObservable(Object element,
 				ViewerCell cell) {
-			return BeansObservables.observeValue(element, "name");
+			return BeanProperties.value(element.getClass(), "name").observe(element);
 		}
 	}
 
@@ -234,8 +233,8 @@ public class Snippet013TableViewerEditing {
 			IObservableValue selection = ViewersObservables
 					.observeSingleSelection(peopleViewer);
 			bindingContext.bindValue(WidgetProperties.text().observe(selectedCommitter),
-					BeansObservables
-					.observeDetailValue(selection, "name", String.class));
+					BeanProperties.value((Class) selection.getValueType(), "name", String.class)
+					.observeDetail(selection));
 		}
 	}
 
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet017TableViewerWithDerivedColumns.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet017TableViewerWithDerivedColumns.java
index 75179745507..ad435c58090 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet017TableViewerWithDerivedColumns.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet017TableViewerWithDerivedColumns.java
@@ -18,7 +18,6 @@ import java.beans.PropertyChangeSupport;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -261,24 +260,24 @@ public class Snippet017TableViewerWithDerivedColumns {
 			IObservableValue selection = ViewersObservables
 					.observeSingleSelection(peopleViewer);
 			bindingContext.bindValue(WidgetProperties.text().observe(nameText),
-					BeansObservables.observeDetailValue(selection,
-					"name", String.class));
+					BeanProperties.value((Class) selection.getValueType(), "name", String.class).observeDetail(
+							selection));
 
 			ComboViewer mothercomboViewer = new ComboViewer(motherCombo);
 			ViewerSupport.bind(mothercomboViewer, viewModel.getPeople(),
 					BeanProperties.value("name"));
 			bindingContext.bindValue(ViewersObservables
-					.observeSingleSelection(mothercomboViewer),
-					BeansObservables.observeDetailValue(selection, "mother",
-							Person.class));
+					.observeSingleSelection(mothercomboViewer), BeanProperties
+					.value((Class) selection.getValueType(), "mother", Person.class)
+					.observeDetail(selection));
 
 			ComboViewer fatherComboViewer = new ComboViewer(fatherCombo);
 			ViewerSupport.bind(fatherComboViewer, viewModel.getPeople(),
 					BeanProperties.value("name"));
 			bindingContext.bindValue(ViewersObservables
 					.observeSingleSelection(fatherComboViewer),
-					BeansObservables.observeDetailValue(selection, "father",
-							Person.class));
+					BeanProperties.value((Class) selection.getValueType(), "father", Person.class)
+					.observeDetail(selection));
 		}
 	}
 
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet018CheckboxTableViewerCheckedSelection.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet018CheckboxTableViewerCheckedSelection.java
index 9e8b43a5fc2..477e858fbf3 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet018CheckboxTableViewerCheckedSelection.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet018CheckboxTableViewerCheckedSelection.java
@@ -23,7 +23,6 @@ import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.list.IObservableList;
 import org.eclipse.core.databinding.observable.value.ComputedValue;
@@ -298,8 +297,7 @@ public class Snippet018CheckboxTableViewerCheckedSelection {
 		private void bindUI() {
 			DataBindingContext dbc = new DataBindingContext();
 
-			final IObservableList people = BeansObservables.observeList(Realm
-					.getDefault(), viewModel, "people");
+			final IObservableList people = BeanProperties.list(viewModel.getClass(), "people").observe(viewModel);
 
 			addPersonButton.addListener(SWT.Selection, new Listener() {
 				@Override
@@ -354,16 +352,17 @@ public class Snippet018CheckboxTableViewerCheckedSelection {
 			dbc.bindValue(WidgetProperties.enabled().observe(friendsViewer
 					.getTable()), personSelected);
 
-			dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(personName),
-					BeansObservables.observeDetailValue(selectedPerson, "name",
-							String.class));
+			dbc.bindValue(
+					WidgetProperties.text(SWT.Modify).observe(personName),
+					BeanProperties.value((Class) selectedPerson.getValueType(), "name", String.class)
+					.observeDetail(selectedPerson));
 
 			ViewerSupport.bind(friendsViewer, people, BeanProperties.value(
 					Person.class, "name"));
 
 			dbc.bindSet(ViewersObservables.observeCheckedElements(
-					friendsViewer, Person.class), BeansObservables
-					.observeDetailSet(selectedPerson, "friends", Person.class));
+					friendsViewer, Person.class),BeanProperties.set((Class) selectedPerson.getValueType(), "friends", Person.class)
+					.observeDetail(selectedPerson));
 		}
 	}
 }
\ No newline at end of file
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet019TreeViewerWithListFactory.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet019TreeViewerWithListFactory.java
index b9770c8ffa9..b20472edabd 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet019TreeViewerWithListFactory.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet019TreeViewerWithListFactory.java
@@ -19,7 +19,6 @@ import java.util.List;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.value.ComputedValue;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -239,16 +238,15 @@ public class Snippet019TreeViewerWithListFactory {
 		IObservableValue treeViewerSelectionObserveSelection = ViewersObservables
 				.observeSingleSelection(beanViewer);
 		IObservableValue textTextObserveWidget = WidgetProperties.text(SWT.Modify).observe(beanText);
-		IObservableValue treeViewerValueObserveDetailValue = BeansObservables
-				.observeDetailValue(treeViewerSelectionObserveSelection,
-						"text", String.class);
-		//
-		//
+		IObservableValue treeViewerValueObserveDetailValue = BeanProperties.value(
+				(Class) treeViewerSelectionObserveSelection.getValueType(), "text", String.class).observeDetail(
+				treeViewerSelectionObserveSelection);
+
 		DataBindingContext bindingContext = new DataBindingContext();
-		//
+
 		bindingContext.bindValue(textTextObserveWidget,
 				treeViewerValueObserveDetailValue);
-		//
+
 		return bindingContext;
 	}
 
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet020TreeViewerWithSetFactory.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet020TreeViewerWithSetFactory.java
index e048d1fe30f..cf9e4ed90a7 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet020TreeViewerWithSetFactory.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet020TreeViewerWithSetFactory.java
@@ -19,7 +19,6 @@ import java.util.Set;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.value.ComputedValue;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -239,16 +238,15 @@ public class Snippet020TreeViewerWithSetFactory {
 		IObservableValue treeViewerSelectionObserveSelection = ViewersObservables
 				.observeSingleSelection(beanViewer);
 		IObservableValue textTextObserveWidget = WidgetProperties.text(SWT.Modify).observe(beanText);
-		IObservableValue treeViewerValueObserveDetailValue = BeansObservables
-				.observeDetailValue(treeViewerSelectionObserveSelection,
-						"text", String.class);
-		//
-		//
+		IObservableValue treeViewerValueObserveDetailValue = BeanProperties.value(
+				(Class) treeViewerSelectionObserveSelection.getValueType(), "text", String.class)
+				.observeDetail(treeViewerSelectionObserveSelection);
+
 		DataBindingContext bindingContext = new DataBindingContext();
-		//
+
 		bindingContext.bindValue(textTextObserveWidget,
 				treeViewerValueObserveDetailValue);
-		//
+
 		return bindingContext;
 	}
 
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet027ExternalValidator.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet027ExternalValidator.java
index 1e8012f6685..16d82215125 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet027ExternalValidator.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet027ExternalValidator.java
@@ -17,7 +17,7 @@ import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.BeanProperties;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.validation.MultiValidator;
@@ -193,18 +193,18 @@ public class Snippet027ExternalValidator extends WizardPage {
 	private void bindUI() {
 		DataBindingContext dbc = new DataBindingContext();
 
-		final IObservableValue name = BeansObservables.observeValue(contact,
-				"name");
+		final IObservableValue name = BeanProperties.value(contact.getClass(), "name").observe(contact);
+
 		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(nameValue), name,
 				null, null);
 
-		final IObservableValue email = BeansObservables.observeValue(contact,
-				"email");
+		final IObservableValue email = BeanProperties.value(contact.getClass(), "email").observe(contact);
+
 		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(emailValue),
 				email, null, null);
 
-		final IObservableValue phone = BeansObservables.observeValue(contact,
-				"phoneNumber");
+		final IObservableValue phone = BeanProperties.value(contact.getClass(), "phoneNumber").observe(contact);
+
 		dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(phoneNumberValue),
 				phone, null, null);
 
diff --git a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet032TableViewerColumnEditing.java b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet032TableViewerColumnEditing.java
index aca78636683..a399ff61d51 100644
--- a/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet032TableViewerColumnEditing.java
+++ b/examples/org.eclipse.jface.examples.databinding/src/org/eclipse/jface/examples/databinding/snippets/Snippet032TableViewerColumnEditing.java
@@ -22,7 +22,6 @@ import java.util.List;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.beans.IBeanValueProperty;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.core.databinding.observable.list.WritableList;
@@ -246,12 +245,14 @@ public class Snippet032TableViewerColumnEditing {
 			// current selection
 			IObservableValue selection = ViewersObservables
 					.observeSingleSelection(peopleViewer);
-			bindingContext.bindValue(WidgetProperties.text().observe(selectedCommitterName),
-					BeansObservables
-					.observeDetailValue(selection, "name", String.class));
-			bindingContext.bindValue(WidgetProperties.text().observe(selectedCommitterFirstName),
-					BeansObservables
-					.observeDetailValue(selection, "firstName", String.class));
+			bindingContext.bindValue(
+					WidgetProperties.text().observe(selectedCommitterName),
+					BeanProperties.value((Class) selection.getValueType(), "name", String.class)
+					.observeDetail(selection));
+			bindingContext.bindValue(
+					WidgetProperties.text().observe(selectedCommitterFirstName),
+					BeanProperties.value((Class) selection.getValueType(), "firstName", String.class)
+					.observeDetail(selection));
 		}
 	}
 }