Bug 546881 - Generify some databinding testsI20200925-1800

Add type arguments to code that uses databinding classes in the unit
tests. Type parameters where added to databinding classes in earlier
changes and this resulted in a lot of raw-type warnings in the tests.

Change-Id: Idff21bef7ed58da1418a0fc965354edf3ccca3b6

33 files changed, 365 insertions, 365 deletions

diff --git a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java
index ced8ada0c32..7b5d67e1d51 100644
--- a/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java
+++ b/tests/org.eclipse.jface.tests.databinding.conformance/src/org/eclipse/jface/databinding/conformance/util/MapChangeEventTracker.java
@@ -24,10 +24,10 @@ import org.eclipse.core.databinding.observable.map.MapChangeEvent;
 /**
  * Listener for tracking the firing of ChangeEvents.
  */
-public class MapChangeEventTracker implements IMapChangeListener {
+public class MapChangeEventTracker<K, V> implements IMapChangeListener<K, V> {
 	public int count;
 
-	public MapChangeEvent event;
+	public MapChangeEvent<? extends K, ? extends V> event;
 
 	public List<IObservablesListener> queue;
 
@@ -40,7 +40,7 @@ public class MapChangeEventTracker implements IMapChangeListener {
 	}
 
 	@Override
-	public void handleMapChange(MapChangeEvent event) {
+	public void handleMapChange(MapChangeEvent<? extends K, ? extends V> event) {
 		count++;
 		this.event = event;
 
@@ -55,8 +55,8 @@ public class MapChangeEventTracker implements IMapChangeListener {
 	 * @param observable
 	 * @return tracker
 	 */
-	public static MapChangeEventTracker observe(IObservableMap observable) {
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+	public static <K, V> MapChangeEventTracker<K, V> observe(IObservableMap<K, V> observable) {
+		MapChangeEventTracker<K, V> tracker = new MapChangeEventTracker<>();
 		observable.addMapChangeListener(tracker);
 		return tracker;
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/DiffsTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/DiffsTest.java
index e1c0cb43b55..62c494be254 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/DiffsTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/DiffsTest.java
@@ -34,14 +34,14 @@ public class DiffsTest {
 	 */
 	@Test
 	public void test_SetDiff() {
-		SetDiff diff = new SetDiff() {
+		SetDiff<?> diff = new SetDiff<Object>() {
 			@Override
-			public Set<?> getAdditions() {
+			public Set<Object> getAdditions() {
 				return null;
 			}
 
 			@Override
-			public Set<?> getRemovals() {
+			public Set<Object> getRemovals() {
 				return null;
 			}
 		};
@@ -61,7 +61,7 @@ public class DiffsTest {
 	 */
 	@Test
 	public void test_ValueDiff() {
-		ValueDiff diff = new ValueDiff() {
+		ValueDiff<?> diff = new ValueDiff<Object>() {
 			@Override
 			public Object getNewValue() {
 				return null;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/Diffs_ListDiffTests.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/Diffs_ListDiffTests.java
index 9ecd85a94ee..cb409d35c6c 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/Diffs_ListDiffTests.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/Diffs_ListDiffTests.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 public class Diffs_ListDiffTests {
 	@Test
 	public void testListDiffEntryToStringDoesNotThrowNPEForNullListDiffEntry() {
-		ListDiffEntry entry = new ListDiffEntry() {
+		ListDiffEntry<?> entry = new ListDiffEntry<Object>() {
 			@Override
 			public Object getElement() {
 				return null;
@@ -62,9 +62,9 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testListDiffToStringDoesNotThrowNPEForNullListDiff() {
-		ListDiff diff = new ListDiff() {
+		ListDiff<?> diff = new ListDiff<Object>() {
 			@Override
-			public ListDiffEntry[] getDifferences() {
+			public ListDiffEntry<Object>[] getDifferences() {
 				return null;
 			}
 		};
@@ -79,9 +79,10 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testListDiffToStringDoesNotThrowNPEForNullListDiffEntry() {
-		ListDiff diff = new ListDiff() {
+		ListDiff<?> diff = new ListDiff<Object>() {
+			@SuppressWarnings("unchecked")
 			@Override
-			public ListDiffEntry[] getDifferences() {
+			public ListDiffEntry<Object>[] getDifferences() {
 				return new ListDiffEntry[1];
 			}
 		};
@@ -96,11 +97,11 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario1() throws Exception {
-		ListDiff diff = diff(null, null);
+		ListDiff<?> diff = diff(null, null);
 		assertEquals(0, diff.getDifferences().length);
 	}
 
-	private ListDiff diff(String[] oldArray, String[] newArray) {
+	private ListDiff<?> diff(String[] oldArray, String[] newArray) {
 		List<String> a = Arrays.asList((oldArray != null) ? oldArray : new String[] {});
 		List<String> b = Arrays.asList((newArray != null) ? newArray : new String[] {});
 
@@ -109,27 +110,27 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario2() throws Exception {
-		ListDiff diff = diff(new String[] { "a" }, null);
+		ListDiff<?> diff = diff(new String[] { "a" }, null);
 		assertEquals(1, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], false, 0, "a");
 	}
 
 	@Test
 	public void testDiffScenario3() throws Exception {
-		ListDiff diff = diff(null, new String[] { "a" });
+		ListDiff<?> diff = diff(null, new String[] { "a" });
 		assertEquals(1, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], true, 0, "a");
 	}
 
 	@Test
 	public void testDiffScenario4() throws Exception {
-		ListDiff diff = diff(new String[] { "a" }, new String[] { "a" });
+		ListDiff<?> diff = diff(new String[] { "a" }, new String[] { "a" });
 		assertEquals(0, diff.getDifferences().length);
 	}
 
 	@Test
 	public void testDiffScenario5() throws Exception {
-		ListDiff diff = diff(new String[] { "a" }, new String[] { "b" });
+		ListDiff<?> diff = diff(new String[] { "a" }, new String[] { "b" });
 		assertEquals(2, diff.getDifferences().length);
 
 		assertEntry(diff.getDifferences()[0], true, 0, "b");
@@ -138,7 +139,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario6() throws Exception {
-		ListDiff diff = diff(new String[] { "a" }, new String[] { "a", "b" });
+		ListDiff<?> diff = diff(new String[] { "a" }, new String[] { "a", "b" });
 
 		assertEquals(1, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], true, 1, "b");
@@ -146,7 +147,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario7() throws Exception {
-		ListDiff diff = diff(new String[] { "a" }, new String[] { "b", "a" });
+		ListDiff<?> diff = diff(new String[] { "a" }, new String[] { "b", "a" });
 
 		assertEquals(1, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], true, 0, "b");
@@ -154,7 +155,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario8() throws Exception {
-		ListDiff diff = diff(new String[] { "a" }, new String[] { "b", "b" });
+		ListDiff<?> diff = diff(new String[] { "a" }, new String[] { "b", "b" });
 
 		assertEquals(3, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], true, 0, "b");
@@ -164,7 +165,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario9() throws Exception {
-		ListDiff diff = diff(new String[] { "a" }, new String[] { "a", "b", "c" });
+		ListDiff<?> diff = diff(new String[] { "a" }, new String[] { "a", "b", "c" });
 
 		assertEquals(2, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], true, 1, "b");
@@ -173,7 +174,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario10() throws Exception {
-		ListDiff diff = diff(new String[] { "b" }, new String[] { "a", "b", "c" });
+		ListDiff<?> diff = diff(new String[] { "b" }, new String[] { "a", "b", "c" });
 
 		assertEquals(2, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], true, 0, "a");
@@ -182,7 +183,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario11() throws Exception {
-		ListDiff diff = diff(new String[] { "c" }, new String[] { "a", "b", "c" });
+		ListDiff<?> diff = diff(new String[] { "c" }, new String[] { "a", "b", "c" });
 
 		assertEquals(2, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], true, 0, "a");
@@ -191,14 +192,14 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenario12() throws Exception {
-		ListDiff diff = diff(new String[] { "a", "b", "c" }, new String[] { "a", "b", "c" });
+		ListDiff<?> diff = diff(new String[] { "a", "b", "c" }, new String[] { "a", "b", "c" });
 
 		assertEquals(0, diff.getDifferences().length);
 	}
 
 	@Test
 	public void testDiffScenario13() throws Exception {
-		ListDiff diff = diff(new String[] { "a", "b", "c" }, new String[] { "b", "c" });
+		ListDiff<?> diff = diff(new String[] { "a", "b", "c" }, new String[] { "b", "c" });
 
 		assertEquals(1, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], false, 0, "a");
@@ -206,7 +207,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenarios14() throws Exception {
-		ListDiff diff = diff(new String[] { "a", "b", "c" }, new String[] { "a", "c" });
+		ListDiff<?> diff = diff(new String[] { "a", "b", "c" }, new String[] { "a", "c" });
 
 		assertEquals(1, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], false, 1, "b");
@@ -214,7 +215,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenarios15() throws Exception {
-		ListDiff diff = diff(new String[] { "a", "b", "c" }, new String[] { "a", "b" });
+		ListDiff<?> diff = diff(new String[] { "a", "b", "c" }, new String[] { "a", "b" });
 
 		assertEquals(1, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], false, 2, "c");
@@ -222,7 +223,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenarios16() throws Exception {
-		ListDiff diff = diff(new String[] { "a", "b", "c" }, new String[] { "c", "b", "a" });
+		ListDiff<?> diff = diff(new String[] { "a", "b", "c" }, new String[] { "c", "b", "a" });
 
 		assertEquals(4, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], false, 2, "c");
@@ -233,7 +234,7 @@ public class Diffs_ListDiffTests {
 
 	@Test
 	public void testDiffScenarios17() throws Exception {
-		ListDiff diff = diff(new String[] { "a", "b", "c" }, new String[] { "c", "b" });
+		ListDiff<?> diff = diff(new String[] { "a", "b", "c" }, new String[] { "c", "b" });
 
 		assertEquals(3, diff.getDifferences().length);
 		assertEntry(diff.getDifferences()[0], false, 0, "a");
@@ -241,7 +242,7 @@ public class Diffs_ListDiffTests {
 		assertEntry(diff.getDifferences()[2], true, 0, "c");
 	}
 
-	private static void assertEntry(ListDiffEntry entry, boolean addition, int position, String element) {
+	private static void assertEntry(ListDiffEntry<?> entry, boolean addition, int position, String element) {
 		assertEquals("addition", addition, entry.isAddition());
 		assertEquals("position", position, entry.getPosition());
 		assertEquals("element", element, entry.getElement());
@@ -287,10 +288,10 @@ public class Diffs_ListDiffTests {
 	}
 
 	private static void checkComputedListDiff(List<Object> oldList, List<Object> newList) {
-		ListDiff diff = Diffs.computeListDiff(oldList, newList);
+		ListDiff<?> diff = Diffs.computeListDiff(oldList, newList);
 
 		final List<Object> list = new ArrayList<>(oldList);
-		diff.accept(new ListDiffVisitor() {
+		diff.accept(new ListDiffVisitor<Object>() {
 			@Override
 			public void handleAdd(int index, Object element) {
 				list.add(index, element);
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservableTrackerTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservableTrackerTest.java
index 9998bf63e0f..43301f49325 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservableTrackerTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservableTrackerTest.java
@@ -120,7 +120,7 @@ public class ObservableTrackerTest extends AbstractDefaultRealmTestCase {
 	public void testSetIgnore_Nested_RunAndCollect() throws Exception {
 		final List<ObservableStub> list = new ArrayList<>();
 
-		Set collected = new IdentitySet(Arrays.asList(ObservableTracker.runAndCollect(() -> {
+		Set<IObservable> collected = new IdentitySet<>(Arrays.asList(ObservableTracker.runAndCollect(() -> {
 			list.add(new ObservableStub()); // list[0] collected
 			ObservableTracker.setIgnore(true);
 			list.add(new ObservableStub()); // list[1] ignored
@@ -134,7 +134,7 @@ public class ObservableTrackerTest extends AbstractDefaultRealmTestCase {
 
 		// Have to compare result in identity set because ObservableTracker may
 		// not return them in the same order they were collected
-		Set<ObservableStub> expected = new IdentitySet();
+		Set<IObservable> expected = new IdentitySet<>();
 		expected.add(list.get(0));
 		expected.add(list.get(4));
 		assertEquals(expected, collected);
@@ -145,7 +145,7 @@ public class ObservableTrackerTest extends AbstractDefaultRealmTestCase {
 		final IObservable[] observables = { new ObservableStub(), new ObservableStub(), new ObservableStub(),
 				new ObservableStub(), new ObservableStub() };
 
-		Set result = new IdentitySet(Arrays.asList(ObservableTracker.runAndMonitor(() -> {
+		Set<IObservable> result = new IdentitySet<>(Arrays.asList(ObservableTracker.runAndMonitor(() -> {
 			ObservableTracker.getterCalled(observables[0]); // monitored
 			ObservableTracker.setIgnore(true);
 			ObservableTracker.getterCalled(observables[1]); // ignored
@@ -159,7 +159,7 @@ public class ObservableTrackerTest extends AbstractDefaultRealmTestCase {
 
 		// Have to compare result in identity set because ObservableTracker may
 		// not return them in the same order they were monitored
-		Set<IObservable> expected = new IdentitySet();
+		Set<IObservable> expected = new IdentitySet<>();
 		expected.add(observables[0]);
 		expected.add(observables[4]);
 		assertEquals(expected, result);
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservablesTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservablesTest.java
index cb4d805269f..f52fb8a953f 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservablesTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/ObservablesTest.java
@@ -39,12 +39,12 @@ public class ObservablesTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testUnmodifiableObservableList() throws Exception {
-		IObservableList unmodifiable = Observables.unmodifiableObservableList(new ObservableListStub(
+		IObservableList<?> unmodifiable = Observables.unmodifiableObservableList(new ObservableListStub(
 				new ArrayList<>(0), String.class));
 		assertTrue(unmodifiable instanceof UnmodifiableObservableList);
 	}
 
-	private static class ObservableListStub extends ObservableList {
+	private static class ObservableListStub extends ObservableList<Object> {
 		/**
 		 * @param wrappedList
 		 * @param elementType
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ComputedListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ComputedListTest.java
index fa70a67aa9c..b9ddd9c6b11 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ComputedListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ComputedListTest.java
@@ -39,13 +39,13 @@ import org.junit.Test;
 import junit.framework.TestSuite;
 
 public class ComputedListTest extends AbstractDefaultRealmTestCase {
-	ComputedListStub list;
+	ComputedListStub<Object> list;
 
 	@Override
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		list = new ComputedListStub();
+		list = new ComputedListStub<>();
 		list.size(); // Force list to compute
 	}
 
@@ -65,7 +65,7 @@ public class ComputedListTest extends AbstractDefaultRealmTestCase {
 
 		list.dependency.fireChange();
 
-		List expectedList = new ArrayList();
+		List<Object> expectedList = new ArrayList<>();
 		expectedList.add(element);
 		assertEquals(expectedList, list);
 	}
@@ -79,7 +79,7 @@ public class ComputedListTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testDependency_ListChangeEventFiresOnlyWhenNotDirty() {
-		ListChangeEventTracker tracker = ListChangeEventTracker.observe(list);
+		ListChangeEventTracker<Object> tracker = ListChangeEventTracker.observe(list);
 
 		list.dependency.fireChange();
 		assertEquals(
@@ -98,8 +98,8 @@ public class ComputedListTest extends AbstractDefaultRealmTestCase {
 				2, tracker.count);
 	}
 
-	static class ComputedListStub extends ComputedList {
-		List nextComputation = new ArrayList();
+	static class ComputedListStub<E> extends ComputedList<E> {
+		List<E> nextComputation = new ArrayList<E>();
 		ObservableStub dependency;
 
 		ComputedListStub() {
@@ -112,9 +112,9 @@ public class ComputedListTest extends AbstractDefaultRealmTestCase {
 		}
 
 		@Override
-		protected List calculate() {
+		protected List<E> calculate() {
 			ObservableTracker.getterCalled(dependency);
-			return new ArrayList(nextComputation);
+			return new ArrayList<E>(nextComputation);
 		}
 	}
 
@@ -146,11 +146,11 @@ public class ComputedListTest extends AbstractDefaultRealmTestCase {
 		suite.addTest(ObservableListContractTest.suite(new Delegate()));
 	}
 
-	static class Delegate extends AbstractObservableCollectionContractDelegate {
+	static class Delegate extends AbstractObservableCollectionContractDelegate<Object> {
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<Object> createObservableCollection(Realm realm,
 				int elementCount) {
-			final ComputedListStub list = new ComputedListStub(realm);
+			final ComputedListStub<Object> list = new ComputedListStub<>(realm);
 			for (int i = 0; i < elementCount; i++)
 				list.nextComputation.add(createElement(list));
 			list.size(); // force list to compute
@@ -159,17 +159,19 @@ public class ComputedListTest extends AbstractDefaultRealmTestCase {
 
 		@Override
 		public void change(IObservable observable) {
-			ComputedListStub list = (ComputedListStub) observable;
+			@SuppressWarnings("unchecked")
+			ComputedListStub<Object> list = (ComputedListStub<Object>) observable;
 			list.nextComputation.add(new Object());
 			list.dependency.fireChange();
 		}
 
+		@SuppressWarnings("unchecked")
 		@Override
 		public void setStale(IObservable observable, boolean stale) {
 			if (stale)
-				((ComputedListStub) observable).dependency.fireStale();
+				((ComputedListStub<Object>) observable).dependency.fireStale();
 			else {
-				ComputedListStub computedList = (ComputedListStub) observable;
+				ComputedListStub<Object> computedList = (ComputedListStub<Object>) observable;
 				computedList.dependency.stale = false;
 				computedList.dependency.fireChange();
 			}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/DecoratingObservableListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/DecoratingObservableListTest.java
index 59bbde50647..7870e174934 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/DecoratingObservableListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/DecoratingObservableListTest.java
@@ -39,40 +39,39 @@ public class DecoratingObservableListTest {
 		suite.addTest(MutableObservableListContractTest.suite(new Delegate()));
 	}
 
-	static class Delegate extends AbstractObservableCollectionContractDelegate {
+	static class Delegate extends AbstractObservableCollectionContractDelegate<Object> {
 		private Object elementType = Object.class;
 
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<Object> createObservableCollection(Realm realm,
 				int elementCount) {
-			IObservableList wrappedList = new WritableList(realm,
-					new ArrayList(), elementType);
+			IObservableList<Object> wrappedList = new WritableList<>(realm, new ArrayList<>(), elementType);
 			for (int i = 0; i < elementCount; i++)
 				wrappedList.add(new Object());
-			return new DecoratingObservableListStub(wrappedList);
+			return new DecoratingObservableListStub<>(wrappedList);
 		}
 
 		@Override
-		public Object createElement(IObservableCollection collection) {
+		public Object createElement(IObservableCollection<Object> collection) {
 			return new Object();
 		}
 
 		@Override
-		public Object getElementType(IObservableCollection collection) {
+		public Object getElementType(IObservableCollection<Object> collection) {
 			return elementType;
 		}
 
+		@SuppressWarnings("unchecked")
 		@Override
 		public void change(IObservable observable) {
-			((DecoratingObservableListStub) observable).decorated
-					.add(new Object());
+			((DecoratingObservableListStub<Object>) observable).decorated.add(new Object());
 		}
 	}
 
-	static class DecoratingObservableListStub extends DecoratingObservableList {
-		IObservableList decorated;
+	static class DecoratingObservableListStub<E> extends DecoratingObservableList<E> {
+		IObservableList<E> decorated;
 
-		DecoratingObservableListStub(IObservableList decorated) {
+		DecoratingObservableListStub(IObservableList<E> decorated) {
 			super(decorated, true);
 			this.decorated = decorated;
 		}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java
index 853f185ca2f..c5ed753615b 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffTest.java
@@ -93,7 +93,7 @@ public class ListDiffTest {
 
 	@Test
 	public void testAccept_AllPatterns() {
-		createListDiff(new ListDiffEntry[] {
+		createListDiff(
 		// Replace (remove before add)
 				remove(0, "element0"), add(0, "element1"),
 				// Replace (add before remove)
@@ -114,7 +114,7 @@ public class ListDiffTest {
 				remove(11, "element8"), add(11, "element8"),
 				// Add then remove in place (special case) -- treat as separate
 				// add and remove
-				add(12, "element9"), remove(12, "element9") }).accept(visitor);
+				add(12, "element9"), remove(12, "element9")).accept(visitor);
 		assertEquals(
 				"replace(0,element0,element1), replace(0,element2,element3), "
 						+ "remove(1,element4), " + "add(2,element5), "
@@ -135,27 +135,20 @@ public class ListDiffTest {
 		assertEquals("move(0,1,element)", visitor.log);
 	}
 
-	private ListDiffEntry add(int index, Object element) {
+	private <E> ListDiffEntry<E> add(int index, E element) {
 		return Diffs.createListDiffEntry(index, true, element);
 	}
 
-	private ListDiffEntry remove(int index, Object element) {
+	private <E> ListDiffEntry<E> remove(int index, E element) {
 		return Diffs.createListDiffEntry(index, false, element);
 	}
 
-	private ListDiff createListDiff(ListDiffEntry difference) {
-		return createListDiff(new ListDiffEntry[] { difference });
-	}
-
-	private ListDiff createListDiff(ListDiffEntry first, ListDiffEntry second) {
-		return createListDiff(new ListDiffEntry[] { first, second });
-	}
-
-	private ListDiff createListDiff(ListDiffEntry[] differences) {
+	@SafeVarargs
+	private final <E> ListDiff<E> createListDiff(ListDiffEntry<E>... differences) {
 		return Diffs.createListDiff(differences);
 	}
 
-	class ListDiffVisitorStub extends ListDiffVisitor {
+	class ListDiffVisitorStub extends ListDiffVisitor<Object> {
 		String log = "";
 
 		@Override
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffVisitorTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffVisitorTest.java
index cea1acd9128..9dde81af270 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffVisitorTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ListDiffVisitorTest.java
@@ -49,7 +49,7 @@ public class ListDiffVisitorTest {
 				"remove(2,oldElement), add(2,newElement)", visitor.log);
 	}
 
-	static class ListDiffVisitorStub extends ListDiffVisitor {
+	static class ListDiffVisitorStub extends ListDiffVisitor<Object> {
 		String log = "";
 
 		private void log(String message) {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/MultiListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/MultiListTest.java
index eec38999051..270407a05bb 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/MultiListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/MultiListTest.java
@@ -44,8 +44,8 @@ public class MultiListTest extends AbstractDefaultRealmTestCase {
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		WritableList[] lists = new WritableList[] { new WritableList(),
-				new WritableList() };
+		@SuppressWarnings("unchecked")
+		WritableList<Object>[] lists = new WritableList[] { new WritableList<Object>(), new WritableList<Object>() };
 		multiList = new MultiListStub(Realm.getDefault(), lists);
 	}
 
@@ -60,7 +60,7 @@ public class MultiListTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testDependency_FiresListChange() {
-		List expectedList = new ArrayList();
+		List<Object> expectedList = new ArrayList<>();
 		assertEquals(expectedList, multiList);
 
 		Object element = new Object();
@@ -78,9 +78,8 @@ public class MultiListTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testModifySubList_FiresListChangeEventFromMultiList() {
-		ListChangeEventTracker tracker = ListChangeEventTracker
-				.observe(multiList);
-		ListDiffEntry[] differences;
+		ListChangeEventTracker<Object> tracker = ListChangeEventTracker.observe(multiList);
+		ListDiffEntry<?>[] differences;
 
 		//
 
@@ -123,17 +122,17 @@ public class MultiListTest extends AbstractDefaultRealmTestCase {
 	 * @param addition
 	 * @param element
 	 */
-	private void assertEntry(ListDiffEntry entry, int position,
+	private void assertEntry(ListDiffEntry<?> entry, int position,
 			boolean addition, Object element) {
 		assertEquals(element, entry.getElement());
 		assertEquals(addition, entry.isAddition());
 		assertEquals(position, entry.getPosition());
 	}
 
-	private static class MultiListStub extends MultiList {
-		WritableList[] subLists;
+	private static class MultiListStub extends MultiList<Object> {
+		WritableList<Object>[] subLists;
 
-		MultiListStub(Realm realm, WritableList[] lists) {
+		MultiListStub(Realm realm, WritableList<Object>[] lists) {
 			super(realm, lists);
 			this.subLists = lists;
 		}
@@ -143,12 +142,13 @@ public class MultiListTest extends AbstractDefaultRealmTestCase {
 		suite.addTest(ObservableListContractTest.suite(new Delegate()));
 	}
 
-	static class Delegate extends AbstractObservableCollectionContractDelegate {
+	static class Delegate extends AbstractObservableCollectionContractDelegate<Object> {
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<Object> createObservableCollection(Realm realm,
 				int elementCount) {
-			WritableList[] subLists = new WritableList[] {
-					new WritableList(realm), new WritableList(realm) };
+			@SuppressWarnings("unchecked")
+			WritableList<Object>[] subLists = new WritableList[] { new WritableList<Object>(realm),
+					new WritableList<Object>(realm) };
 			final MultiListStub list = new MultiListStub(realm, subLists);
 			for (int i = 0; i < elementCount; i++)
 				list.subLists[0].add(createElement(list));
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ObservableListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ObservableListTest.java
index 1718e22be42..77a2ee0911b 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ObservableListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/ObservableListTest.java
@@ -43,13 +43,13 @@ import junit.framework.TestSuite;
  * @since 3.2
  */
 public class ObservableListTest {
-	private ObservableListStub list;
+	private ObservableListStub<Object> list;
 
 	@Before
 	public void setUp() throws Exception {
 		RealmTester.setDefault(new CurrentRealm(true));
 
-		list = new ObservableListStub(new ArrayList(0), Object.class);
+		list = new ObservableListStub<>(new ArrayList<>(0), Object.class);
 	}
 
 	@After
@@ -69,24 +69,24 @@ public class ObservableListTest {
 
 	@Test
 	public void testMove_FiresListChanges() throws Exception {
-		list = new MutableObservableListStub();
+		list = new MutableObservableListStub<>();
 		final Object element = new Object();
 		list.add(0, element);
 		list.add(1, new Object());
 
-		final List diffEntries = new ArrayList();
+		final List<ListDiffEntry<?>> diffEntries = new ArrayList<>();
 		list.addListChangeListener(event -> diffEntries.addAll(Arrays.asList(event.diff.getDifferences())));
 
 		list.move(0, 1);
 
 		assertEquals(2, diffEntries.size());
 
-		ListDiffEntry entry = (ListDiffEntry) diffEntries.get(0);
+		ListDiffEntry<?> entry = diffEntries.get(0);
 		assertEquals(element, entry.getElement());
 		assertEquals(false, entry.isAddition());
 		assertEquals(0, entry.getPosition());
 
-		entry = (ListDiffEntry) diffEntries.get(1);
+		entry = diffEntries.get(1);
 		assertEquals(element, entry.getElement());
 		assertEquals(true, entry.isAddition());
 		assertEquals(1, entry.getPosition());
@@ -94,7 +94,7 @@ public class ObservableListTest {
 
 	@Test
 	public void testMove_MovesElement() throws Exception {
-		list = new MutableObservableListStub();
+		list = new MutableObservableListStub<>();
 		final Object element0 = new Object();
 		final Object element1 = new Object();
 		list.add(0, element0);
@@ -110,62 +110,64 @@ public class ObservableListTest {
 		suite.addTest(ObservableListContractTest.suite(new Delegate()));
 	}
 
-	/* package */ static class Delegate extends AbstractObservableCollectionContractDelegate {
+	/* package */ static class Delegate extends AbstractObservableCollectionContractDelegate<String> {
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm, final int elementCount) {
-			List wrappedList = new ArrayList();
+		public IObservableCollection<String> createObservableCollection(Realm realm, final int elementCount) {
+			List<String> wrappedList = new ArrayList<>();
 			for (int i = 0; i < elementCount; i++) {
 				wrappedList.add(String.valueOf(i));
 			}
 
-			return new MutableObservableListStub(realm, wrappedList, String.class);
+			return new MutableObservableListStub<>(realm, wrappedList, String.class);
 		}
 
 		@Override
 		public void change(IObservable observable) {
-			ObservableListStub list = (ObservableListStub) observable;
-			Object element = "element";
+			@SuppressWarnings("unchecked")
+			ObservableListStub<String> list = (ObservableListStub<String>) observable;
+			String element = "element";
 			list.wrappedList.add(element);
 			list.fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(list.size(), true, element)));
 		}
 
 		@Override
-		public Object getElementType(IObservableCollection collection) {
+		public Object getElementType(IObservableCollection<String> collection) {
 			return String.class;
 		}
 	}
 
-	/* package */static class ObservableListStub extends ObservableList {
-		List wrappedList;
-		ObservableListStub(Realm realm, List wrappedList, Object elementType) {
+	/* package */static class ObservableListStub<E> extends ObservableList<E> {
+		@SuppressWarnings("hiding")
+		List<E> wrappedList;
+
+		ObservableListStub(Realm realm, List<E> wrappedList, Object elementType) {
 			super(realm, wrappedList, elementType);
 			this.wrappedList = wrappedList;
 		}
 
-		ObservableListStub(List wrappedList, Object elementType) {
+		ObservableListStub(List<E> wrappedList, Object elementType) {
 			super(wrappedList, elementType);
 			this.wrappedList = wrappedList;
 		}
 
 		@Override
-		protected void fireListChange(ListDiff diff) {
+		protected void fireListChange(ListDiff<E> diff) {
 			super.fireListChange(diff);
 		}
 	}
 
-	/* package */static class MutableObservableListStub extends
-			ObservableListStub {
+	/* package */static class MutableObservableListStub<E> extends ObservableListStub<E> {
 		MutableObservableListStub() {
-			this(Realm.getDefault(), new ArrayList(), null);
+			this(Realm.getDefault(), new ArrayList<>(), null);
 		}
 
-		MutableObservableListStub(Realm realm, List wrappedList,
+		MutableObservableListStub(Realm realm, List<E> wrappedList,
 				Object elementType) {
 			super(realm, wrappedList, elementType);
 		}
 
 		@Override
-		public void add(int index, Object element) {
+		public void add(int index, E element) {
 			checkRealm();
 			wrappedList.add(index, element);
 			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
@@ -173,9 +175,9 @@ public class ObservableListTest {
 		}
 
 		@Override
-		public Object remove(int index) {
+		public E remove(int index) {
 			checkRealm();
-			Object element = wrappedList.remove(index);
+			E element = wrappedList.remove(index);
 			fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(
 					index, false, element)));
 			return element;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/WritableListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/WritableListTest.java
index 204c28080f4..b5d41c3456b 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/WritableListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/WritableListTest.java
@@ -60,7 +60,7 @@ public class WritableListTest {
 	@Test
 	public void testSetRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
+			WritableList<String> list = new WritableList<>();
 			list.add("");
 			list.set(0, "");
 		});
@@ -69,7 +69,7 @@ public class WritableListTest {
 	@Test
 	public void testAddRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
+			WritableList<String> list = new WritableList<>();
 			list.add("");
 		});
 	}
@@ -77,7 +77,7 @@ public class WritableListTest {
 	@Test
 	public void testAddByIndexRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
+			WritableList<String> list = new WritableList<>();
 			list.add(0, "");
 		});
 	}
@@ -85,23 +85,23 @@ public class WritableListTest {
 	@Test
 	public void testAddAllRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
-			list.addAll(Collections.EMPTY_LIST);
+			WritableList<String> list = new WritableList<>();
+			list.addAll(Collections.emptyList());
 		});
 	}
 
 	@Test
 	public void testAddAllByIndexRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
-			list.addAll(0, Collections.EMPTY_LIST);
+			WritableList<String> list = new WritableList<>();
+			list.addAll(0, Collections.emptyList());
 		});
 	}
 
 	@Test
 	public void testRemoveRealmChecks() throws Exception {
 		RealmTester.setDefault(new CurrentRealm(true));
-		final WritableList list = new WritableList();
+		final WritableList<String> list = new WritableList<>();
 		list.add("");
 		list.add("");
 
@@ -112,7 +112,7 @@ public class WritableListTest {
 	@Test
 	public void testRemoveByIndexRealmChecks() throws Exception {
 		RealmTester.setDefault(new CurrentRealm(true));
-		final WritableList list = new WritableList();
+		final WritableList<String> list = new WritableList<>();
 		list.add("");
 		list.add("");
 
@@ -124,23 +124,23 @@ public class WritableListTest {
 	@Test
 	public void testRemoveAllRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
-			list.removeAll(Collections.EMPTY_LIST);
+			WritableList<String> list = new WritableList<>();
+			list.removeAll(Collections.emptyList());
 		});
 	}
 
 	@Test
 	public void testRetainAllRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
-			list.retainAll(Collections.EMPTY_LIST);
+			WritableList<String> list = new WritableList<>();
+			list.retainAll(Collections.emptyList());
 		});
 	}
 
 	@Test
 	public void testClearRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableList list = new WritableList();
+			WritableList<String> list = new WritableList<>();
 			list.clear();
 		});
 	}
@@ -148,10 +148,10 @@ public class WritableListTest {
 	@Test
 	public void testNullElementType() throws Exception {
 		RealmTester.setDefault(DisplayRealm.getRealm(Display.getDefault()));
-		WritableList writableList = new WritableList();
+		WritableList<String> writableList = new WritableList<>();
 		assertNull(writableList.getElementType());
 
-		writableList = new WritableList(Realm.getDefault());
+		writableList = new WritableList<>(Realm.getDefault());
 		assertNull(writableList.getElementType());
 	}
 
@@ -160,7 +160,7 @@ public class WritableListTest {
 		RealmTester.setDefault(DisplayRealm.getRealm(Display.getDefault()));
 
 		Object elementType = String.class;
-		WritableList list = WritableList.withElementType(elementType);
+		WritableList<String> list = WritableList.withElementType(elementType);
 		assertNotNull(list);
 		assertEquals(Realm.getDefault(), list.getRealm());
 		assertEquals(elementType, list.getElementType());
@@ -169,8 +169,8 @@ public class WritableListTest {
 	@Test
 	public void testListConstructorsDoNotCopy_1() {
 		RealmTester.setDefault(new CurrentRealm(true));
-		List list = new ArrayList(Arrays.asList(new Object[] { "a", "b", "c" }));
-		WritableList wlist = new WritableList(list, Object.class);
+		List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+		WritableList<String> wlist = new WritableList<>(list, Object.class);
 		wlist.remove(1);
 		assertEquals(2, list.size());
 		list.add("d");
@@ -179,9 +179,8 @@ public class WritableListTest {
 
 	@Test
 	public void testListConstructorsDoNotCopy_2() {
-		List list = new ArrayList(Arrays.asList(new Object[] { "a", "b", "c" }));
-		WritableList wlist = new WritableList(new CurrentRealm(true), list,
-				Object.class);
+		List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+		WritableList<String> wlist = new WritableList<>(new CurrentRealm(true), list, Object.class);
 		wlist.remove(1);
 		assertEquals(2, list.size());
 		list.add("d");
@@ -191,8 +190,8 @@ public class WritableListTest {
 	@Test
 	public void testCollectionConstructorsCopy_1() {
 		RealmTester.setDefault(new CurrentRealm(true));
-		List list = new ArrayList(Arrays.asList(new Object[] { "a", "b", "c" }));
-		WritableList wlist = new WritableList((Collection) list, Object.class);
+		List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+		WritableList<String> wlist = new WritableList<>((Collection<String>) list, Object.class);
 		wlist.remove(1);
 		assertEquals(3, list.size());
 		list.add("d");
@@ -201,9 +200,9 @@ public class WritableListTest {
 
 	@Test
 	public void testCollectionConstructorsCopy_2() {
-		List list = new ArrayList(Arrays.asList(new Object[] { "a", "b", "c" }));
-		WritableList wlist = new WritableList(new CurrentRealm(true),
-				(Collection) list, Object.class);
+		List<String> list = new ArrayList<>(Arrays.asList("a", "b", "c"));
+		WritableList<String> wlist = new WritableList<String>(new CurrentRealm(true), (Collection<String>) list,
+				Object.class);
 		wlist.remove(1);
 		assertEquals(3, list.size());
 		list.add("d");
@@ -215,22 +214,21 @@ public class WritableListTest {
 	}
 
 	/* package */static class Delegate extends
-			AbstractObservableCollectionContractDelegate {
+			AbstractObservableCollectionContractDelegate<String> {
 		@Override
-		public Object createElement(IObservableCollection collection) {
+		public String createElement(IObservableCollection<String> collection) {
 			return String.valueOf(collection.size() + 1);
 		}
 
 		@Override
-		public Object getElementType(IObservableCollection collection) {
+		public Object getElementType(IObservableCollection<String> collection) {
 			return String.class;
 		}
 
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<String> createObservableCollection(Realm realm,
 				final int itemCount) {
-			WritableList observable = new WritableList(realm, new ArrayList(),
-					String.class);
+			WritableList<String> observable = new WritableList<>(realm, new ArrayList<>(), String.class);
 
 			for (int i = 0; i < itemCount; i++) {
 				observable.add(String.valueOf(i));
@@ -239,9 +237,10 @@ public class WritableListTest {
 			return observable;
 		}
 
+		@SuppressWarnings("unchecked")
 		@Override
 		public void change(IObservable observable) {
-			((WritableList) observable).add("");
+			((WritableList<String>) observable).add("");
 		}
 	}
 }
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java
index dca85d32eaf..667f51330fa 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java
@@ -29,12 +29,12 @@ import org.junit.Test;
  * @since 3.2
  */
 public class AbstractObservableMapTest {
-	private AbstractObservableMapStub map;
+	private AbstractObservableMapStub<?, ?> map;
 
 	@Before
 	public void setUp() throws Exception {
 		RealmTester.setDefault(new CurrentRealm(true));
-		map = new AbstractObservableMapStub();
+		map = new AbstractObservableMapStub<>();
 	}
 
 	@After
@@ -137,9 +137,9 @@ public class AbstractObservableMapTest {
 		map.hasListeners();
 	}
 
-	static class AbstractObservableMapStub extends AbstractObservableMap {
+	static class AbstractObservableMapStub<K, V> extends AbstractObservableMap<K, V> {
 		@Override
-		public Set entrySet() {
+		public Set<Entry<K, V>> entrySet() {
 			return null;
 		}
 
@@ -149,7 +149,7 @@ public class AbstractObservableMapTest {
 		}
 
 		@Override
-		protected void fireMapChange(MapDiff diff) {
+		protected void fireMapChange(MapDiff<K, V> diff) {
 			super.fireMapChange(diff);
 		}
 
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/BidiObservableMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/BidiObservableMapTest.java
index e8251dcc864..1aa2e49c2d3 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/BidiObservableMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/BidiObservableMapTest.java
@@ -37,8 +37,8 @@ import org.junit.Test;
  *
  */
 public class BidiObservableMapTest extends AbstractDefaultRealmTestCase {
-	private IObservableMap wrappedMap;
-	private BidiObservableMap bidiMap;
+	private IObservableMap<Object, Object> wrappedMap;
+	private BidiObservableMap<Object, Object> bidiMap;
 	private Object key1;
 	private Object key2;
 	private Object value1;
@@ -48,8 +48,8 @@ public class BidiObservableMapTest extends AbstractDefaultRealmTestCase {
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		wrappedMap = new WritableMap();
-		bidiMap = new BidiObservableMap(wrappedMap);
+		wrappedMap = new WritableMap<>();
+		bidiMap = new BidiObservableMap<>(wrappedMap);
 		key1 = new Object();
 		key2 = new Object();
 		value1 = new Object();
@@ -59,7 +59,7 @@ public class BidiObservableMapTest extends AbstractDefaultRealmTestCase {
 	@Test
 	public void testConstructor_NullArgument() {
 		try {
-			new BidirectionalMap(null);
+			new BidirectionalMap<>(null);
 			fail("Expected NullPointerException");
 		} catch (NullPointerException expected) {
 		}
@@ -128,7 +128,7 @@ public class BidiObservableMapTest extends AbstractDefaultRealmTestCase {
 			wrappedMap.put(key1, value1);
 			wrappedMap.put(key2, value1);
 
-			Set expected = new HashSet();
+			Set<Object> expected = new HashSet<>();
 			expected.add(key1);
 			expected.add(key2);
 			assertEquals(expected, bidiMap.getKeys(value1));
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/CompositeMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/CompositeMapTest.java
index 01edae39a50..6cbfc8f475b 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/CompositeMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/CompositeMapTest.java
@@ -21,11 +21,10 @@ import static org.junit.Assert.assertTrue;
 import java.lang.reflect.Method;
 import java.util.Collections;
 
-import org.eclipse.core.databinding.beans.BeansObservables;
+import org.eclipse.core.databinding.beans.typed.BeanProperties;
 import org.eclipse.core.databinding.observable.AbstractObservable;
 import org.eclipse.core.databinding.observable.map.CompositeMap;
 import org.eclipse.core.databinding.observable.map.IObservableMap;
-import org.eclipse.core.databinding.observable.set.IObservableSet;
 import org.eclipse.core.databinding.observable.set.WritableSet;
 import org.eclipse.jface.databinding.conformance.util.MapChangeEventTracker;
 import org.eclipse.jface.examples.databinding.model.SimpleCart;
@@ -40,9 +39,9 @@ import org.junit.Test;
  */
 public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 
-	private WritableSet persons;
-	private CompositeMap composedMap;
-	private IObservableMap first;
+	private WritableSet<SimplePerson> persons;
+	private CompositeMap<SimplePerson, SimpleCart, Integer> composedMap;
+	private IObservableMap<SimplePerson, SimpleCart> first;
 
 	boolean hasListeners(AbstractObservable o) {
 		try {
@@ -58,16 +57,15 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		persons = new WritableSet();
-		first = BeansObservables.observeMap(persons,
-				SimplePerson.class, "cart");
-		composedMap = new CompositeMap(first,
-				target -> BeansObservables.observeMap((IObservableSet) target, SimpleCart.class, "numItems"));
+		persons = new WritableSet<>();
+		first = BeanProperties.value(SimplePerson.class, "cart", SimpleCart.class).observeDetail(persons);
+		composedMap = new CompositeMap<>(first,
+				target -> BeanProperties.value(SimpleCart.class, "numItems", Integer.class).observeDetail(target));
 	}
 
 	@Test
 	public void testAddToFirstMap() {
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		composedMap.addMapChangeListener(tracker);
 		assertEquals(0, tracker.count);
 		SimplePerson newPerson = new SimplePerson("p1", "a1", "c1", "s1");
@@ -87,7 +85,7 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 		SimplePerson person1 = new SimplePerson("p1", "a1", "c1", "s1");
 		person1.getCart().setNumItems(42);
 		persons.add(person1);
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		composedMap.addMapChangeListener(tracker);
 		assertEquals(0, tracker.count);
 		SimplePerson person2 = new SimplePerson("p1", "a1", "c1", "s1");
@@ -105,7 +103,7 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testRemoveFromFirstMap() {
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		SimplePerson newPerson = new SimplePerson("p1", "a1", "c1", "s1");
 		newPerson.getCart().setNumItems(42);
 		persons.add(newPerson);
@@ -131,7 +129,7 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 		person2.setCart(person1.getCart());
 		persons.add(person2);
 		assertTrue("person2 should be added", composedMap.containsKey(person2));
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		composedMap.addMapChangeListener(tracker);
 		assertEquals(0, tracker.count);
 		persons.remove(person2);
@@ -150,7 +148,7 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 		SimplePerson person1 = new SimplePerson("p1", "a1", "c1", "s1");
 		person1.getCart().setNumItems(42);
 		persons.add(person1);
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		composedMap.addMapChangeListener(tracker);
 		assertEquals(0, tracker.count);
 		person1.setCart(new SimpleCart());
@@ -172,7 +170,7 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 		SimplePerson person1 = new SimplePerson("p1", "a1", "c1", "s1");
 		person1.getCart().setNumItems(42);
 		persons.add(person1);
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		composedMap.addMapChangeListener(tracker);
 		assertEquals(0, tracker.count);
 		person1.setCart(person0.getCart());
@@ -194,7 +192,7 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 		SimplePerson person1 = new SimplePerson("p1", "a1", "c1", "s1");
 		person1.setCart(person0.getCart());
 		persons.add(person1);
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		composedMap.addMapChangeListener(tracker);
 		assertEquals(0, tracker.count);
 		person1.setCart(new SimpleCart());
@@ -213,7 +211,7 @@ public class CompositeMapTest extends AbstractDefaultRealmTestCase {
 		SimplePerson person0 = new SimplePerson("p0", "a0", "c0", "s0");
 		person0.getCart().setNumItems(13);
 		persons.add(person0);
-		MapChangeEventTracker tracker = new MapChangeEventTracker();
+		MapChangeEventTracker<Object, Object> tracker = new MapChangeEventTracker<>();
 		composedMap.addMapChangeListener(tracker);
 		assertEquals(0, tracker.count);
 		person0.getCart().setNumItems(42);
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ComputedObservableMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ComputedObservableMapTest.java
index b106722a473..fa11e9e3365 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ComputedObservableMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ComputedObservableMapTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
  *
  */
 public class ComputedObservableMapTest extends AbstractDefaultRealmTestCase {
-	private IObservableSet keySet;
+	private IObservableSet<Bean> keySet;
 	private ComputedObservableMapStub map;
 	private String propertyName;
 	private Bean bean;
@@ -46,7 +46,7 @@ public class ComputedObservableMapTest extends AbstractDefaultRealmTestCase {
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		keySet = new WritableSet();
+		keySet = new WritableSet<>();
 		map = new ComputedObservableMapStub(keySet);
 		propertyName = "value";
 		bean = new Bean("a");
@@ -136,34 +136,34 @@ public class ComputedObservableMapTest extends AbstractDefaultRealmTestCase {
 		assertFalse(bean.hasListeners(propertyName));
 	}
 
-	static class ComputedObservableMapStub extends ComputedObservableMap {
-		private PropertyChangeListener listener = evt -> fireSingleChange(evt.getSource(), evt.getOldValue(),
-				evt.getNewValue());
+	static class ComputedObservableMapStub extends ComputedObservableMap<Bean, String> {
+		private PropertyChangeListener listener = evt -> fireSingleChange((Bean) evt.getSource(),
+				(String) evt.getOldValue(), (String) evt.getNewValue());
 
-		ComputedObservableMapStub(IObservableSet keySet) {
+		ComputedObservableMapStub(IObservableSet<Bean> keySet) {
 			super(keySet);
 		}
 
 		@Override
-		protected Object doGet(Object key) {
-			return ((Bean) key).getValue();
+		protected String doGet(Bean key) {
+			return key.getValue();
 		}
 
 		@Override
-		protected Object doPut(Object key, Object value) {
-			Object result = doGet(key);
-			((Bean) key).setValue((String) value);
+		protected String doPut(Bean key, String value) {
+			String result = doGet(key);
+			key.setValue(value);
 			return result;
 		}
 
 		@Override
-		protected void hookListener(Object addedKey) {
-			((Bean) addedKey).addPropertyChangeListener(listener);
+		protected void hookListener(Bean addedKey) {
+			addedKey.addPropertyChangeListener(listener);
 		}
 
 		@Override
-		protected void unhookListener(Object removedKey) {
-			((Bean) removedKey).removePropertyChangeListener(listener);
+		protected void unhookListener(Bean removedKey) {
+			removedKey.removePropertyChangeListener(listener);
 		}
 	}
 }
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ObservableMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ObservableMapTest.java
index e66f986f1a9..acf9060f068 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ObservableMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/ObservableMapTest.java
@@ -37,12 +37,12 @@ import org.junit.Test;
  *
  */
 public class ObservableMapTest {
-	ObservableMapStub map;
+	ObservableMapStub<Object, Object> map;
 
 	@Before
 	public void setUp() throws Exception {
 		RealmTester.setDefault(new CurrentRealm(true));
-		map = new ObservableMapStub(new HashMap());
+		map = new ObservableMapStub<>(new HashMap<>());
 	}
 
 	@After
@@ -52,7 +52,7 @@ public class ObservableMapTest {
 
 	@Test
 	public void testDisposeMapChangeListeners() throws Exception {
-		MapChangeEventTracker listener = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<?, ?> listener = MapChangeEventTracker.observe(map);
 
 		assertEquals(0, listener.count);
 		map.fireMapChange(null);
@@ -86,19 +86,19 @@ public class ObservableMapTest {
 
 	@Test
 	public void testEquals() {
-		assertTrue(map.equals(Collections.EMPTY_MAP));
+		assertTrue(map.equals(Collections.emptyMap()));
 	}
 
-	static class ObservableMapStub extends ObservableMap {
+	static class ObservableMapStub<K, V> extends ObservableMap<K, V> {
 		/**
 		 * @param wrappedMap
 		 */
-		public ObservableMapStub(Map wrappedMap) {
+		public ObservableMapStub(Map<K, V> wrappedMap) {
 			super(wrappedMap);
 		}
 
 		@Override
-		protected void fireMapChange(MapDiff diff) {
+		protected void fireMapChange(MapDiff<K, V> diff) {
 			super.fireMapChange(diff);
 		}
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/WritableMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/WritableMapTest.java
index b6a2e1b7291..9424b4038ca 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/WritableMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/WritableMapTest.java
@@ -52,7 +52,7 @@ public class WritableMapTest {
 	@Test
 	public void testPutRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableMap map = new WritableMap();
+			WritableMap<String, String> map = new WritableMap<>();
 			map.put("", "");
 		});
 	}
@@ -60,7 +60,7 @@ public class WritableMapTest {
 	@Test
 	public void testRemoveRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableMap map = new WritableMap();
+			WritableMap<String, String> map = new WritableMap<>();
 			CurrentRealm realm = (CurrentRealm) Realm.getDefault();
 			boolean current = realm.isCurrent();
 			realm.setCurrent(true);
@@ -74,7 +74,7 @@ public class WritableMapTest {
 	@Test
 	public void testClearRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableMap map = new WritableMap();
+			WritableMap<?, ?> map = new WritableMap<>();
 			map.clear();
 		});
 	}
@@ -82,19 +82,19 @@ public class WritableMapTest {
 	@Test
 	public void testPutAllRealmChecks() throws Exception {
 		RealmTester.exerciseCurrent(() -> {
-			WritableMap map = new WritableMap();
-			map.putAll(Collections.EMPTY_MAP);
+			WritableMap<Object, Object> map = new WritableMap<>();
+			map.putAll(Collections.emptyMap());
 		});
 	}
 
 	@Test
 	public void testPutWithExistingKeyMapChangeEvent() throws Exception {
-		WritableMap map = new WritableMap();
+		WritableMap<String, String> map = new WritableMap<>();
 		String key = "key";
 		String value = "value";
 		map.put(key, value);
 
-		MapChangeEventTracker listener = new MapChangeEventTracker();
+		MapChangeEventTracker<String, String> listener = new MapChangeEventTracker<>();
 		map.addMapChangeListener(listener);
 
 		assertEquals(0, listener.count);
@@ -103,10 +103,10 @@ public class WritableMapTest {
 		map.put(key, newValue);
 
 		assertEquals(1, listener.count);
-		MapChangeEvent event = listener.event;
+		MapChangeEvent<?, ?> event = listener.event;
 
 
-		Set changedKeys = event.diff.getChangedKeys();
+		Set<?> changedKeys = event.diff.getChangedKeys();
 		assertEquals(1, changedKeys.size());
 		assertTrue(changedKeys.contains(key));
 		assertEquals(value, event.diff.getOldValue(key));
@@ -115,16 +115,16 @@ public class WritableMapTest {
 
 	@Test
 	public void testPutSameValue_NoMapChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, String> map = new WritableMap<>();
 		Object key = new Object();
-		Object value = "value";
+		String value = "value";
 		map.put(key, value);
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, String> tracker = MapChangeEventTracker.observe(map);
 
 		assertEquals(0, tracker.count);
 
-		Object equalValue = new String("value");
+		String equalValue = new String("value");
 		map.put(key, equalValue);
 
 		assertEquals(0, tracker.count);
@@ -133,8 +133,8 @@ public class WritableMapTest {
 
 	@Test
 	public void testPutNullKey_SingleAdditionChangeEvent() {
-		WritableMap map = new WritableMap();
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		WritableMap<Object, Object> map = new WritableMap<>();
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		assertEquals(0, tracker.count);
 
@@ -143,37 +143,37 @@ public class WritableMapTest {
 		map.put(key, value);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
+		MapDiff<?, ?> diff = tracker.event.diff;
 		assertEquals(Collections.singleton(key), diff.getAddedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getChangedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getRemovedKeys());
+		assertEquals(Collections.emptySet(), diff.getChangedKeys());
+		assertEquals(Collections.emptySet(), diff.getRemovedKeys());
 		assertEquals(value, diff.getNewValue(key));
 	}
 
 	@Test
 	public void testRemoveNullKey_SingleRemovalChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 		Object key = null;
 		Object value = new Object();
 		map.put(key, value);
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		map.remove(key);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
-		assertEquals(Collections.EMPTY_SET, diff.getAddedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getChangedKeys());
+		MapDiff<?, ?> diff = tracker.event.diff;
+		assertEquals(Collections.emptySet(), diff.getAddedKeys());
+		assertEquals(Collections.emptySet(), diff.getChangedKeys());
 		assertEquals(Collections.singleton(key), diff.getRemovedKeys());
 		assertEquals(value, diff.getOldValue(key));
 	}
 
 	@Test
 	public void testPutNullValue_SingleAdditionChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		assertEquals(0, tracker.count);
 
@@ -182,7 +182,7 @@ public class WritableMapTest {
 		map.put(key, value);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
+		MapDiff<?, ?> diff = tracker.event.diff;
 		assertEquals(Collections.singleton(key), diff.getAddedKeys());
 		assertEquals(Collections.EMPTY_SET, diff.getChangedKeys());
 		assertEquals(Collections.EMPTY_SET, diff.getRemovedKeys());
@@ -191,127 +191,127 @@ public class WritableMapTest {
 
 	@Test
 	public void testPutNullOverNonNullValue_SingleChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 		Object key = new Object();
 		Object oldValue = new Object();
 		map.put(key, oldValue);
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		Object newValue = null;
 		map.put(key, newValue);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
-		assertEquals(Collections.EMPTY_SET, diff.getAddedKeys());
+		MapDiff<?, ?> diff = tracker.event.diff;
+		assertEquals(Collections.emptySet(), diff.getAddedKeys());
 		assertEquals(Collections.singleton(key), diff.getChangedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getRemovedKeys());
+		assertEquals(Collections.emptySet(), diff.getRemovedKeys());
 		assertEquals(oldValue, diff.getOldValue(key));
 		assertEquals(newValue, diff.getNewValue(key));
 	}
 
 	@Test
 	public void testPutNonNullOverNullValue_SingleChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 		Object key = new Object();
 		Object oldValue = null;
 		map.put(key, oldValue);
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		Object newValue = new Object();
 		map.put(key, newValue);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
-		assertEquals(Collections.EMPTY_SET, diff.getAddedKeys());
+		MapDiff<?, ?> diff = tracker.event.diff;
+		assertEquals(Collections.emptySet(), diff.getAddedKeys());
 		assertEquals(Collections.singleton(key), diff.getChangedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getRemovedKeys());
+		assertEquals(Collections.emptySet(), diff.getRemovedKeys());
 		assertEquals(oldValue, diff.getOldValue(key));
 		assertEquals(newValue, diff.getNewValue(key));
 	}
 
 	@Test
 	public void testRemoveNullValue_SingleRemovalChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 		Object key = new Object();
 		Object value = null;
 		map.put(key, value);
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		map.remove(key);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
-		assertEquals(Collections.EMPTY_SET, diff.getAddedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getChangedKeys());
+		MapDiff<?, ?> diff = tracker.event.diff;
+		assertEquals(Collections.emptySet(), diff.getAddedKeys());
+		assertEquals(Collections.emptySet(), diff.getChangedKeys());
 		assertEquals(Collections.singleton(key), diff.getRemovedKeys());
 		assertEquals(value, diff.getOldValue(key));
 	}
 
 	@Test
 	public void testPutAllNullValue_SingleAdditionChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		Object key = new Object();
 		Object value = null;
-		Map other = new HashMap();
+		Map<Object, Object> other = new HashMap<>();
 		other.put(key, value);
 		map.putAll(other);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
+		MapDiff<?, ?> diff = tracker.event.diff;
 		assertEquals(Collections.singleton(key), diff.getAddedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getChangedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getRemovedKeys());
+		assertEquals(Collections.emptySet(), diff.getChangedKeys());
+		assertEquals(Collections.emptySet(), diff.getRemovedKeys());
 		assertEquals(value, diff.getNewValue(key));
 	}
 
 	@Test
 	public void testPutAllNullValueToNonNullValue_SingleChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 		Object key = new Object();
 		Object oldValue = null;
 		map.put(key, oldValue);
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		Object newValue = new Object();
-		Map other = new HashMap();
+		Map<Object, Object> other = new HashMap<>();
 		other.put(key, newValue);
 		map.putAll(other);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
-		assertEquals(Collections.EMPTY_SET, diff.getAddedKeys());
+		MapDiff<?, ?> diff = tracker.event.diff;
+		assertEquals(Collections.emptySet(), diff.getAddedKeys());
 		assertEquals(Collections.singleton(key), diff.getChangedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getRemovedKeys());
+		assertEquals(Collections.emptySet(), diff.getRemovedKeys());
 		assertEquals(oldValue, diff.getOldValue(key));
 		assertEquals(newValue, diff.getNewValue(key));
 	}
 
 	@Test
 	public void testPutAllNonNullValueToNullValue_SingleChangeEvent() {
-		WritableMap map = new WritableMap();
+		WritableMap<Object, Object> map = new WritableMap<>();
 		Object key = new Object();
 		Object oldValue = new Object();
 		map.put(key, oldValue);
 
-		MapChangeEventTracker tracker = MapChangeEventTracker.observe(map);
+		MapChangeEventTracker<Object, Object> tracker = MapChangeEventTracker.observe(map);
 
 		Object newValue = null;
-		Map other = new HashMap();
+		Map<Object, Object> other = new HashMap<>();
 		other.put(key, newValue);
 		map.putAll(other);
 
 		assertEquals(1, tracker.count);
-		MapDiff diff = tracker.event.diff;
-		assertEquals(Collections.EMPTY_SET, diff.getAddedKeys());
+		MapDiff<?, ?> diff = tracker.event.diff;
+		assertEquals(Collections.emptySet(), diff.getAddedKeys());
 		assertEquals(Collections.singleton(key), diff.getChangedKeys());
-		assertEquals(Collections.EMPTY_SET, diff.getRemovedKeys());
+		assertEquals(Collections.emptySet(), diff.getRemovedKeys());
 		assertEquals(oldValue, diff.getOldValue(key));
 		assertEquals(newValue, diff.getNewValue(key));
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ComputedSetTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ComputedSetTest.java
index 7ffa0f0a604..c40755be063 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ComputedSetTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ComputedSetTest.java
@@ -96,8 +96,8 @@ public class ComputedSetTest extends AbstractDefaultRealmTestCase {
 				2, tracker.count);
 	}
 
-	static class ComputedSetStub extends ComputedSet {
-		Set nextComputation = new HashSet();
+	static class ComputedSetStub extends ComputedSet<Object> {
+		Set<Object> nextComputation = new HashSet<>();
 		ObservableStub dependency;
 
 		ComputedSetStub() {
@@ -110,9 +110,9 @@ public class ComputedSetTest extends AbstractDefaultRealmTestCase {
 		}
 
 		@Override
-		protected Set calculate() {
+		protected Set<Object> calculate() {
 			ObservableTracker.getterCalled(dependency);
-			return new HashSet(nextComputation);
+			return new HashSet<>(nextComputation);
 		}
 	}
 
@@ -144,9 +144,9 @@ public class ComputedSetTest extends AbstractDefaultRealmTestCase {
 		suite.addTest(ObservableCollectionContractTest.suite(new Delegate()));
 	}
 
-	static class Delegate extends AbstractObservableCollectionContractDelegate {
+	static class Delegate extends AbstractObservableCollectionContractDelegate<Object> {
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<Object> createObservableCollection(Realm realm,
 				int elementCount) {
 			final ComputedSetStub set = new ComputedSetStub(realm);
 			for (int i = 0; i < elementCount; i++)
@@ -163,7 +163,7 @@ public class ComputedSetTest extends AbstractDefaultRealmTestCase {
 		}
 
 		@Override
-		public Object createElement(IObservableCollection collection) {
+		public Object createElement(IObservableCollection<Object> collection) {
 			return new Object();
 		}
 
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/DecoratingObservableSetTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/DecoratingObservableSetTest.java
index 76b6f19f2e9..1a6819d298f 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/DecoratingObservableSetTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/DecoratingObservableSetTest.java
@@ -39,26 +39,25 @@ public class DecoratingObservableSetTest {
 		suite.addTest(MutableObservableCollectionContractTest.suite(new Delegate()));
 	}
 
-	static class Delegate extends AbstractObservableCollectionContractDelegate {
+	static class Delegate extends AbstractObservableCollectionContractDelegate<Object> {
 		private Object elementType = Object.class;
 
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<Object> createObservableCollection(Realm realm,
 				int elementCount) {
-			IObservableSet wrappedSet = new WritableSet(realm,
-					Collections.EMPTY_SET, elementType);
+			IObservableSet<Object> wrappedSet = new WritableSet<>(realm, Collections.emptySet(), elementType);
 			for (int i = 0; i < elementCount; i++)
 				wrappedSet.add(createElement(wrappedSet));
 			return new DecoratingObservableSetStub(wrappedSet);
 		}
 
 		@Override
-		public Object createElement(IObservableCollection collection) {
+		public Object createElement(IObservableCollection<Object> collection) {
 			return new Object();
 		}
 
 		@Override
-		public Object getElementType(IObservableCollection collection) {
+		public Object getElementType(IObservableCollection<Object> collection) {
 			return elementType;
 		}
 
@@ -69,10 +68,10 @@ public class DecoratingObservableSetTest {
 		}
 	}
 
-	static class DecoratingObservableSetStub extends DecoratingObservableSet {
-		IObservableSet wrappedSet;
+	static class DecoratingObservableSetStub extends DecoratingObservableSet<Object> {
+		IObservableSet<Object> wrappedSet;
 
-		DecoratingObservableSetStub(IObservableSet wrappedSet) {
+		DecoratingObservableSetStub(IObservableSet<Object> wrappedSet) {
 			super(wrappedSet, true);
 			this.wrappedSet = wrappedSet;
 		}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ObservableSetTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ObservableSetTest.java
index eeb98921ee2..6f72f6472bd 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ObservableSetTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/ObservableSetTest.java
@@ -38,29 +38,29 @@ public class ObservableSetTest {
 		suite.addTest(ObservableCollectionContractTest.suite(new Delegate()));
 	}
 
-	private static class Delegate extends AbstractObservableCollectionContractDelegate {
+	private static class Delegate extends AbstractObservableCollectionContractDelegate<String> {
 		private Delegate() {
 		}
 
 		@Override
 		public void change(IObservable observable) {
-			((ObservableSetStub) observable).fireSetChange(Diffs.createSetDiff(new HashSet(), new HashSet()));
+			((ObservableSetStub) observable).fireSetChange(Diffs.createSetDiff(new HashSet<>(), new HashSet<>()));
 		}
 
 		@Override
-		public Object createElement(IObservableCollection collection) {
+		public String createElement(IObservableCollection<String> collection) {
 			return Integer.toString(collection.size());
 		}
 
 		@Override
-		public Object getElementType(IObservableCollection collection) {
+		public Object getElementType(IObservableCollection<String> collection) {
 			return String.class;
 		}
 
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<String> createObservableCollection(Realm realm,
 				int elementCount) {
-			IObservableSet set = new ObservableSetStub(realm, new HashSet(), String.class);
+			IObservableSet<String> set = new ObservableSetStub(realm, new HashSet<>(), String.class);
 
 			for (int i = 0; i < elementCount; i++) {
 				set.add(Integer.toString(i));
@@ -70,17 +70,17 @@ public class ObservableSetTest {
 		}
 	}
 
-	private static class ObservableSetStub extends ObservableSet {
+	private static class ObservableSetStub extends ObservableSet<String> {
 		/**
 		 * @param wrappedSet
 		 * @param elementType
 		 */
-		protected ObservableSetStub(Realm realm, Set wrappedSet, Object elementType) {
+		protected ObservableSetStub(Realm realm, Set<String> wrappedSet, Object elementType) {
 			super(realm, wrappedSet, elementType);
 		}
 
 		@Override
-		public void fireSetChange(SetDiff diff) {
+		public void fireSetChange(SetDiff<String> diff) {
 			super.fireSetChange(diff);
 		}
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/UnionSetTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/UnionSetTest.java
index 843a8cc4bf1..a409c2c6f8c 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/UnionSetTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/UnionSetTest.java
@@ -34,8 +34,8 @@ public class UnionSetTest {
 	}
 
 	private static class Delegate extends
-			AbstractObservableCollectionContractDelegate {
-		private IObservableSet[] sets;
+			AbstractObservableCollectionContractDelegate<String> {
+		private IObservableSet<String>[] sets;
 
 		private Delegate() {
 		}
@@ -59,16 +59,19 @@ public class UnionSetTest {
 		}
 
 		@Override
-		public Object createElement(IObservableCollection collection) {
+		public String createElement(IObservableCollection<String> collection) {
 			return Integer.toString(collection.size());
 		}
 
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<String> createObservableCollection(Realm realm,
 				int elementCount) {
-			sets = new IObservableSet[]{new WritableSet(realm), new WritableSet(realm)};
+			@SuppressWarnings("unchecked")
+			IObservableSet<String>[] newSets = new IObservableSet[] { new WritableSet<>(realm),
+					new WritableSet<>(realm) };
+			sets = newSets;
 
-			IObservableSet set = new UnionSet(sets);
+			IObservableSet<String> set = new UnionSet<>(sets);
 
 			for (int i = 0; i < elementCount; i++) {
 				sets[0].add(Integer.toString(i));
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/WritableSetTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/WritableSetTest.java
index 709e379f647..367f1dd7907 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/WritableSetTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/set/WritableSetTest.java
@@ -37,7 +37,7 @@ public class WritableSetTest extends AbstractDefaultRealmTestCase {
 	@Test
 	public void testWithElementType() throws Exception {
 		Object elementType = String.class;
-		WritableSet set = WritableSet.withElementType(elementType);
+		WritableSet<String> set = WritableSet.withElementType(elementType);
 		assertNotNull(set);
 		assertEquals(Realm.getDefault(), set.getRealm());
 		assertEquals(elementType, set.getElementType());
@@ -48,31 +48,32 @@ public class WritableSetTest extends AbstractDefaultRealmTestCase {
 	}
 
 	private static class Delegate extends
-			AbstractObservableCollectionContractDelegate {
+			AbstractObservableCollectionContractDelegate<Object> {
 		private Delegate() {
 			super();
 		}
 
 		@Override
 		public void change(IObservable observable) {
-			IObservableSet set = (IObservableSet) observable;
+			@SuppressWarnings("unchecked")
+			IObservableSet<Object> set = (IObservableSet<Object>) observable;
 			set.add(createElement(set));
 		}
 
 		@Override
-		public Object createElement(IObservableCollection collection) {
+		public Object createElement(IObservableCollection<Object> collection) {
 			return new Object();
 		}
 
 		@Override
-		public Object getElementType(IObservableCollection collection) {
+		public Object getElementType(IObservableCollection<Object> collection) {
 			return String.class;
 		}
 
 		@Override
-		public IObservableCollection createObservableCollection(Realm realm,
+		public IObservableCollection<Object> createObservableCollection(Realm realm,
 				int elementCount) {
-			IObservableSet set = new WritableSet(realm, Collections.EMPTY_SET,
+			IObservableSet<Object> set = new WritableSet<>(realm, Collections.emptySet(),
 					String.class);
 			for (int i = 0; i < elementCount; i++) {
 				set.add(createElement(set));
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractObservableValueTest.java
index 335c7ac5041..52f6c37f621 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractObservableValueTest.java
@@ -82,7 +82,7 @@ public class AbstractObservableValueTest {
 		});
 	}
 
-	private static class ObservableValueStub extends AbstractObservableValue {
+	private static class ObservableValueStub extends AbstractObservableValue<Object> {
 		ObservableValueStub() {
 			super(Realm.getDefault());
 		}
@@ -102,7 +102,7 @@ public class AbstractObservableValueTest {
 		}
 
 		@Override
-		protected void fireValueChange(ValueDiff diff) {
+		protected void fireValueChange(ValueDiff<Object> diff) {
 			super.fireValueChange(diff);
 		}
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractVetoableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractVetoableValueTest.java
index da54e3b1b2f..a446ea7a562 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractVetoableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/AbstractVetoableValueTest.java
@@ -76,7 +76,7 @@ public class AbstractVetoableValueTest {
 		});
 	}
 
-	private static class VetoableValueStub extends AbstractVetoableValue {
+	private static class VetoableValueStub extends AbstractVetoableValue<Object> {
 		VetoableValueStub() {
 			this(Realm.getDefault());
 		}
@@ -101,7 +101,7 @@ public class AbstractVetoableValueTest {
 		}
 
 		@Override
-		protected boolean fireValueChanging(ValueDiff diff) {
+		protected boolean fireValueChanging(ValueDiff<Object> diff) {
 			return super.fireValueChanging(diff);
 		}
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/ComputedValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/ComputedValueTest.java
index b9548e2a5a7..a66a6a427e1 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/ComputedValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/ComputedValueTest.java
@@ -38,17 +38,17 @@ import org.junit.Test;
 public class ComputedValueTest extends AbstractDefaultRealmTestCase {
 	@Test
 	public void testValueType() throws Exception {
-		ComputedValue cv = new ComputedValue(Integer.TYPE) {
+		ComputedValue<Integer> cv = new ComputedValue<Integer>(Integer.TYPE) {
 			@Override
-			protected Object calculate() {
+			protected Integer calculate() {
 				return Integer.valueOf(42);
 			}
 		};
 		assertEquals("value type should be the type that was set", Integer.TYPE, cv.getValueType());
 
-		cv = new ComputedValue() {
+		cv = new ComputedValue<Integer>() {
 			@Override
-			protected Object calculate() {
+			protected Integer calculate() {
 				// TODO Auto-generated method stub
 				return null;
 			}
@@ -59,9 +59,9 @@ public class ComputedValueTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void test_getValue() throws Exception {
-		ComputedValue cv = new ComputedValue() {
+		ComputedValue<Integer> cv = new ComputedValue<Integer>() {
 			@Override
-			protected Object calculate() {
+			protected Integer calculate() {
 				return Integer.valueOf(42);
 			}
 		};
@@ -70,11 +70,11 @@ public class ComputedValueTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testDependencyValueChange() throws Exception {
-		final WritableValue value = new WritableValue(Integer.valueOf(42), Integer.TYPE);
+		final WritableValue<Integer> value = new WritableValue<>(Integer.valueOf(42), Integer.TYPE);
 
-		ComputedValue cv = new ComputedValue() {
+		ComputedValue<Integer> cv = new ComputedValue<Integer>() {
 			@Override
-			protected Object calculate() {
+			protected Integer calculate() {
 				return value.getValue();
 			}
 		};
@@ -86,8 +86,8 @@ public class ComputedValueTest extends AbstractDefaultRealmTestCase {
 		assertEquals("calculated value should have been that of the writable value", value.getValue(), cv.getValue());
 	}
 
-	private static class WritableValueExt extends WritableValue {
-		public WritableValueExt(Object valueType, Object initialValue) {
+	private static class WritableValueExt<E> extends WritableValue<E> {
+		public WritableValueExt(Object valueType, E initialValue) {
 			super(initialValue, valueType);
 		}
 
@@ -99,15 +99,15 @@ public class ComputedValueTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testHookAndUnhookDependantObservables() throws Exception {
-		final List values = new ArrayList();
+		final List<WritableValue<Integer>> values = new ArrayList<>();
 
-		ComputedValue cv = new ComputedValue() {
+		ComputedValue<Integer> cv = new ComputedValue<Integer>() {
 			@Override
-			protected Object calculate() {
+			protected Integer calculate() {
 				int sum = 0;
-				for (Iterator it = values.iterator(); it.hasNext();) {
-					WritableValue value = (WritableValue) it.next();
-					sum += ((Integer) value.getValue()).intValue();
+				for (Iterator<WritableValue<Integer>> it = values.iterator(); it.hasNext();) {
+					WritableValue<Integer> value = it.next();
+					sum += value.getValue().intValue();
 
 				}
 
@@ -115,8 +115,8 @@ public class ComputedValueTest extends AbstractDefaultRealmTestCase {
 			}
 		};
 
-		WritableValueExt value1 = new WritableValueExt(Integer.TYPE, Integer.valueOf(1));
-		WritableValueExt value2 = new WritableValueExt(Integer.TYPE, Integer.valueOf(1));
+		WritableValueExt<Integer> value1 = new WritableValueExt<>(Integer.TYPE, Integer.valueOf(1));
+		WritableValueExt<Integer> value2 = new WritableValueExt<>(Integer.TYPE, Integer.valueOf(1));
 		values.add(value1);
 		values.add(value2);
 
@@ -140,7 +140,7 @@ public class ComputedValueTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testSetValueUnsupportedOperationException() throws Exception {
-		ComputedValue cv = new ComputedValue() {
+		ComputedValue<Object> cv = new ComputedValue<Object>() {
 			@Override
 			protected Object calculate() {
 				return null;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DateAndTimeObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DateAndTimeObservableValueTest.java
index 86db291e89a..09cd79c6f65 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DateAndTimeObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DateAndTimeObservableValueTest.java
@@ -34,9 +34,9 @@ import org.junit.Test;
  */
 public class DateAndTimeObservableValueTest extends
 		AbstractDefaultRealmTestCase {
-	private IObservableValue date;
-	private IObservableValue time;
-	private IObservableValue dateAndTime;
+	private IObservableValue<Date> date;
+	private IObservableValue<Date> time;
+	private IObservableValue<Date> dateAndTime;
 
 	@Before
 	@Override
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DecoratingObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DecoratingObservableValueTest.java
index e9157c8c209..b2253789ddc 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DecoratingObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DecoratingObservableValueTest.java
@@ -37,14 +37,14 @@ public class DecoratingObservableValueTest {
 		private Object valueType = Object.class;
 
 		@Override
-		public IObservableValue createObservableValue(Realm realm) {
-			IObservableValue decorated = new WritableValue(realm, new Object(),
+		public IObservableValue<?> createObservableValue(Realm realm) {
+			IObservableValue<Object> decorated = new WritableValue<>(realm, new Object(),
 					valueType);
 			return new DecoratingObservableValueStub(decorated);
 		}
 
 		@Override
-		public Object getValueType(IObservableValue observable) {
+		public Object getValueType(IObservableValue<?> observable) {
 			return valueType;
 		}
 
@@ -56,10 +56,10 @@ public class DecoratingObservableValueTest {
 	}
 
 	static class DecoratingObservableValueStub extends
-			DecoratingObservableValue {
-		IObservableValue decorated;
+			DecoratingObservableValue<Object> {
+		IObservableValue<Object> decorated;
 
-		DecoratingObservableValueStub(IObservableValue decorated) {
+		DecoratingObservableValueStub(IObservableValue<Object> decorated) {
 			super(decorated, true);
 			this.decorated = decorated;
 		}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DuplexingObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DuplexingObservableValueTest.java
index 1eae8ffd5c8..7161427666e 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DuplexingObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/DuplexingObservableValueTest.java
@@ -33,21 +33,21 @@ import org.junit.Test;
  *
  */
 public class DuplexingObservableValueTest extends AbstractDefaultRealmTestCase {
-	private IObservableList list;
-	private DuplexingObservableValue observable;
+	private IObservableList<String> list;
+	private DuplexingObservableValue<String> observable;
 
 	@Before
 	@Override
 	public void setUp() throws Exception {
 		super.setUp();
-		list = new WritableList(new ArrayList(), String.class);
+		list = new WritableList<>(new ArrayList<>(), String.class);
 	}
 
 	@Test
 	public void testValueType_InheritFromTargetList() throws Exception {
-		observable = new DuplexingObservableValue(list) {
+		observable = new DuplexingObservableValue<String>(list) {
 			@Override
-			protected Object coalesceElements(Collection elements) {
+			protected String coalesceElements(Collection<String> elements) {
 				return null;
 			}
 		};
@@ -58,9 +58,9 @@ public class DuplexingObservableValueTest extends AbstractDefaultRealmTestCase {
 
 	@Test
 	public void testValueType_ProvidedInConstructor() throws Exception {
-		observable = new DuplexingObservableValue(list, Object.class) {
+		observable = new DuplexingObservableValue<String>(list, Object.class) {
 			@Override
-			protected Object coalesceElements(Collection elements) {
+			protected String coalesceElements(Collection<String> elements) {
 				return null;
 			}
 		};
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/SelectObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/SelectObservableValueTest.java
index b63f383ca37..b517a2eaa0d 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/SelectObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/SelectObservableValueTest.java
@@ -37,26 +37,29 @@ public class SelectObservableValueTest extends AbstractDefaultRealmTestCase {
 	/* package */static class Delegate extends
 			AbstractObservableValueContractDelegate {
 		@Override
-		public IObservableValue createObservableValue(Realm realm) {
-			return new SelectObservableValue(realm, Object.class);
+		public IObservableValue<?> createObservableValue(Realm realm) {
+			return new SelectObservableValue<>(realm, Object.class);
 		}
 
 		@Override
 		public void change(IObservable observable) {
-			IObservableValue observableValue = (IObservableValue) observable;
+			@SuppressWarnings("unchecked")
+			IObservableValue<Object> observableValue = (IObservableValue<Object>) observable;
 			observableValue.setValue(createValue(observableValue));
 		}
 
 		@Override
-		public Object getValueType(IObservableValue observable) {
+		public Object getValueType(IObservableValue<?> observable) {
 			return Object.class;
 		}
 
 		@Override
-		public Object createValue(IObservableValue observable) {
-			SelectObservableValue select = (SelectObservableValue) observable;
+		public Object createValue(IObservableValue<?> observable) {
+			@SuppressWarnings("unchecked")
+			SelectObservableValue<Object> select = (SelectObservableValue<Object>) observable;
 			Object value = new Object();
-			IObservableValue optionObservable = new WritableValue(select
+			IObservableValue<Boolean> optionObservable = new WritableValue<>(
+					select
 					.getRealm(), Boolean.FALSE, Boolean.TYPE);
 			select.addOption(value, optionObservable);
 			return value;
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/WritableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/WritableValueTest.java
index 4a3d7e8e75e..9b16394054e 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/WritableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/value/WritableValueTest.java
@@ -44,7 +44,7 @@ public class WritableValueTest extends AbstractDefaultRealmTestCase {
 	 */
 	@Test
 	public void testConstructor() throws Exception {
-		WritableValue value = new WritableValue(DisplayRealm.getRealm(Display
+		WritableValue<Object> value = new WritableValue<>(DisplayRealm.getRealm(Display
 				.getDefault()));
 		assertNull(value.getValue());
 		assertNull(value.getValueType());
@@ -53,7 +53,7 @@ public class WritableValueTest extends AbstractDefaultRealmTestCase {
 	@Test
 	public void testWithValueType() throws Exception {
 		Object elementType = String.class;
-		WritableValue value = WritableValue.withValueType(elementType);
+		WritableValue<String> value = WritableValue.withValueType(elementType);
 		assertNotNull(value);
 		assertEquals(Realm.getDefault(), value.getRealm());
 		assertEquals(elementType, value.getValueType());
@@ -66,23 +66,24 @@ public class WritableValueTest extends AbstractDefaultRealmTestCase {
 	/* package */static class Delegate extends
 			AbstractObservableValueContractDelegate {
 		@Override
-		public IObservableValue createObservableValue(Realm realm) {
-			return new WritableValue(realm, "", String.class);
+		public IObservableValue<?> createObservableValue(Realm realm) {
+			return new WritableValue<>(realm, "", String.class);
 		}
 
 		@Override
 		public void change(IObservable observable) {
-			IObservableValue observableValue = (IObservableValue) observable;
+			@SuppressWarnings("unchecked")
+			IObservableValue<String> observableValue = (IObservableValue<String>) observable;
 			observableValue.setValue(createValue(observableValue));
 		}
 
 		@Override
-		public Object getValueType(IObservableValue observable) {
+		public Object getValueType(IObservableValue<?> observable) {
 			return String.class;
 		}
 
 		@Override
-		public Object createValue(IObservableValue observable) {
+		public String createValue(IObservableValue<?> observable) {
 			return observable.getValue() + "a";
 		}
 	}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/IdentitySetTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/IdentitySetTest.java
index 55e7ed75fed..8bbfa191cce 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/IdentitySetTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/IdentitySetTest.java
@@ -47,7 +47,7 @@ public class IdentitySetTest {
 	@Test
 	public void testConstructor_NullComparer() {
 		try {
-			new ViewerElementSet(null);
+			new ViewerElementSet<>(null);
 			fail("Constructor should throw exception when null comparer passed in");
 		} catch (RuntimeException expected) {
 		}
@@ -56,7 +56,7 @@ public class IdentitySetTest {
 	@Test
 	public void testConstructorWithCollection_NullCollection() {
 		try {
-			new ViewerElementSet(null);
+			new ViewerElementSet<>(null);
 			fail("Constructor should throw exception when null collection passed in");
 		} catch (RuntimeException expected) {
 		}
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/ConstantObservableValueTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/ConstantObservableValueTest.java
index ceafbed6778..6c058168334 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/ConstantObservableValueTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/internal/databinding/observable/ConstantObservableValueTest.java
@@ -36,7 +36,7 @@ public class ConstantObservableValueTest extends AbstractDefaultRealmTestCase {
 
 	@Test(expected = RuntimeException.class)
 	public void testConstructor_NullRealm() {
-		new ConstantObservableValue(null, null, null);
+		new ConstantObservableValue<>(null, null, null);
 	}
 
 	public static void addConformanceTest(TestSuite suite) {
@@ -47,13 +47,12 @@ public class ConstantObservableValueTest extends AbstractDefaultRealmTestCase {
 	private static class Delegate extends
 			AbstractObservableValueContractDelegate {
 		@Override
-		public IObservableValue createObservableValue(Realm realm) {
-			return new ConstantObservableValue(realm, new Object(),
-					Object.class);
+		public IObservableValue<Object> createObservableValue(Realm realm) {
+			return new ConstantObservableValue<>(realm, new Object(), Object.class);
 		}
 
 		@Override
-		public Object getValueType(IObservableValue observable) {
+		public Object getValueType(IObservableValue<?> observable) {
 			return Object.class;
 		}
 	}