rework change events - ChangeListener, ChangeAdapter, etc.

37 files changed, 1016 insertions, 1439 deletions

diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/ChangeSupportTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/ChangeSupportTests.java
index 17fd522c33..d7e0c89a9b 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/ChangeSupportTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/ChangeSupportTests.java
@@ -14,7 +14,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 
 import junit.framework.TestCase;
@@ -41,32 +40,30 @@ import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
 import org.eclipse.jpt.utility.model.event.TreeClearEvent;
 import org.eclipse.jpt.utility.model.event.TreeEvent;
 import org.eclipse.jpt.utility.model.event.TreeRemoveEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.CollectionChangeAdapter;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeAdapter;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.listener.PropertyChangeAdapter;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.utility.model.listener.StateChangeAdapter;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
 import org.eclipse.jpt.utility.model.listener.TreeChangeAdapter;
-import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
 @SuppressWarnings("nls")
 public class ChangeSupportTests
 	extends TestCase
-	implements StateChangeListener, PropertyChangeListener, CollectionChangeListener, ListChangeListener, TreeChangeListener
 {
-	private TestModel testModel;
-	private static final String TEST_TO_STRING = "this is a test";
+	TestModel testModel;
+	static final String TEST_TO_STRING = "this is a test";
 
-	private StateChangeEvent stateChangeEvent;
-	private boolean stateChangedCalled = false;
+	ChangeListener changeListener = new Adapter();
 
-	private PropertyChangeEvent propertyChangeEvent;
-	private boolean propertyChangeCalled = false;
-	private static final String PROPERTY_NAME = "propertyName";
+	StateChangeEvent stateChangeEvent;
+	boolean stateChangedCalled = false;
+
+	PropertyChangeEvent propertyChangeEvent;
+	boolean propertyChangeCalled = false;
+	static final String PROPERTY_NAME = "propertyName";
 	static final Object OLD_OBJECT_VALUE = new Object();
 	static final Object NEW_OBJECT_VALUE = new Object();
 	static final Integer OLD_INT_VALUE = new Integer(27);
@@ -74,36 +71,36 @@ public class ChangeSupportTests
 	static final Integer NEW_INT_VALUE = new Integer(42);
 	static final Boolean NEW_BOOLEAN_VALUE = Boolean.FALSE;
 
-	private CollectionEvent collectionEvent;
-	private boolean itemsAddedCollectionCalled = false;
-	private boolean itemsRemovedCollectionCalled = false;
-	private boolean collectionChangedCalled = false;
-	private boolean collectionClearedCalled = false;
-	private static final String COLLECTION_NAME = "collectionName";
+	CollectionEvent collectionEvent;
+	boolean itemsAddedCollectionCalled = false;
+	boolean itemsRemovedCollectionCalled = false;
+	boolean collectionChangedCalled = false;
+	boolean collectionClearedCalled = false;
+	static final String COLLECTION_NAME = "collectionName";
 	static final Object ADDED_OBJECT_VALUE = new Object();
 	static final Object ADDED_OBJECT_VALUE_2 = new Object();
 	static final Object REMOVED_OBJECT_VALUE = new Object();
 	static final int TARGET_INDEX = 7;
 	static final int SOURCE_INDEX = 22;
 
-	private ListEvent listEvent;
-	private boolean itemsAddedListCalled = false;
-	private boolean itemsRemovedListCalled = false;
-	private boolean itemsReplacedListCalled = false;
-	private boolean itemsMovedListCalled = false;
-	private boolean listChangedCalled = false;
-	private boolean listClearedCalled = false;
-	private static final String LIST_NAME = "listName";
-	private static final int ADD_INDEX = 3;
-	private static final int REMOVE_INDEX = 5;
-	private static final int REPLACE_INDEX = 2;
-
-	private TreeEvent treeEvent;
-	private boolean nodeAddedCalled = false;
-	private boolean nodeRemovedCalled = false;
-	private boolean treeChangedCalled = false;
-	private boolean treeClearedCalled = false;
-	private static final String TREE_NAME = "treeName";
+	ListEvent listEvent;
+	boolean itemsAddedListCalled = false;
+	boolean itemsRemovedListCalled = false;
+	boolean itemsReplacedListCalled = false;
+	boolean itemsMovedListCalled = false;
+	boolean listChangedCalled = false;
+	boolean listClearedCalled = false;
+	static final String LIST_NAME = "listName";
+	static final int ADD_INDEX = 3;
+	static final int REMOVE_INDEX = 5;
+	static final int REPLACE_INDEX = 2;
+
+	TreeEvent treeEvent;
+	boolean nodeAddedCalled = false;
+	boolean nodeRemovedCalled = false;
+	boolean treeChangedCalled = false;
+	boolean treeClearedCalled = false;
+	static final String TREE_NAME = "treeName";
 	static final List<Object> OBJECT_PATH = Arrays.asList(new Object[] {new Object(), new Object(), new String()});
 
 
@@ -142,7 +139,7 @@ public class ChangeSupportTests
 	public void testFireStateChange() {
 		this.stateChangeEvent = null;
 		this.stateChangedCalled = false;
-		this.testModel.addStateChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireStateChange();
 		assertNotNull(this.stateChangeEvent);
 		assertEquals(this.testModel, this.stateChangeEvent.getSource());
@@ -151,29 +148,29 @@ public class ChangeSupportTests
 
 	public void testHasAnyStateChangeListeners() {
 		assertTrue(this.testModel.hasNoStateChangeListeners());
-		this.testModel.addStateChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasAnyStateChangeListeners());
-		this.testModel.removeStateChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasNoStateChangeListeners());
 	}
 
 	public void testHasAnyStateChangeListenersDuplicate() {
 		assertTrue(this.testModel.hasNoStateChangeListeners());
-		this.testModel.addStateChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		boolean exCaught = false;
 		try {
-			this.testModel.addStateChangeListener(this);
+			this.testModel.addChangeListener(this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 		assertTrue(this.testModel.hasAnyStateChangeListeners());
-		this.testModel.removeStateChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasNoStateChangeListeners());
 
 		exCaught = false;
 		try {
-			this.testModel.removeStateChangeListener(this);
+			this.testModel.removeChangeListener(this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
@@ -193,25 +190,25 @@ public class ChangeSupportTests
 	public void testRemoveBogusStateListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.removeStateChangeListener(this);
+			this.testModel.removeChangeListener(this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addPropertyChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeStateChangeListener(this);
+			this.testModel.removeChangeListener(this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addStateChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeStateChangeListener(new ChangeSupportTests("dummy"));
+			this.testModel.removeStateChangeListener(new Adapter());
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
@@ -232,28 +229,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedEvent() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedEvent();
 		this.verifyPropertyChangeEvent(OLD_OBJECT_VALUE, NEW_OBJECT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedEvent();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedEvent();
 		this.verifyPropertyChangeEvent(OLD_OBJECT_VALUE, NEW_OBJECT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedEvent();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -262,28 +259,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedEventNoChange() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedEventNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedEventNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedEventNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedEventNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -292,28 +289,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedObjectObject() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObject();
 		this.verifyPropertyChangeEvent(OLD_OBJECT_VALUE, NEW_OBJECT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObject();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObject();
 		this.verifyPropertyChangeEvent(OLD_OBJECT_VALUE, NEW_OBJECT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObject();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -322,28 +319,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedObjectObjectNoChange() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObjectObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -352,28 +349,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedObject() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObject();
 		this.verifyPropertyChangeEvent(null, NEW_OBJECT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObject();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObject();
 		this.verifyPropertyChangeEvent(null, NEW_OBJECT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObject();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -382,28 +379,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedObjectNoChange() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedObjectNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -412,28 +409,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedIntInt() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedIntInt();
 		this.verifyPropertyChangeEvent(OLD_INT_VALUE, NEW_INT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedIntInt();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedIntInt();
 		this.verifyPropertyChangeEvent(OLD_INT_VALUE, NEW_INT_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedIntInt();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -442,28 +439,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedIntIntNoChange() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedIntIntNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedIntIntNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedIntIntNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedIntIntNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -472,28 +469,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedBooleanBoolean() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBoolean();
 		this.verifyPropertyChangeEvent(OLD_BOOLEAN_VALUE, NEW_BOOLEAN_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBoolean();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBoolean();
 		this.verifyPropertyChangeEvent(OLD_BOOLEAN_VALUE, NEW_BOOLEAN_VALUE);
 		assertTrue(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBoolean();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -502,28 +499,28 @@ public class ChangeSupportTests
 	public void testFirePropertyChangedBooleanBooleanNoChange() {
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBooleanNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBooleanNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBooleanNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
 
 		this.propertyChangeEvent = null;
 		this.propertyChangeCalled = false;
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		this.testModel.testFirePropertyChangedBooleanBooleanNoChange();
 		assertNull(this.propertyChangeEvent);
 		assertFalse(this.propertyChangeCalled);
@@ -531,22 +528,22 @@ public class ChangeSupportTests
 
 	public void testHasAnyPropertyChangeListeners() {
 		assertTrue(this.testModel.hasNoPropertyChangeListeners(PROPERTY_NAME));
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasAnyPropertyChangeListeners(PROPERTY_NAME));
-		this.testModel.removePropertyChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasNoPropertyChangeListeners(PROPERTY_NAME));
 
 		assertTrue(this.testModel.hasNoPropertyChangeListeners(PROPERTY_NAME));
-		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.addPropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		assertTrue(this.testModel.hasAnyPropertyChangeListeners(PROPERTY_NAME));
-		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this);
+		this.testModel.removePropertyChangeListener(PROPERTY_NAME, this.changeListener);
 		assertTrue(this.testModel.hasNoPropertyChangeListeners(PROPERTY_NAME));
 	}
 
 	public void testAddNullPropertyListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.addPropertyChangeListener(null);
+			this.testModel.addChangeListener(null);
 		} catch (NullPointerException ex) {
 			exCaught = true;
 		}
@@ -566,61 +563,25 @@ public class ChangeSupportTests
 	public void testRemoveBogusPropertyListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.removePropertyChangeListener(this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addCollectionChangeListener(this);
-		exCaught = false;
-		try {
-			this.testModel.removePropertyChangeListener(this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addPropertyChangeListener(this);
-		exCaught = false;
-		try {
-			this.testModel.removePropertyChangeListener(new ChangeSupportTests("dummy"));
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		exCaught = false;
-		try {
-			this.testModel.removePropertyChangeListener(new PropertyChangeAdapter());
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-	}
-
-	public void testRemoveBogusPropertyListenerName() {
-		boolean exCaught = false;
-		try {
-			this.testModel.removePropertyChangeListener("foo", this);
+			this.testModel.removePropertyChangeListener("foo", new PropertyChangeAdapter());
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addCollectionChangeListener("foo", this);
+		this.testModel.addCollectionChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removePropertyChangeListener("foo", this);
+			this.testModel.removePropertyChangeListener("foo", this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addPropertyChangeListener("foo", this);
+		this.testModel.addPropertyChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removePropertyChangeListener("foo", new ChangeSupportTests("dummy"));
+			this.testModel.removePropertyChangeListener("foo", new PropertyChangeAdapter());
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
@@ -653,28 +614,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedCollectionEvent() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEvent();
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEvent();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEvent();
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEvent();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -683,28 +644,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedCollectionEventNoChange() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -713,28 +674,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedCollection() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollection();
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollection();
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -743,28 +704,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedCollectionNoChange() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -773,28 +734,28 @@ public class ChangeSupportTests
 	public void testFireItemAddedCollection() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemAddedCollection();
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemAddedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemAddedCollection();
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemAddedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -803,28 +764,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedCollectionEvent() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEvent();
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEvent();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEvent();
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEvent();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -833,28 +794,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedCollectionEventNoChange() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionEventNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -863,28 +824,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedCollection() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollection();
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollection();
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -893,28 +854,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedCollectionNoChange() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedCollectionNoChange();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -923,28 +884,28 @@ public class ChangeSupportTests
 	public void testFireItemRemovedCollection() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemRemovedCollection();
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemRemovedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemRemovedCollection();
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireItemRemovedCollection();
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -953,28 +914,28 @@ public class ChangeSupportTests
 	public void testFireCollectionCleared() {
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireCollectionCleared();
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireCollectionCleared();
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireCollectionCleared();
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireCollectionCleared();
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
@@ -983,28 +944,28 @@ public class ChangeSupportTests
 	public void testFireCollectionChangedEvent() {
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireCollectionChangedEvent();
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionChangedCalled);
 
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireCollectionChangedEvent();
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionChangedCalled);
 
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireCollectionChangedEvent();
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionChangedCalled);
 
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireCollectionChangedEvent();
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionChangedCalled);
@@ -1013,28 +974,28 @@ public class ChangeSupportTests
 	public void testFireCollectionChanged() {
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireCollectionChanged();
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionChangedCalled);
 
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireCollectionChanged();
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionChangedCalled);
 
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireCollectionChanged();
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionChangedCalled);
 
 		this.collectionEvent = null;
 		this.collectionChangedCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		this.testModel.testFireCollectionChanged();
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionChangedCalled);
@@ -1043,28 +1004,28 @@ public class ChangeSupportTests
 	public void testAddItemToCollection() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testAddItemToCollection());
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testAddItemToCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testAddItemToCollection());
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testAddItemToCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -1073,28 +1034,28 @@ public class ChangeSupportTests
 	public void testAddItemToCollectionNoChange() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testAddItemToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testAddItemToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testAddItemToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testAddItemToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -1103,28 +1064,28 @@ public class ChangeSupportTests
 	public void testAddItemsToCollection() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollection());
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollection());
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -1133,28 +1094,28 @@ public class ChangeSupportTests
 	public void testAddItemsToCollectionNoChange() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testAddItemsToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testAddItemsToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testAddItemsToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testAddItemsToCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -1163,28 +1124,28 @@ public class ChangeSupportTests
 	public void testAddItemsToCollectionMixed() {
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollectionMixed());
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE_2);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollectionMixed());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollectionMixed());
 		this.verifyCollectionEvent(ADDED_OBJECT_VALUE_2);
 		assertTrue(this.itemsAddedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsAddedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testAddItemsToCollectionMixed());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsAddedCollectionCalled);
@@ -1193,28 +1154,28 @@ public class ChangeSupportTests
 	public void testRemoveItemFromCollection() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRemoveItemFromCollection());
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRemoveItemFromCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRemoveItemFromCollection());
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRemoveItemFromCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1223,28 +1184,28 @@ public class ChangeSupportTests
 	public void testRemoveItemFromCollectionNoChange() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemFromCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemFromCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemFromCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemFromCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1253,28 +1214,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromCollection() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRemoveItemsFromCollection());
 		this.verifyCollectionChangeEvent2(REMOVED_OBJECT_VALUE, "foo", "bar");
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRemoveItemsFromCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRemoveItemsFromCollection());
 		this.verifyCollectionChangeEvent2(REMOVED_OBJECT_VALUE, "foo", "bar");
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRemoveItemsFromCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1283,28 +1244,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromCollectionNoChange1() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1313,28 +1274,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromCollectionNoChange2() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1343,28 +1304,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromCollectionNoChange3() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange3());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange3());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange3());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRemoveItemsFromCollectionNoChange3());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1373,28 +1334,28 @@ public class ChangeSupportTests
 	public void testRetainItemsInCollection1() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection1());
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection1());
 		this.verifyCollectionEvent(REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1404,28 +1365,28 @@ public class ChangeSupportTests
 	public void testRetainItemsInCollection2() {
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection2());
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection2());
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testRetainItemsInCollection2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
@@ -1434,28 +1395,28 @@ public class ChangeSupportTests
 	public void testRetainItemsInCollectionNoChange1() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange1());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1464,28 +1425,28 @@ public class ChangeSupportTests
 	public void testRetainItemsInCollectionNoChange2() {
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
 
 		this.collectionEvent = null;
 		this.itemsRemovedCollectionCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testRetainItemsInCollectionNoChange2());
 		assertNull(this.collectionEvent);
 		assertFalse(this.itemsRemovedCollectionCalled);
@@ -1494,28 +1455,28 @@ public class ChangeSupportTests
 	public void testClearCollection() {
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.testClearCollection());
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.testClearCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testClearCollection());
 		this.verifyCollectionEvent(null);
 		assertTrue(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.testClearCollection());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
@@ -1524,28 +1485,28 @@ public class ChangeSupportTests
 	public void testClearCollectionNoChange() {
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertFalse(this.testModel.testClearCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertFalse(this.testModel.testClearCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testClearCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
 
 		this.collectionEvent = null;
 		this.collectionClearedCalled = false;
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertFalse(this.testModel.testClearCollectionNoChange());
 		assertNull(this.collectionEvent);
 		assertFalse(this.collectionClearedCalled);
@@ -1553,7 +1514,7 @@ public class ChangeSupportTests
 
 	public void testSynchronizeCollection1() {
 		CollectionSynchListener csl = new CollectionSynchListener();
-		this.testModel.addCollectionChangeListener(csl);
+		this.testModel.addChangeListener(csl);
 		assertTrue(this.testModel.testSynchronizeCollection1());
 		assertTrue(csl.itemsAdded);
 		assertTrue(csl.itemsRemoved);
@@ -1567,7 +1528,7 @@ public class ChangeSupportTests
 
 	public void testSynchronizeCollection2() {
 		CollectionSynchListener csl = new CollectionSynchListener();
-		this.testModel.addCollectionChangeListener(csl);
+		this.testModel.addChangeListener(csl);
 		assertTrue(this.testModel.testSynchronizeCollection2());
 		assertFalse(csl.itemsAdded);
 		assertFalse(csl.itemsRemoved);
@@ -1579,7 +1540,7 @@ public class ChangeSupportTests
 
 	public void testSynchronizeCollection3() {
 		CollectionSynchListener csl = new CollectionSynchListener();
-		this.testModel.addCollectionChangeListener(csl);
+		this.testModel.addChangeListener(csl);
 		assertTrue(this.testModel.testSynchronizeCollection3());
 		assertTrue(csl.itemsAdded);
 		assertFalse(csl.itemsRemoved);
@@ -1590,23 +1551,27 @@ public class ChangeSupportTests
 		assertTrue(csl.removedItems.isEmpty());
 	}
 
-	class CollectionSynchListener implements CollectionChangeListener {
+	class CollectionSynchListener extends ChangeAdapter {
 		boolean itemsAdded = false;
 		boolean itemsRemoved = false;
 		boolean collectionChanged = false;
 		boolean collectionCleared = false;
 		Collection<Object> addedItems = new ArrayList<Object>();
 		Collection<Object> removedItems = new ArrayList<Object>();
+		@Override
 		public void collectionChanged(CollectionChangeEvent event) {
 			this.collectionChanged = true;
 		}
+		@Override
 		public void collectionCleared(CollectionClearEvent event) {
 			this.collectionCleared = true;
 		}
+		@Override
 		public void itemsAdded(CollectionAddEvent event) {
 			this.itemsAdded = true;
 			CollectionTools.addAll(this.addedItems, event.getItems());
 		}
+		@Override
 		public void itemsRemoved(CollectionRemoveEvent event) {
 			this.itemsRemoved = true;
 			CollectionTools.addAll(this.removedItems, event.getItems());
@@ -1615,31 +1580,21 @@ public class ChangeSupportTests
 
 	public void testHasAnyCollectionChangeListeners() {
 		assertTrue(this.testModel.hasNoCollectionChangeListeners(COLLECTION_NAME));
-		this.testModel.addCollectionChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasAnyCollectionChangeListeners(COLLECTION_NAME));
-		this.testModel.removeCollectionChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasNoCollectionChangeListeners(COLLECTION_NAME));
 
 		assertTrue(this.testModel.hasNoCollectionChangeListeners(COLLECTION_NAME));
-		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.addCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.hasAnyCollectionChangeListeners(COLLECTION_NAME));
-		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this);
+		this.testModel.removeCollectionChangeListener(COLLECTION_NAME, this.changeListener);
 		assertTrue(this.testModel.hasNoCollectionChangeListeners(COLLECTION_NAME));
 	}
 
 	public void testAddNullCollectionListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.addCollectionChangeListener(null);
-		} catch (NullPointerException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-	}
-
-	public void testAddNullCollectionListenerName() {
-		boolean exCaught = false;
-		try {
 			this.testModel.addCollectionChangeListener("foo", null);
 		} catch (NullPointerException ex) {
 			exCaught = true;
@@ -1650,61 +1605,25 @@ public class ChangeSupportTests
 	public void testRemoveBogusCollectionListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.removeCollectionChangeListener(this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addPropertyChangeListener(this);
-		exCaught = false;
-		try {
-			this.testModel.removeCollectionChangeListener(this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addCollectionChangeListener(this);
-		exCaught = false;
-		try {
-			this.testModel.removeCollectionChangeListener(new ChangeSupportTests("dummy"));
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		exCaught = false;
-		try {
-			this.testModel.removeCollectionChangeListener(new CollectionChangeAdapter());
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-	}
-
-	public void testRemoveBogusCollectionListenerName() {
-		boolean exCaught = false;
-		try {
-			this.testModel.removeCollectionChangeListener("foo", this);
+			this.testModel.removeCollectionChangeListener("foo", this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addPropertyChangeListener("foo", this);
+		this.testModel.addPropertyChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeCollectionChangeListener("foo", this);
+			this.testModel.removeCollectionChangeListener("foo", this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addCollectionChangeListener("foo", this);
+		this.testModel.addCollectionChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeCollectionChangeListener("foo", new ChangeSupportTests("dummy"));
+			this.testModel.removeCollectionChangeListener("foo", new CollectionChangeAdapter());
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
@@ -1762,28 +1681,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedListEvent() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedListEvent();
 		this.verifyListAddEvent(ADD_INDEX, ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedListEvent();
 		this.verifyListAddEvent(ADD_INDEX, ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -1792,28 +1711,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedListEventNoChange() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -1822,28 +1741,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedList() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedList();
 		this.verifyListAddEvent(ADD_INDEX, ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedList();
 		this.verifyListAddEvent(ADD_INDEX, ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -1852,28 +1771,28 @@ public class ChangeSupportTests
 	public void testFireItemsAddedListNoChange() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsAddedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsAddedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -1882,28 +1801,28 @@ public class ChangeSupportTests
 	public void testFireItemAddedList() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemAddedList();
 		this.verifyListAddEvent(ADD_INDEX, ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemAddedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemAddedList();
 		this.verifyListAddEvent(ADD_INDEX, ADDED_OBJECT_VALUE);
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemAddedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -1912,28 +1831,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedListEvent() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedListEvent();
 		this.verifyListRemoveEvent(REMOVE_INDEX, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedListEvent();
 		this.verifyListRemoveEvent(REMOVE_INDEX, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -1942,28 +1861,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedListEventNoChange() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -1972,28 +1891,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedList() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedList();
 		this.verifyListRemoveEvent(REMOVE_INDEX, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedList();
 		this.verifyListRemoveEvent(REMOVE_INDEX, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2002,28 +1921,28 @@ public class ChangeSupportTests
 	public void testFireItemsRemovedListNoChange() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsRemovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsRemovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2032,28 +1951,28 @@ public class ChangeSupportTests
 	public void testFireItemRemovedList() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemRemovedList();
 		this.verifyListRemoveEvent(REMOVE_INDEX, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemRemovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemRemovedList();
 		this.verifyListRemoveEvent(REMOVE_INDEX, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemRemovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2062,28 +1981,28 @@ public class ChangeSupportTests
 	public void testFireItemsReplacedListEvent() {
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedListEvent();
 		this.verifyListReplaceEvent(REPLACE_INDEX, ADDED_OBJECT_VALUE, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedListEvent();
 		this.verifyListReplaceEvent(REPLACE_INDEX, ADDED_OBJECT_VALUE, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -2092,28 +2011,28 @@ public class ChangeSupportTests
 	public void testFireItemsReplacedListEventNoChange() {
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -2122,28 +2041,28 @@ public class ChangeSupportTests
 	public void testFireItemsReplacedList() {
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedList();
 		this.verifyListReplaceEvent(REPLACE_INDEX, ADDED_OBJECT_VALUE, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedList();
 		this.verifyListReplaceEvent(REPLACE_INDEX, ADDED_OBJECT_VALUE, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -2152,28 +2071,28 @@ public class ChangeSupportTests
 	public void testFireItemsReplacedListNoChange() {
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsReplacedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsReplacedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -2182,28 +2101,28 @@ public class ChangeSupportTests
 	public void testFireItemReplacedList() {
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemReplacedList();
 		this.verifyListReplaceEvent(REPLACE_INDEX, ADDED_OBJECT_VALUE, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemReplacedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemReplacedList();
 		this.verifyListReplaceEvent(REPLACE_INDEX, ADDED_OBJECT_VALUE, REMOVED_OBJECT_VALUE);
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemReplacedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -2212,28 +2131,28 @@ public class ChangeSupportTests
 	public void testFireItemsMovedListEvent() {
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedListEvent();
 		this.verifyListMoveEvent(TARGET_INDEX, SOURCE_INDEX);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedListEvent();
 		this.verifyListMoveEvent(TARGET_INDEX, SOURCE_INDEX);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedListEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
@@ -2242,28 +2161,28 @@ public class ChangeSupportTests
 	public void testFireItemsMovedListEventNoChange() {
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedListEventNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
@@ -2272,28 +2191,28 @@ public class ChangeSupportTests
 	public void testFireItemsMovedList() {
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedList();
 		this.verifyListMoveEvent(TARGET_INDEX, SOURCE_INDEX);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedList();
 		this.verifyListMoveEvent(TARGET_INDEX, SOURCE_INDEX);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
@@ -2302,28 +2221,28 @@ public class ChangeSupportTests
 	public void testFireItemsMovedListNoChange() {
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemsMovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemsMovedListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
@@ -2332,28 +2251,28 @@ public class ChangeSupportTests
 	public void testFireItemMovedList() {
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireItemMovedList();
 		this.verifyListMoveEvent(TARGET_INDEX, SOURCE_INDEX);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireItemMovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemMovedList();
 		this.verifyListMoveEvent(TARGET_INDEX, SOURCE_INDEX);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireItemMovedList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
@@ -2362,28 +2281,28 @@ public class ChangeSupportTests
 	public void testFireListClearedEvent() {
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireListClearedEvent();
 		this.verifyListClearEvent();
 		assertTrue(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireListClearedEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListClearedEvent();
 		this.verifyListClearEvent();
 		assertTrue(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListClearedEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.listClearedCalled);
@@ -2392,28 +2311,28 @@ public class ChangeSupportTests
 	public void testFireListCleared() {
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireListCleared();
 		this.verifyListClearEvent();
 		assertTrue(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireListCleared();
 		assertNull(this.listEvent);
 		assertFalse(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListCleared();
 		this.verifyListClearEvent();
 		assertTrue(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListCleared();
 		assertNull(this.listEvent);
 		assertFalse(this.listClearedCalled);
@@ -2422,28 +2341,28 @@ public class ChangeSupportTests
 	public void testFireListChangedEvent() {
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireListChangedEvent();
 		this.verifyListChangeEvent();
 		assertTrue(this.listChangedCalled);
 
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireListChangedEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.listChangedCalled);
 
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListChangedEvent();
 		this.verifyListChangeEvent();
 		assertTrue(this.listChangedCalled);
 
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListChangedEvent();
 		assertNull(this.listEvent);
 		assertFalse(this.listChangedCalled);
@@ -2452,28 +2371,28 @@ public class ChangeSupportTests
 	public void testFireListChanged() {
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireListChanged();
 		this.verifyListChangeEvent();
 		assertTrue(this.listChangedCalled);
 
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireListChanged();
 		assertNull(this.listEvent);
 		assertFalse(this.listChangedCalled);
 
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListChanged();
 		this.verifyListChangeEvent();
 		assertTrue(this.listChangedCalled);
 
 		this.listEvent = null;
 		this.listChangedCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testFireListChanged();
 		assertNull(this.listEvent);
 		assertFalse(this.listChangedCalled);
@@ -2482,28 +2401,28 @@ public class ChangeSupportTests
 	public void testAddItemToListIndex() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testAddItemToListIndex();
 		this.verifyListAddEvent(2, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testAddItemToListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemToListIndex();
 		this.verifyListAddEvent(2, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemToListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -2512,28 +2431,28 @@ public class ChangeSupportTests
 	public void testAddItemToList() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testAddItemToList();
 		this.verifyListAddEvent(3, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testAddItemToList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemToList();
 		this.verifyListAddEvent(3, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemToList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -2542,28 +2461,28 @@ public class ChangeSupportTests
 	public void testAddItemsToListIndex() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testAddItemsToListIndex();
 		this.verifyListAddEvent(2, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testAddItemsToListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToListIndex();
 		this.verifyListAddEvent(2, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -2572,28 +2491,28 @@ public class ChangeSupportTests
 	public void testAddItemsToListIndexNoChange() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testAddItemsToListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testAddItemsToListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -2602,28 +2521,28 @@ public class ChangeSupportTests
 	public void testAddItemsToList() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testAddItemsToList();
 		this.verifyListAddEvent(3, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testAddItemsToList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToList();
 		this.verifyListAddEvent(3, "joo");
 		assertTrue(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -2632,28 +2551,28 @@ public class ChangeSupportTests
 	public void testAddItemsToListNoChange() {
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testAddItemsToListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testAddItemsToListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
 
 		this.listEvent = null;
 		this.itemsAddedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testAddItemsToListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsAddedListCalled);
@@ -2662,28 +2581,28 @@ public class ChangeSupportTests
 	public void testRemoveItemFromListIndex() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testRemoveItemFromListIndex();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testRemoveItemFromListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemFromListIndex();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemFromListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2692,28 +2611,28 @@ public class ChangeSupportTests
 	public void testRemoveItemFromList() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testRemoveItemFromList();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testRemoveItemFromList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemFromList();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemFromList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2722,28 +2641,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromListIndex() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromListIndex();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromListIndex();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromListIndex();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2752,28 +2671,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromListIndexNoChange() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromListIndexNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2782,28 +2701,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromList() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromList();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromList();
 		this.verifyListRemoveEvent(1, "bar");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2812,28 +2731,28 @@ public class ChangeSupportTests
 	public void testRemoveItemsFromListNoChange() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testRemoveItemsFromListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRemoveItemsFromListNoChange();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2842,28 +2761,28 @@ public class ChangeSupportTests
 	public void testRetainItemsInList() {
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testRetainItemsInList();
 		this.verifyListRemoveEvent(0, "foo");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testRetainItemsInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRetainItemsInList();
 		this.verifyListRemoveEvent(0, "foo");
 		assertTrue(this.itemsRemovedListCalled);
 
 		this.listEvent = null;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testRetainItemsInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsRemovedListCalled);
@@ -2872,28 +2791,28 @@ public class ChangeSupportTests
 	public void testReplaceItemInList() {
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testReplaceItemInList();
 		this.verifyListReplaceEvent(1, "xxx", "bar");
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testReplaceItemInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testReplaceItemInList();
 		this.verifyListReplaceEvent(1, "xxx", "bar");
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testReplaceItemInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -2902,28 +2821,28 @@ public class ChangeSupportTests
 	public void testSetItemsInList() {
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testSetItemsInList();
 		this.verifyListReplaceEvent(1, "xxx", "bar");
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testSetItemsInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testSetItemsInList();
 		this.verifyListReplaceEvent(1, "xxx", "bar");
 		assertTrue(this.itemsReplacedListCalled);
 
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testSetItemsInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -2932,28 +2851,28 @@ public class ChangeSupportTests
 	public void testMoveItemsInList() {
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testMoveItemsInList();
 		this.verifyListMoveEvent(2, 4, 2);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testMoveItemsInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testMoveItemsInList();
 		this.verifyListMoveEvent(2, 4, 2);
 		assertTrue(this.itemsMovedListCalled);
 
 		this.listEvent = null;
 		this.itemsMovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testMoveItemsInList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsMovedListCalled);
@@ -2962,28 +2881,28 @@ public class ChangeSupportTests
 	public void testClearList() {
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testClearList();
 		this.verifyListClearEvent();
 		assertTrue(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testClearList();
 		assertNull(this.listEvent);
 		assertFalse(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testClearList();
 		this.verifyListClearEvent();
 		assertTrue(this.listClearedCalled);
 
 		this.listEvent = null;
 		this.listClearedCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testClearList();
 		assertNull(this.listEvent);
 		assertFalse(this.listClearedCalled);
@@ -2993,7 +2912,7 @@ public class ChangeSupportTests
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testSynchronizeList();
 		assertNotNull(this.listEvent);
 		assertTrue(this.itemsReplacedListCalled);
@@ -3002,7 +2921,7 @@ public class ChangeSupportTests
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testSynchronizeList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -3011,7 +2930,7 @@ public class ChangeSupportTests
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
 		this.itemsRemovedListCalled = false;
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testSynchronizeList();
 		assertNotNull(this.listEvent);
 		assertTrue(this.itemsReplacedListCalled);
@@ -3020,7 +2939,7 @@ public class ChangeSupportTests
 		this.listEvent = null;
 		this.itemsReplacedListCalled = false;
 		this.itemsRemovedListCalled = false;
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		this.testModel.testSynchronizeList();
 		assertNull(this.listEvent);
 		assertFalse(this.itemsReplacedListCalled);
@@ -3029,31 +2948,21 @@ public class ChangeSupportTests
 
 	public void testHasAnyListChangeListeners() {
 		assertTrue(this.testModel.hasNoListChangeListeners(LIST_NAME));
-		this.testModel.addListChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasAnyListChangeListeners(LIST_NAME));
-		this.testModel.removeListChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasNoListChangeListeners(LIST_NAME));
 
 		assertTrue(this.testModel.hasNoListChangeListeners(LIST_NAME));
-		this.testModel.addListChangeListener(LIST_NAME, this);
+		this.testModel.addListChangeListener(LIST_NAME, this.changeListener);
 		assertTrue(this.testModel.hasAnyListChangeListeners(LIST_NAME));
-		this.testModel.removeListChangeListener(LIST_NAME, this);
+		this.testModel.removeListChangeListener(LIST_NAME, this.changeListener);
 		assertTrue(this.testModel.hasNoListChangeListeners(LIST_NAME));
 	}
 
 	public void testAddNullListListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.addListChangeListener(null);
-		} catch (NullPointerException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-	}
-
-	public void testAddNullListListenerName() {
-		boolean exCaught = false;
-		try {
 			this.testModel.addListChangeListener("foo", null);
 		} catch (NullPointerException ex) {
 			exCaught = true;
@@ -3064,61 +2973,25 @@ public class ChangeSupportTests
 	public void testRemoveBogusListListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.removeListChangeListener(this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addPropertyChangeListener(this);
-		exCaught = false;
-		try {
-			this.testModel.removeListChangeListener(this);
+			this.testModel.removeListChangeListener("foo", this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addListChangeListener(this);
+		this.testModel.addPropertyChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeListChangeListener(new ChangeSupportTests("dummy"));
+			this.testModel.removeListChangeListener("foo", this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
+		this.testModel.addListChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeListChangeListener(new ListChangeAdapter());
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-	}
-
-	public void testRemoveBogusListListenerName() {
-		boolean exCaught = false;
-		try {
-			this.testModel.removeListChangeListener("foo", this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addPropertyChangeListener("foo", this);
-		exCaught = false;
-		try {
-			this.testModel.removeListChangeListener("foo", this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addListChangeListener("foo", this);
-		exCaught = false;
-		try {
-			this.testModel.removeListChangeListener("foo", new ChangeSupportTests("dummy"));
+			this.testModel.removeListChangeListener("foo", new ListChangeAdapter());
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
@@ -3191,28 +3064,28 @@ public class ChangeSupportTests
 	public void testFireNodeAddedTree() {
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireNodeAddedTree();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeAddedCalled);
 
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireNodeAddedTree();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeAddedCalled);
 
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeAddedTree();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeAddedCalled);
 
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeAddedTree();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeAddedCalled);
@@ -3221,28 +3094,28 @@ public class ChangeSupportTests
 	public void testFireNodeAddedTreeEvent() {
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireNodeAddedTreeEvent();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeAddedCalled);
 
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireNodeAddedTreeEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeAddedCalled);
 
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeAddedTreeEvent();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeAddedCalled);
 
 		this.treeEvent = null;
 		this.nodeAddedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeAddedTreeEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeAddedCalled);
@@ -3251,28 +3124,28 @@ public class ChangeSupportTests
 	public void testFireNodeRemovedTreeEvent() {
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireNodeRemovedTreeEvent();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeRemovedCalled);
 
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireNodeRemovedTreeEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeRemovedCalled);
 
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeRemovedTreeEvent();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeRemovedCalled);
 
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeRemovedTreeEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeRemovedCalled);
@@ -3281,28 +3154,28 @@ public class ChangeSupportTests
 	public void testFireNodeRemovedTree() {
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireNodeRemovedTree();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeRemovedCalled);
 
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireNodeRemovedTree();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeRemovedCalled);
 
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeRemovedTree();
 		this.verifyTreeEvent(OBJECT_PATH);
 		assertTrue(this.nodeRemovedCalled);
 
 		this.treeEvent = null;
 		this.nodeRemovedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireNodeRemovedTree();
 		assertNull(this.treeEvent);
 		assertFalse(this.nodeRemovedCalled);
@@ -3311,28 +3184,28 @@ public class ChangeSupportTests
 	public void testFireTreeClearedEvent() {
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireTreeClearedEvent();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeClearedCalled);
 
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireTreeClearedEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeClearedCalled);
 
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeClearedEvent();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeClearedCalled);
 
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeClearedEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeClearedCalled);
@@ -3341,28 +3214,28 @@ public class ChangeSupportTests
 	public void testFireTreeCleared() {
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireTreeCleared();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeClearedCalled);
 
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireTreeCleared();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeClearedCalled);
 
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeCleared();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeClearedCalled);
 
 		this.treeEvent = null;
 		this.treeClearedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeCleared();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeClearedCalled);
@@ -3371,28 +3244,28 @@ public class ChangeSupportTests
 	public void testFireTreeChangedEvent() {
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireTreeChangedEvent();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeChangedCalled);
 
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireTreeChangedEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeChangedCalled);
 
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeChangedEvent();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeChangedCalled);
 
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeChangedEvent();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeChangedCalled);
@@ -3401,28 +3274,28 @@ public class ChangeSupportTests
 	public void testFireTreeChanged() {
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		this.testModel.testFireTreeChanged();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeChangedCalled);
 
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		this.testModel.testFireTreeChanged();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeChangedCalled);
 
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeChanged();
 		this.verifyTreeEvent(null);
 		assertTrue(this.treeChangedCalled);
 
 		this.treeEvent = null;
 		this.treeChangedCalled = false;
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		this.testModel.testFireTreeChanged();
 		assertNull(this.treeEvent);
 		assertFalse(this.treeChangedCalled);
@@ -3430,31 +3303,21 @@ public class ChangeSupportTests
 
 	public void testHasAnyTreeChangeListeners() {
 		assertTrue(this.testModel.hasNoTreeChangeListeners(TREE_NAME));
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasAnyTreeChangeListeners(TREE_NAME));
-		this.testModel.removeTreeChangeListener(this);
+		this.testModel.removeChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasNoTreeChangeListeners(TREE_NAME));
 
 		assertTrue(this.testModel.hasNoTreeChangeListeners(TREE_NAME));
-		this.testModel.addTreeChangeListener(TREE_NAME, this);
+		this.testModel.addTreeChangeListener(TREE_NAME, this.changeListener);
 		assertTrue(this.testModel.hasAnyTreeChangeListeners(TREE_NAME));
-		this.testModel.removeTreeChangeListener(TREE_NAME, this);
+		this.testModel.removeTreeChangeListener(TREE_NAME, this.changeListener);
 		assertTrue(this.testModel.hasNoTreeChangeListeners(TREE_NAME));
 	}
 
 	public void testAddNullTreeListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.addTreeChangeListener(null);
-		} catch (NullPointerException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-	}
-
-	public void testAddNullTreeListenerName() {
-		boolean exCaught = false;
-		try {
 			this.testModel.addTreeChangeListener("foo", null);
 		} catch (NullPointerException ex) {
 			exCaught = true;
@@ -3465,61 +3328,25 @@ public class ChangeSupportTests
 	public void testRemoveBogusTreeListener() {
 		boolean exCaught = false;
 		try {
-			this.testModel.removeTreeChangeListener(this);
+			this.testModel.removeTreeChangeListener("foo", this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addPropertyChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeTreeChangeListener(this);
+			this.testModel.removeTreeChangeListener("foo", this.changeListener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
 		assertTrue(exCaught);
 
-		this.testModel.addTreeChangeListener(this);
+		this.testModel.addTreeChangeListener("foo", this.changeListener);
 		exCaught = false;
 		try {
-			this.testModel.removeTreeChangeListener(new ChangeSupportTests("dummy"));
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		exCaught = false;
-		try {
-			this.testModel.removeTreeChangeListener(new TreeChangeAdapter());
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-	}
-
-	public void testRemoveBogusTreeListenerName() {
-		boolean exCaught = false;
-		try {
-			this.testModel.removeTreeChangeListener("foo", this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addPropertyChangeListener("foo", this);
-		exCaught = false;
-		try {
-			this.testModel.removeTreeChangeListener("foo", this);
-		} catch (IllegalArgumentException ex) {
-			exCaught = true;
-		}
-		assertTrue(exCaught);
-
-		this.testModel.addTreeChangeListener("foo", this);
-		exCaught = false;
-		try {
-			this.testModel.removeTreeChangeListener("foo", new ChangeSupportTests("dummy"));
+			this.testModel.removeTreeChangeListener("foo", new TreeChangeAdapter());
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
 		}
@@ -3569,7 +3396,7 @@ public class ChangeSupportTests
 		c2.add("foo");
 		c2.add("bar");
 		c2.add("baz");
-		assertTrue(this.testModel.testElementsAreEqual(c1.iterator(), c2.iterator()));
+		assertTrue(this.testModel.testElementsAreEqual(c1, c2));
 	}
 
 	public void testElementsAreDifferent() {
@@ -3581,7 +3408,7 @@ public class ChangeSupportTests
 		c2.add("baz");
 		c2.add("bar");
 		c2.add("foo");
-		assertTrue(this.testModel.testElementsAreDifferent(c1.iterator(), c2.iterator()));
+		assertTrue(this.testModel.testElementsAreDifferent(c1, c2));
 	}
 
 
@@ -3669,13 +3496,13 @@ public class ChangeSupportTests
 
 	public void testAbstractModelClone() {
 		assertFalse(this.testModel.hasAnyPropertyChangeListeners(PROPERTY_NAME));
-		this.testModel.addPropertyChangeListener(this);
+		this.testModel.addChangeListener(this.changeListener);
 		assertTrue(this.testModel.hasAnyPropertyChangeListeners(PROPERTY_NAME));
 
 		// verify that the clone does not have any listeners
 		TestModel clone = this.testModel.clone();
 		assertFalse(clone.hasAnyPropertyChangeListeners(PROPERTY_NAME));
-		clone.addPropertyChangeListener(this);
+		clone.addChangeListener(this.changeListener);
 		assertTrue(clone.hasAnyPropertyChangeListeners(PROPERTY_NAME));
 		// check original
 		assertTrue(this.testModel.hasAnyPropertyChangeListeners(PROPERTY_NAME));
@@ -3702,73 +3529,76 @@ public class ChangeSupportTests
 
 	// ********** listener implementations **********
 
-	public void stateChanged(StateChangeEvent e) {
-		this.stateChangedCalled = true;
-		this.stateChangeEvent = e;
-	}
-
-	public void propertyChanged(PropertyChangeEvent e) {
-		this.propertyChangeCalled = true;
-		this.propertyChangeEvent = e;
-	}
-
-	public void itemsAdded(CollectionAddEvent e) {
-		this.itemsAddedCollectionCalled = true;
-		this.collectionEvent = e;
-	}
-	public void itemsRemoved(CollectionRemoveEvent e) {
-		this.itemsRemovedCollectionCalled = true;
-		this.collectionEvent = e;
-	}
-	public void collectionCleared(CollectionClearEvent e) {
-		this.collectionClearedCalled = true;
-		this.collectionEvent = e;
-	}
-	public void collectionChanged(CollectionChangeEvent e) {
-		this.collectionChangedCalled = true;
-		this.collectionEvent = e;
-	}
-
-	public void itemsAdded(ListAddEvent e) {
-		this.itemsAddedListCalled = true;
-		this.listEvent = e;
-	}
-	public void itemsRemoved(ListRemoveEvent e) {
-		this.itemsRemovedListCalled = true;
-		this.listEvent = e;
-	}
-	public void itemsReplaced(ListReplaceEvent e) {
-		this.itemsReplacedListCalled = true;
-		this.listEvent = e;
-	}
-	public void itemsMoved(ListMoveEvent e) {
-		this.itemsMovedListCalled = true;
-		this.listEvent = e;
-	}
-	public void listCleared(ListClearEvent e) {
-		this.listClearedCalled = true;
-		this.listEvent = e;
-	}
-	public void listChanged(ListChangeEvent e) {
-		this.listChangedCalled = true;
-		this.listEvent = e;
-	}
-
-	public void nodeAdded(TreeAddEvent e) {
-		this.nodeAddedCalled = true;
-		this.treeEvent = e;
-	}
-	public void nodeRemoved(TreeRemoveEvent e) {
-		this.nodeRemovedCalled = true;
-		this.treeEvent = e;
-	}
-	public void treeCleared(TreeClearEvent e) {
-		this.treeClearedCalled = true;
-		this.treeEvent = e;
-	}
-	public void treeChanged(TreeChangeEvent e) {
-		this.treeChangedCalled = true;
-		this.treeEvent = e;
+	class Adapter implements ChangeListener {
+		public void stateChanged(StateChangeEvent e) {
+			ChangeSupportTests.this.stateChangedCalled = true;
+			ChangeSupportTests.this.stateChangeEvent = e;
+		}
+	
+		public void propertyChanged(PropertyChangeEvent e) {
+			ChangeSupportTests.this.propertyChangeCalled = true;
+			ChangeSupportTests.this.propertyChangeEvent = e;
+		}
+	
+	
+		public void itemsAdded(CollectionAddEvent e) {
+			ChangeSupportTests.this.itemsAddedCollectionCalled = true;
+			ChangeSupportTests.this.collectionEvent = e;
+		}
+		public void itemsRemoved(CollectionRemoveEvent e) {
+			ChangeSupportTests.this.itemsRemovedCollectionCalled = true;
+			ChangeSupportTests.this.collectionEvent = e;
+		}
+		public void collectionCleared(CollectionClearEvent e) {
+			ChangeSupportTests.this.collectionClearedCalled = true;
+			ChangeSupportTests.this.collectionEvent = e;
+		}
+		public void collectionChanged(CollectionChangeEvent e) {
+			ChangeSupportTests.this.collectionChangedCalled = true;
+			ChangeSupportTests.this.collectionEvent = e;
+		}
+	
+		public void itemsAdded(ListAddEvent e) {
+			ChangeSupportTests.this.itemsAddedListCalled = true;
+			ChangeSupportTests.this.listEvent = e;
+		}
+		public void itemsRemoved(ListRemoveEvent e) {
+			ChangeSupportTests.this.itemsRemovedListCalled = true;
+			ChangeSupportTests.this.listEvent = e;
+		}
+		public void itemsReplaced(ListReplaceEvent e) {
+			ChangeSupportTests.this.itemsReplacedListCalled = true;
+			ChangeSupportTests.this.listEvent = e;
+		}
+		public void itemsMoved(ListMoveEvent e) {
+			ChangeSupportTests.this.itemsMovedListCalled = true;
+			ChangeSupportTests.this.listEvent = e;
+		}
+		public void listCleared(ListClearEvent e) {
+			ChangeSupportTests.this.listClearedCalled = true;
+			ChangeSupportTests.this.listEvent = e;
+		}
+		public void listChanged(ListChangeEvent e) {
+			ChangeSupportTests.this.listChangedCalled = true;
+			ChangeSupportTests.this.listEvent = e;
+		}
+	
+		public void nodeAdded(TreeAddEvent e) {
+			ChangeSupportTests.this.nodeAddedCalled = true;
+			ChangeSupportTests.this.treeEvent = e;
+		}
+		public void nodeRemoved(TreeRemoveEvent e) {
+			ChangeSupportTests.this.nodeRemovedCalled = true;
+			ChangeSupportTests.this.treeEvent = e;
+		}
+		public void treeCleared(TreeClearEvent e) {
+			ChangeSupportTests.this.treeClearedCalled = true;
+			ChangeSupportTests.this.treeEvent = e;
+		}
+		public void treeChanged(TreeChangeEvent e) {
+			ChangeSupportTests.this.treeChangedCalled = true;
+			ChangeSupportTests.this.treeEvent = e;
+		}
 	}
 
 
@@ -4332,12 +4162,12 @@ public class ChangeSupportTests
 			return this.valuesAreEqual(value1, value2);
 		}
 
-		public boolean testElementsAreDifferent(Iterator<?> iterator1, Iterator<?> iterator2) {
-			return this.getChangeSupport().elementsAreDifferent(iterator1, iterator2);
+		public boolean testElementsAreDifferent(Iterable<?> iterable1, Iterable<?> iterable2) {
+			return this.getChangeSupport().elementsAreDifferent(iterable1, iterable2);
 		}
 
-		public boolean testElementsAreEqual(Iterator<?> iterator1, Iterator<?> iterator2) {
-			return this.getChangeSupport().elementsAreEqual(iterator1, iterator2);
+		public boolean testElementsAreEqual(Iterable<?> iterable1, Iterable<?> iterable2) {
+			return this.getChangeSupport().elementsAreEqual(iterable1, iterable2);
 		}
 
 		@Override
@@ -4555,15 +4385,11 @@ public class ChangeSupportTests
 	 */
 	private static class LocalB
 		extends AbstractModel
-		implements StateChangeListener, PropertyChangeListener, CollectionChangeListener, ListChangeListener, TreeChangeListener
+		implements ChangeListener
 	{
 		LocalB(LocalA localA) {
 			super();
-			localA.addStateChangeListener(this);
-			localA.addPropertyChangeListener(this);
-			localA.addCollectionChangeListener(this);
-			localA.addListChangeListener(this);
-			localA.addTreeChangeListener(this);
+			localA.addChangeListener(this);
 		}
 
 		public void stateChanged(StateChangeEvent e) {
@@ -4609,7 +4435,7 @@ public class ChangeSupportTests
 	 */
 	private static class LocalC
 		extends AbstractModel
-		implements StateChangeListener, PropertyChangeListener, CollectionChangeListener, ListChangeListener, TreeChangeListener
+		implements ChangeListener
 	{
 		private LocalA localA;
 		private LocalB localB;
@@ -4620,18 +4446,10 @@ public class ChangeSupportTests
 			this.localA = localA;
 			this.localB = localB;
 
-			localA.addStateChangeListener(this);
-			localA.addPropertyChangeListener(this);
-			localA.addCollectionChangeListener(this);
-			localA.addListChangeListener(this);
-			localA.addTreeChangeListener(this);
+			localA.addChangeListener(this);
 			this.listeningToLocalA = true;
 
-			localB.addStateChangeListener(this);
-			localB.addPropertyChangeListener(this);
-			localB.addCollectionChangeListener(this);
-			localB.addListChangeListener(this);
-			localB.addTreeChangeListener(this);
+			localB.addChangeListener(this);
 		}
 		boolean isListeningToLocalA() {
 			return this.listeningToLocalA;
@@ -4644,7 +4462,7 @@ public class ChangeSupportTests
 					throw new IllegalStateException(ISE_MESSAGE);
 				}
 			} else if (source == this.localB) {
-				this.localA.removeStateChangeListener(this);
+				this.localA.removeChangeListener(this);
 				this.listeningToLocalA = false;
 			} else {
 				throw new IllegalStateException("bogus event source: " + source);
@@ -4658,7 +4476,7 @@ public class ChangeSupportTests
 					throw new IllegalStateException(ISE_MESSAGE);
 				}
 			} else if (source == this.localB) {
-				this.localA.removePropertyChangeListener(this);
+				this.localA.removeChangeListener(this);
 				this.listeningToLocalA = false;
 			} else {
 				throw new IllegalStateException("bogus event source: " + source);
@@ -4672,7 +4490,7 @@ public class ChangeSupportTests
 					throw new IllegalStateException(ISE_MESSAGE);
 				}
 			} else if (source == this.localB) {
-				this.localA.removeCollectionChangeListener(this);
+				this.localA.removeChangeListener(this);
 				this.listeningToLocalA = false;
 			} else {
 				throw new IllegalStateException("bogus event source: " + source);
@@ -4689,7 +4507,7 @@ public class ChangeSupportTests
 					throw new IllegalStateException(ISE_MESSAGE);
 				}
 			} else if (source == this.localB) {
-				this.localA.removeListChangeListener(this);
+				this.localA.removeChangeListener(this);
 				this.listeningToLocalA = false;
 			} else {
 				throw new IllegalStateException("bogus event source: " + source);
@@ -4708,7 +4526,7 @@ public class ChangeSupportTests
 					throw new IllegalStateException(ISE_MESSAGE);
 				}
 			} else if (source == this.localB) {
-				this.localA.removeTreeChangeListener(this);
+				this.localA.removeChangeListener(this);
 				this.listeningToLocalA = false;
 			} else {
 				throw new IllegalStateException("bogus event source: " + source);
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/NewEventTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/NewEventTests.java
index 6f1bedec80..4e37978c64 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/NewEventTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/NewEventTests.java
@@ -9,13 +9,16 @@
  ******************************************************************************/
 package org.eclipse.jpt.utility.tests.internal.model;
 
+import java.util.EventListener;
+
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.CollectionTools;
+import org.eclipse.jpt.utility.internal.ListenerList;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.ChangeSupport;
 import org.eclipse.jpt.utility.model.Model;
 import org.eclipse.jpt.utility.model.event.ChangeEvent;
-import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
 /**
@@ -94,7 +97,7 @@ public class NewEventTests extends TestCase {
 		void removeFooChangeListener(FooChangeListener listener);
 	}
 
-	interface FooChangeListener extends ChangeListener {
+	interface FooChangeListener extends EventListener {
 		void fooChanged(FooChangeEvent event);
 	}
 
@@ -148,8 +151,12 @@ public class NewEventTests extends TestCase {
 		public boolean hasAnyFooChangeListeners() {
 			return this.hasAnyListeners(FOO_CHANGE_LISTENER_CLASS);
 		}
+		private ListenerList<FooChangeListener> getFooChangeListenerList() {
+			return this.getListenerList(FOO_CHANGE_LISTENER_CLASS);
+		}
 		private FooChangeListener[] getFooChangeListeners() {
-			return (FooChangeListener[]) this.getListeners(FOO_CHANGE_LISTENER_CLASS);
+			ListenerList<FooChangeListener> listenerList = this.getFooChangeListenerList();
+			return (listenerList == null) ? null : listenerList.getListeners();
 		}
 		private boolean hasFooChangeListener(FooChangeListener listener) {
 			return CollectionTools.contains(this.getFooChangeListeners(), listener);
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/SingleAspectChangeSupportTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/SingleAspectChangeSupportTests.java
index d0be829218..f934ec18ce 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/SingleAspectChangeSupportTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/SingleAspectChangeSupportTests.java
@@ -37,7 +37,7 @@ public class SingleAspectChangeSupportTests extends TestCase {
 		boolean exCaught = false;
 		PropertyChangeListener listener = new PropertyChangeAdapter();
 		try {
-			model.addPropertyChangeListener(listener);
+			model.addPropertyChangeListener("foo", listener);
 			fail("bogus listener: " + listener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
@@ -63,7 +63,7 @@ public class SingleAspectChangeSupportTests extends TestCase {
 		boolean exCaught = false;
 		CollectionChangeListener listener = new CollectionChangeAdapter();
 		try {
-			model.addCollectionChangeListener(listener);
+			model.addCollectionChangeListener("foo", listener);
 			fail("bogus listener: " + listener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
@@ -89,7 +89,7 @@ public class SingleAspectChangeSupportTests extends TestCase {
 		boolean exCaught = false;
 		ListChangeListener listener = new ListChangeAdapter();
 		try {
-			model.addListChangeListener(listener);
+			model.addListChangeListener("foo", listener);
 			fail("bogus listener: " + listener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
@@ -115,7 +115,7 @@ public class SingleAspectChangeSupportTests extends TestCase {
 		boolean exCaught = false;
 		TreeChangeListener listener = new TreeChangeAdapter();
 		try {
-			model.addTreeChangeListener(listener);
+			model.addTreeChangeListener("foo", listener);
 			fail("bogus listener: " + listener);
 		} catch (IllegalArgumentException ex) {
 			exCaught = true;
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveCollectionChangeListenerTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveCollectionChangeListenerTests.java
index 06755e5244..76a759d76f 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveCollectionChangeListenerTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveCollectionChangeListenerTests.java
@@ -45,22 +45,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		return ReflectiveChangeListener.buildCollectionChangeListener(target, "itemAddedSingleArgument", "itemRemovedSingleArgument", "collectionClearedSingleArgument", "collectionChangedSingleArgument");
 	}
 
-	public void testItemAddedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildZeroArgumentListener(target));
-		testModel.addString(string);
-		assertTrue(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.collectionClearedZeroArgumentFlag);
-		assertFalse(target.collectionClearedSingleArgumentFlag);
-		assertFalse(target.collectionChangedZeroArgumentFlag);
-		assertFalse(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testItemAddedZeroArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -77,22 +61,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		assertFalse(target.collectionChangedSingleArgumentFlag);
 	}
 
-	public void testItemAddedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildSingleArgumentListener(target));
-		testModel.addString(string);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertTrue(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.collectionClearedZeroArgumentFlag);
-		assertFalse(target.collectionClearedSingleArgumentFlag);
-		assertFalse(target.collectionChangedZeroArgumentFlag);
-		assertFalse(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testItemAddedSingleArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -109,23 +77,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		assertFalse(target.collectionChangedSingleArgumentFlag);
 	}
 
-	public void testItemRemovedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildZeroArgumentListener(target));
-		testModel.removeString(string);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertTrue(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.collectionClearedZeroArgumentFlag);
-		assertFalse(target.collectionClearedSingleArgumentFlag);
-		assertFalse(target.collectionChangedZeroArgumentFlag);
-		assertFalse(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testItemRemovedZeroArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -143,23 +94,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		assertFalse(target.collectionChangedSingleArgumentFlag);
 	}
 
-	public void testItemRemovedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildSingleArgumentListener(target));
-		testModel.removeString(string);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertTrue(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.collectionClearedZeroArgumentFlag);
-		assertFalse(target.collectionClearedSingleArgumentFlag);
-		assertFalse(target.collectionChangedZeroArgumentFlag);
-		assertFalse(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testItemRemovedSingleArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -177,23 +111,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		assertFalse(target.collectionChangedSingleArgumentFlag);
 	}
 
-	public void testCollectionClearedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildZeroArgumentListener(target));
-		testModel.clearStrings();
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertTrue(target.collectionClearedZeroArgumentFlag);
-		assertFalse(target.collectionClearedSingleArgumentFlag);
-		assertFalse(target.collectionChangedZeroArgumentFlag);
-		assertFalse(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testCollectionClearedZeroArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -211,23 +128,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		assertFalse(target.collectionChangedSingleArgumentFlag);
 	}
 
-	public void testCollectionClearedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildSingleArgumentListener(target));
-		testModel.clearStrings();
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.collectionClearedZeroArgumentFlag);
-		assertTrue(target.collectionClearedSingleArgumentFlag);
-		assertFalse(target.collectionChangedZeroArgumentFlag);
-		assertFalse(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testCollectionClearedSingleArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -245,23 +145,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		assertFalse(target.collectionChangedSingleArgumentFlag);
 	}
 
-	public void testCollectionChangedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildZeroArgumentListener(target));
-		testModel.replaceStrings(new String[] {"bar", "baz"});
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.collectionClearedZeroArgumentFlag);
-		assertFalse(target.collectionClearedSingleArgumentFlag);
-		assertTrue(target.collectionChangedZeroArgumentFlag);
-		assertFalse(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testCollectionChangedZeroArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -279,23 +162,6 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		assertFalse(target.collectionChangedSingleArgumentFlag);
 	}
 
-	public void testCollectionChangedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_COLLECTION, string);
-		testModel.addCollectionChangeListener(this.buildSingleArgumentListener(target));
-		testModel.replaceStrings(new String[] {"bar", "baz"});
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.collectionClearedZeroArgumentFlag);
-		assertFalse(target.collectionClearedSingleArgumentFlag);
-		assertFalse(target.collectionChangedZeroArgumentFlag);
-		assertTrue(target.collectionChangedSingleArgumentFlag);
-	}
-
 	public void testCollectionChangedSingleArgumentNamedCollection() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -353,7 +219,7 @@ public class ReflectiveCollectionChangeListenerTests extends TestCase {
 		// build a COLLECTION change listener and hack it so we
 		// can add it as a LIST change listener
 		Object listener = ReflectiveChangeListener.buildCollectionChangeListener(target, "collectionEventSingleArgument");
-		testModel.addListChangeListener((ListChangeListener) listener);
+		testModel.addListChangeListener("bogus list", (ListChangeListener) listener);
 
 		boolean exCaught = false;
 		try {
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveListChangeListenerTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveListChangeListenerTests.java
index 10e654c583..ad8b76b362 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveListChangeListenerTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveListChangeListenerTests.java
@@ -47,26 +47,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		return ReflectiveChangeListener.buildListChangeListener(target, "itemAddedSingleArgument", "itemRemovedSingleArgument", "itemReplacedSingleArgument", "itemMovedSingleArgument", "listClearedSingleArgument", "listChangedSingleArgument");
 	}
 
-	public void testItemAddedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, string, 0);
-		testModel.addListChangeListener(this.buildZeroArgumentListener(target));
-		testModel.addString(string);
-		assertTrue(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemAddedZeroArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -87,26 +67,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testItemAddedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, string, 0);
-		testModel.addListChangeListener(this.buildSingleArgumentListener(target));
-		testModel.addString(string);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertTrue(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemAddedSingleArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -127,27 +87,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testItemRemovedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, string, 0);
-		testModel.addListChangeListener(this.buildZeroArgumentListener(target));
-		testModel.removeString(string);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertTrue(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemRemovedZeroArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -169,27 +108,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testItemRemovedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, string, 0);
-		testModel.addListChangeListener(this.buildSingleArgumentListener(target));
-		testModel.removeString(string);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertTrue(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemRemovedSingleArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -211,28 +129,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testItemReplacedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String oldString = "foo";
-		String newString = "bar";
-		testModel.addString(oldString);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, newString, 0, oldString);
-		testModel.addListChangeListener(this.buildZeroArgumentListener(target));
-		testModel.replaceString(oldString, newString);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertTrue(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemReplacedZeroArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String oldString = "foo";
@@ -255,28 +151,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testItemReplacedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String oldString = "foo";
-		String newString = "bar";
-		testModel.addString(oldString);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, newString, 0, oldString);
-		testModel.addListChangeListener(this.buildSingleArgumentListener(target));
-		testModel.replaceString(oldString, newString);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertTrue(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemReplacedSingleArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String oldString = "foo";
@@ -299,29 +173,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testItemMovedZeroArgument() {
-		TestModel testModel = new TestModel();
-		testModel.addString("zero");
-		testModel.addString("one");
-		testModel.addString("two");
-		testModel.addString("three");
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, 0, 2);
-		testModel.addListChangeListener(this.buildZeroArgumentListener(target));
-		testModel.moveString(0, 2);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertTrue(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemMovedZeroArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		testModel.addString("zero");
@@ -345,29 +196,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testItemMovedSingleArgument() {
-		TestModel testModel = new TestModel();
-		testModel.addString("zero");
-		testModel.addString("one");
-		testModel.addString("two");
-		testModel.addString("three");
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, 0, 2);
-		testModel.addListChangeListener(this.buildSingleArgumentListener(target));
-		testModel.moveString(0, 2);
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertTrue(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testItemMovedSingleArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		testModel.addString("zero");
@@ -391,27 +219,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testListClearedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, null, -1);
-		testModel.addListChangeListener(this.buildZeroArgumentListener(target));
-		testModel.clearStrings();
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertTrue(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testListClearedZeroArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -433,27 +240,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testListClearedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, null, -1);
-		testModel.addListChangeListener(this.buildSingleArgumentListener(target));
-		testModel.clearStrings();
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertTrue(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testListClearedSingleArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -475,27 +261,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testListChangedZeroArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, null, -1);
-		testModel.addListChangeListener(this.buildZeroArgumentListener(target));
-		testModel.replaceAllStrings(new String[] {"bar", "baz"});
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertTrue(target.listChangedZeroArgumentFlag);
-		assertFalse(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testListChangedZeroArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -517,27 +282,6 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		assertFalse(target.listChangedSingleArgumentFlag);
 	}
 
-	public void testListChangedSingleArgument() {
-		TestModel testModel = new TestModel();
-		String string = "foo";
-		testModel.addString(string);
-		Target target = new Target(testModel, TestModel.STRINGS_LIST, null, -1);
-		testModel.addListChangeListener(this.buildSingleArgumentListener(target));
-		testModel.replaceAllStrings(new String[] {"bar", "baz"});
-		assertFalse(target.itemAddedZeroArgumentFlag);
-		assertFalse(target.itemAddedSingleArgumentFlag);
-		assertFalse(target.itemRemovedZeroArgumentFlag);
-		assertFalse(target.itemRemovedSingleArgumentFlag);
-		assertFalse(target.itemReplacedZeroArgumentFlag);
-		assertFalse(target.itemReplacedSingleArgumentFlag);
-		assertFalse(target.itemMovedZeroArgumentFlag);
-		assertFalse(target.itemMovedSingleArgumentFlag);
-		assertFalse(target.listClearedZeroArgumentFlag);
-		assertFalse(target.listClearedSingleArgumentFlag);
-		assertFalse(target.listChangedZeroArgumentFlag);
-		assertTrue(target.listChangedSingleArgumentFlag);
-	}
-
 	public void testListChangedSingleArgumentNamedList() {
 		TestModel testModel = new TestModel();
 		String string = "foo";
@@ -599,7 +343,7 @@ public class ReflectiveListChangeListenerTests extends TestCase {
 		// build a LIST change listener and hack it so we
 		// can add it as a COLLECTION change listener
 		Object listener = ReflectiveChangeListener.buildListChangeListener(target, "listEventSingleArgument");
-		testModel.addCollectionChangeListener((CollectionChangeListener) listener);
+		testModel.addCollectionChangeListener("bogus collection", (CollectionChangeListener) listener);
 
 		boolean exCaught = false;
 		try {
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectivePropertyChangeListenerTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectivePropertyChangeListenerTests.java
index 4aa389e710..59d6e8dbce 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectivePropertyChangeListenerTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectivePropertyChangeListenerTests.java
@@ -25,15 +25,6 @@ public class ReflectivePropertyChangeListenerTests extends TestCase {
 		super(name);
 	}
 
-	public void testZeroArgument() {
-		TestModel testModel = new TestModel(7);
-		Target target = new Target(testModel, TestModel.VALUE_PROPERTY, 7, 99);
-		testModel.addPropertyChangeListener(ReflectiveChangeListener.buildPropertyChangeListener(target, "propertyChangedZeroArgument"));
-		testModel.setValue(99);
-		assertTrue(target.zeroArgumentFlag);
-		assertFalse(target.singleArgumentFlag);
-	}
-
 	public void testZeroArgumentNamedProperty() {
 		TestModel testModel = new TestModel(7);
 		Target target = new Target(testModel, TestModel.VALUE_PROPERTY, 7, 99);
@@ -43,15 +34,6 @@ public class ReflectivePropertyChangeListenerTests extends TestCase {
 		assertFalse(target.singleArgumentFlag);
 	}
 
-	public void testSingleArgument() {
-		TestModel testModel = new TestModel(7);
-		Target target = new Target(testModel, TestModel.VALUE_PROPERTY, 7, 99);
-		testModel.addPropertyChangeListener(ReflectiveChangeListener.buildPropertyChangeListener(target, "propertyChangedSingleArgument"));
-		testModel.setValue(99);
-		assertFalse(target.zeroArgumentFlag);
-		assertTrue(target.singleArgumentFlag);
-	}
-
 	/**
 	 * test method that has more general method parameter type
 	 */
@@ -59,7 +41,7 @@ public class ReflectivePropertyChangeListenerTests extends TestCase {
 		TestModel testModel = new TestModel(7);
 		Target target = new Target(testModel, TestModel.VALUE_PROPERTY, 7, 99);
 		Method method = ClassTools.method(target, "propertyChangedSingleArgument2", new Class[] {Object.class});
-		testModel.addPropertyChangeListener(ReflectiveChangeListener.buildPropertyChangeListener(target, method));
+		testModel.addPropertyChangeListener(TestModel.VALUE_PROPERTY, ReflectiveChangeListener.buildPropertyChangeListener(target, method));
 		testModel.setValue(99);
 		assertFalse(target.zeroArgumentFlag);
 		assertTrue(target.singleArgumentFlag);
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveStateChangeListenerTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveStateChangeListenerTests.java
index 931b46f209..4848960509 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveStateChangeListenerTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveStateChangeListenerTests.java
@@ -62,7 +62,7 @@ public class ReflectiveStateChangeListenerTests extends TestCase {
 		// build a STATE change listener and hack it so we
 		// can add it as a PROPERTY change listener
 		Object listener = ReflectiveChangeListener.buildStateChangeListener(target, "stateChangedSingleArgument");
-		testModel.addPropertyChangeListener((PropertyChangeListener) listener);
+		testModel.addPropertyChangeListener("value", (PropertyChangeListener) listener);
 
 		boolean exCaught = false;
 		try {
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveTreeChangeListenerTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveTreeChangeListenerTests.java
index 415796c6aa..52581adaa4 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveTreeChangeListenerTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/listener/ReflectiveTreeChangeListenerTests.java
@@ -47,21 +47,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		return ReflectiveChangeListener.buildTreeChangeListener(target, "nodeAddedSingleArgument", "nodeRemovedSingleArgument", "treeClearedSingleArgument", "treeChangedSingleArgument");
 	}
 
-	public void testNodeAddedZeroArgument() {
-		TestModel testModel = new TestModel("root");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "child"});
-		testModel.addTreeChangeListener(this.buildZeroArgumentListener(target));
-		testModel.addNode("root", "child");
-		assertTrue(target.nodeAddedZeroArgumentFlag);
-		assertFalse(target.nodeAddedSingleArgumentFlag);
-		assertFalse(target.nodeRemovedZeroArgumentFlag);
-		assertFalse(target.nodeRemovedSingleArgumentFlag);
-		assertFalse(target.treeClearedZeroArgumentFlag);
-		assertFalse(target.treeClearedSingleArgumentFlag);
-		assertFalse(target.treeChangedZeroArgumentFlag);
-		assertFalse(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testNodeAddedZeroArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "child"});
@@ -77,21 +62,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		assertFalse(target.treeChangedSingleArgumentFlag);
 	}
 
-	public void testNodeAddedSingleArgument() {
-		TestModel testModel = new TestModel("root");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "child"});
-		testModel.addTreeChangeListener(this.buildSingleArgumentListener(target));
-		testModel.addNode("root", "child");
-		assertFalse(target.nodeAddedZeroArgumentFlag);
-		assertTrue(target.nodeAddedSingleArgumentFlag);
-		assertFalse(target.nodeRemovedZeroArgumentFlag);
-		assertFalse(target.nodeRemovedSingleArgumentFlag);
-		assertFalse(target.treeClearedZeroArgumentFlag);
-		assertFalse(target.treeClearedSingleArgumentFlag);
-		assertFalse(target.treeChangedZeroArgumentFlag);
-		assertFalse(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testNodeAddedSingleArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "child"});
@@ -107,22 +77,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		assertFalse(target.treeChangedSingleArgumentFlag);
 	}
 
-	public void testNodeRemovedZeroArgument() {
-		TestModel testModel = new TestModel("root");
-		testModel.addNode("root", "child");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "child"});
-		testModel.addTreeChangeListener(this.buildZeroArgumentListener(target));
-		testModel.removeNode("child");
-		assertFalse(target.nodeAddedZeroArgumentFlag);
-		assertFalse(target.nodeAddedSingleArgumentFlag);
-		assertTrue(target.nodeRemovedZeroArgumentFlag);
-		assertFalse(target.nodeRemovedSingleArgumentFlag);
-		assertFalse(target.treeClearedZeroArgumentFlag);
-		assertFalse(target.treeClearedSingleArgumentFlag);
-		assertFalse(target.treeChangedZeroArgumentFlag);
-		assertFalse(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testNodeRemovedZeroArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		testModel.addNode("root", "child");
@@ -139,22 +93,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		assertFalse(target.treeChangedSingleArgumentFlag);
 	}
 
-	public void testNodeRemovedSingleArgument() {
-		TestModel testModel = new TestModel("root");
-		testModel.addNode("root", "child");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "child"});
-		testModel.addTreeChangeListener(this.buildSingleArgumentListener(target));
-		testModel.removeNode("child");
-		assertFalse(target.nodeAddedZeroArgumentFlag);
-		assertFalse(target.nodeAddedSingleArgumentFlag);
-		assertFalse(target.nodeRemovedZeroArgumentFlag);
-		assertTrue(target.nodeRemovedSingleArgumentFlag);
-		assertFalse(target.treeClearedZeroArgumentFlag);
-		assertFalse(target.treeClearedSingleArgumentFlag);
-		assertFalse(target.treeChangedZeroArgumentFlag);
-		assertFalse(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testNodeRemovedSingleArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		testModel.addNode("root", "child");
@@ -171,23 +109,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		assertFalse(target.treeChangedSingleArgumentFlag);
 	}
 
-	public void testTreeClearedZeroArgument() {
-		TestModel testModel = new TestModel("root");
-		testModel.addNode("root", "child");
-		testModel.addNode("child", "grandchild");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[0]);
-		testModel.addTreeChangeListener(this.buildZeroArgumentListener(target));
-		testModel.clearTree();
-		assertFalse(target.nodeAddedZeroArgumentFlag);
-		assertFalse(target.nodeAddedSingleArgumentFlag);
-		assertFalse(target.nodeRemovedZeroArgumentFlag);
-		assertFalse(target.nodeRemovedSingleArgumentFlag);
-		assertTrue(target.treeClearedZeroArgumentFlag);
-		assertFalse(target.treeClearedSingleArgumentFlag);
-		assertFalse(target.treeChangedZeroArgumentFlag);
-		assertFalse(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testTreeClearedZeroArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		testModel.addNode("root", "child");
@@ -205,23 +126,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		assertFalse(target.treeChangedSingleArgumentFlag);
 	}
 
-	public void testTreeClearedSingleArgument() {
-		TestModel testModel = new TestModel("root");
-		testModel.addNode("root", "child");
-		testModel.addNode("child", "grandchild");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[0]);
-		testModel.addTreeChangeListener(this.buildSingleArgumentListener(target));
-		testModel.clearTree();
-		assertFalse(target.nodeAddedZeroArgumentFlag);
-		assertFalse(target.nodeAddedSingleArgumentFlag);
-		assertFalse(target.nodeRemovedZeroArgumentFlag);
-		assertFalse(target.nodeRemovedSingleArgumentFlag);
-		assertFalse(target.treeClearedZeroArgumentFlag);
-		assertTrue(target.treeClearedSingleArgumentFlag);
-		assertFalse(target.treeChangedZeroArgumentFlag);
-		assertFalse(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testTreeClearedSingleArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		testModel.addNode("root", "child");
@@ -239,22 +143,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		assertFalse(target.treeChangedSingleArgumentFlag);
 	}
 
-	public void testTreeChangedZeroArgument() {
-		TestModel testModel = new TestModel("root");
-		testModel.addNode("root", "child");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "another child"});
-		testModel.addTreeChangeListener(this.buildZeroArgumentListener(target));
-		testModel.replaceNode("child", "another child");
-		assertFalse(target.nodeAddedZeroArgumentFlag);
-		assertFalse(target.nodeAddedSingleArgumentFlag);
-		assertFalse(target.nodeRemovedZeroArgumentFlag);
-		assertFalse(target.nodeRemovedSingleArgumentFlag);
-		assertFalse(target.treeClearedZeroArgumentFlag);
-		assertFalse(target.treeClearedSingleArgumentFlag);
-		assertTrue(target.treeChangedZeroArgumentFlag);
-		assertFalse(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testTreeChangedZeroArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		testModel.addNode("root", "child");
@@ -271,22 +159,6 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		assertFalse(target.treeChangedSingleArgumentFlag);
 	}
 
-	public void testTreeChangedSingleArgument() {
-		TestModel testModel = new TestModel("root");
-		testModel.addNode("root", "child");
-		Target target = new Target(testModel, TestModel.STRINGS_TREE, new String[]{"root", "another child"});
-		testModel.addTreeChangeListener(this.buildSingleArgumentListener(target));
-		testModel.replaceNode("child", "another child");
-		assertFalse(target.nodeAddedZeroArgumentFlag);
-		assertFalse(target.nodeAddedSingleArgumentFlag);
-		assertFalse(target.nodeRemovedZeroArgumentFlag);
-		assertFalse(target.nodeRemovedSingleArgumentFlag);
-		assertFalse(target.treeClearedZeroArgumentFlag);
-		assertFalse(target.treeClearedSingleArgumentFlag);
-		assertFalse(target.treeChangedZeroArgumentFlag);
-		assertTrue(target.treeChangedSingleArgumentFlag);
-	}
-
 	public void testTreeChangedSingleArgumentNamedTree() {
 		TestModel testModel = new TestModel("root");
 		testModel.addNode("root", "child");
@@ -310,7 +182,7 @@ public class ReflectiveTreeChangeListenerTests extends TestCase {
 		// build a TREE change listener and hack it so we
 		// can add it as a COLLECTION change listener
 		Object listener = ReflectiveChangeListener.buildTreeChangeListener(target, "treeEventSingleArgument");
-		testModel.addCollectionChangeListener((CollectionChangeListener) listener);
+		testModel.addCollectionChangeListener("bogus collection", (CollectionChangeListener) listener);
 
 		boolean exCaught = false;
 		try {
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/BufferedWritablePropertyValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/BufferedWritablePropertyValueModelTests.java
index 1bbb2a0b27..8e7ec590b3 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/BufferedWritablePropertyValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/BufferedWritablePropertyValueModelTests.java
@@ -10,12 +10,16 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import java.util.Date;
+
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.BufferedWritablePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -275,14 +279,14 @@ public class BufferedWritablePropertyValueModelTests extends TestCase {
 	}
 
 	public void testPropertyChange2() {
-		PropertyChangeListener bufferedListener = this.buildBufferedListener();
-		this.bufferedNameHolder.addPropertyChangeListener(bufferedListener);
+		ChangeListener bufferedListener = this.buildBufferedListener();
+		this.bufferedNameHolder.addChangeListener(bufferedListener);
 
-		PropertyChangeListener adapterListener = this.buildAdapterListener();
-		this.nameAdapter.addPropertyChangeListener(adapterListener);
+		ChangeListener adapterListener = this.buildAdapterListener();
+		this.nameAdapter.addChangeListener(adapterListener);
 
-		PropertyChangeListener employeeListener = this.buildEmployeeListener();
-		this.employee.addPropertyChangeListener(employeeListener);
+		ChangeListener employeeListener = this.buildEmployeeListener();
+		this.employee.addChangeListener(employeeListener);
 
 		this.verifyPropertyChanges();
 	}
@@ -329,24 +333,27 @@ public class BufferedWritablePropertyValueModelTests extends TestCase {
 		assertNull(this.employeeEvent);
 	}
 
-	private PropertyChangeListener buildBufferedListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildBufferedListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				BufferedWritablePropertyValueModelTests.this.bufferedEvent = e;
 			}
 		};
 	}
 
-	private PropertyChangeListener buildAdapterListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildAdapterListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				BufferedWritablePropertyValueModelTests.this.adapterEvent = e;
 			}
 		};
 	}
 
-	private PropertyChangeListener buildEmployeeListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildEmployeeListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				BufferedWritablePropertyValueModelTests.this.employeeEvent = e;
 			}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationPropertyValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationPropertyValueModelTests.java
index 62c56b993f..0107fd0add 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationPropertyValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationPropertyValueModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,11 +10,14 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.BidiTransformer;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.CachingTransformationPropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -57,8 +60,8 @@ public class CachingTransformationPropertyValueModelTests extends TestCase {
 	}
 
 	public void testValue() {
-		PropertyChangeListener listener = this.buildTransformationListener();
-		this.transformationObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = this.buildTransformationChangeListener();
+		this.transformationObjectHolder.addChangeListener(listener);
 		
 		Person person = this.objectHolder.getValue();
 		assertEquals("Karen", person.getName());
@@ -90,10 +93,10 @@ public class CachingTransformationPropertyValueModelTests extends TestCase {
 
 	public void testLazyListening() {
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
-		PropertyChangeListener listener = this.buildTransformationListener();
-		this.transformationObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = this.buildTransformationChangeListener();
+		this.transformationObjectHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
-		this.transformationObjectHolder.removePropertyChangeListener(listener);
+		this.transformationObjectHolder.removeChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		this.transformationObjectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, listener);
@@ -103,8 +106,8 @@ public class CachingTransformationPropertyValueModelTests extends TestCase {
 	}
 
 	public void testPropertyChange1() {
-		this.objectHolder.addPropertyChangeListener(this.buildListener());
-		this.transformationObjectHolder.addPropertyChangeListener(this.buildTransformationListener());
+		this.objectHolder.addChangeListener(this.buildChangeListener());
+		this.transformationObjectHolder.addChangeListener(this.buildTransformationChangeListener());
 		this.verifyPropertyChanges();
 	}
 
@@ -163,6 +166,24 @@ public class CachingTransformationPropertyValueModelTests extends TestCase {
 		};
 	}
 
+	private ChangeListener buildChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void propertyChanged(PropertyChangeEvent e) {
+				CachingTransformationPropertyValueModelTests.this.event = e;
+			}
+		};
+	}
+
+	private ChangeListener buildTransformationChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void propertyChanged(PropertyChangeEvent e) {
+				CachingTransformationPropertyValueModelTests.this.transformationEvent = e;
+			}
+		};
+	}
+
 	private void verifyEvent(PropertyChangeEvent e, Object source, Object oldValue, Object newValue) {
 		assertEquals(source, e.getSource());
 		assertEquals(PropertyValueModel.VALUE, e.getPropertyName());
@@ -171,7 +192,7 @@ public class CachingTransformationPropertyValueModelTests extends TestCase {
 	}
 
 	
-	private class Person extends AbstractModel {
+	class Person extends AbstractModel {
 
 		private String name;
 			public static final String NAME_PROPERTY = "name";
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationWritablePropertyValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationWritablePropertyValueModelTests.java
index 61b8c33051..49905c2427 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationWritablePropertyValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CachingTransformationWritablePropertyValueModelTests.java
@@ -10,12 +10,14 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.BidiTransformer;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.CachingTransformationWritablePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -57,8 +59,8 @@ public class CachingTransformationWritablePropertyValueModelTests extends TestCa
 	}
 
 	public void testValue() {
-		PropertyChangeListener listener = this.buildTransformationListener();
-		this.transformationObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = this.buildTransformationListener();
+		this.transformationObjectHolder.addChangeListener(listener);
 
 		
 		Person person = this.objectHolder.getValue();
@@ -90,8 +92,8 @@ public class CachingTransformationWritablePropertyValueModelTests extends TestCa
 	}
 
 	public void testSetValue() {
-		PropertyChangeListener listener = this.buildTransformationListener();
-		this.transformationObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = this.buildTransformationListener();
+		this.transformationObjectHolder.addChangeListener(listener);
 
 		Person person = new Person("Chris", "Noel", null);
 		this.transformationObjectHolder.setValue(person.getParent());
@@ -117,10 +119,10 @@ public class CachingTransformationWritablePropertyValueModelTests extends TestCa
 
 	public void testLazyListening() {
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
-		PropertyChangeListener listener = this.buildTransformationListener();
-		this.transformationObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = this.buildTransformationListener();
+		this.transformationObjectHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
-		this.transformationObjectHolder.removePropertyChangeListener(listener);
+		this.transformationObjectHolder.removeChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		this.transformationObjectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, listener);
@@ -130,8 +132,8 @@ public class CachingTransformationWritablePropertyValueModelTests extends TestCa
 	}
 
 	public void testPropertyChange1() {
-		this.objectHolder.addPropertyChangeListener(this.buildListener());
-		this.transformationObjectHolder.addPropertyChangeListener(this.buildTransformationListener());
+		this.objectHolder.addChangeListener(this.buildListener());
+		this.transformationObjectHolder.addChangeListener(this.buildTransformationListener());
 		this.verifyPropertyChanges();
 	}
 
@@ -178,16 +180,18 @@ public class CachingTransformationWritablePropertyValueModelTests extends TestCa
 //		this.verifyEvent(this.transformationEvent, this.transformationObjectHolder, null, "BAR");
 	}
 
-	private PropertyChangeListener buildListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				CachingTransformationWritablePropertyValueModelTests.this.event = e;
 			}
 		};
 	}
 
-	private PropertyChangeListener buildTransformationListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildTransformationListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				CachingTransformationWritablePropertyValueModelTests.this.transformationEvent = e;
 			}
@@ -202,7 +206,7 @@ public class CachingTransformationWritablePropertyValueModelTests extends TestCa
 	}
 
 	
-	private class Person extends AbstractModel {
+	class Person extends AbstractModel {
 
 		private String name;
 			public static final String NAME_PROPERTY = "name";
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionAspectAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionAspectAdapterTests.java
index e4a34da2c7..4d3008d116 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionAspectAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionAspectAdapterTests.java
@@ -26,6 +26,8 @@ import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
 import org.eclipse.jpt.utility.model.event.CollectionClearEvent;
 import org.eclipse.jpt.utility.model.event.CollectionEvent;
 import org.eclipse.jpt.utility.model.event.CollectionRemoveEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -244,11 +246,11 @@ public class CollectionAspectAdapterTests extends TestCase {
 		assertFalse(this.subject1.hasAnyCollectionChangeListeners(TestSubject.NAMES_COLLECTION));
 		assertFalse(this.aa1.hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 
-		CollectionChangeListener listener2 = this.buildValueChangeListener1();
-		this.aa1.addCollectionChangeListener(listener2);
+		ChangeListener listener2 = new ChangeAdapter();
+		this.aa1.addChangeListener(listener2);
 		assertTrue(this.aa1.hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 		assertTrue(this.subject1.hasAnyCollectionChangeListeners(TestSubject.NAMES_COLLECTION));
-		this.aa1.removeCollectionChangeListener(listener2);
+		this.aa1.removeChangeListener(listener2);
 		assertFalse(this.subject1.hasAnyCollectionChangeListeners(TestSubject.NAMES_COLLECTION));
 		assertFalse(this.aa1.hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 	}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionListValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionListValueModelAdapterTests.java
index 01bf3146f8..d1f6f81705 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionListValueModelAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionListValueModelAdapterTests.java
@@ -29,6 +29,8 @@ import org.eclipse.jpt.utility.model.event.ListClearEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -167,9 +169,11 @@ public class CollectionListValueModelAdapterTests extends TestCase {
 		assertTrue(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 		this.adapter.removeListChangeListener(ListValueModel.LIST_VALUES, synchList);
 		assertFalse(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
-		this.adapter.addListChangeListener(synchList);
+
+		ChangeListener cl = new ChangeAdapter();
+		this.adapter.addChangeListener(cl);
 		assertTrue(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
-		this.adapter.removeListChangeListener(synchList);
+		this.adapter.removeChangeListener(cl);
 		assertFalse(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java
index 67ec577d84..d04cacdb0f 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java
@@ -10,12 +10,16 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import java.util.Collection;
+
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.CollectionPropertyValueModelAdapter;
 import org.eclipse.jpt.utility.internal.model.value.SimpleCollectionValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -156,7 +160,8 @@ public class CollectionPropertyValueModelAdapterTests extends TestCase {
 		assertFalse(((AbstractModel) this.adapter).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertFalse(((AbstractModel) this.wrappedCollectionHolder).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 
-		PropertyChangeListener listener = new PropertyChangeListener() {
+		ChangeListener listener = new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {/* OK */}
 		};
 		this.adapter.addPropertyChangeListener(PropertyValueModel.VALUE, listener);
@@ -167,11 +172,11 @@ public class CollectionPropertyValueModelAdapterTests extends TestCase {
 		assertFalse(((AbstractModel) this.adapter).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertFalse(((AbstractModel) this.wrappedCollectionHolder).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 
-		this.adapter.addPropertyChangeListener(listener);
+		this.adapter.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.adapter).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertTrue(((AbstractModel) this.wrappedCollectionHolder).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 
-		this.adapter.removePropertyChangeListener(listener);
+		this.adapter.removeChangeListener(listener);
 		assertFalse(((AbstractModel) this.adapter).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertFalse(((AbstractModel) this.wrappedCollectionHolder).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 	}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ExtendedListValueModelWrapperTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ExtendedListValueModelWrapperTests.java
index 3868001685..7f64503bd1 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ExtendedListValueModelWrapperTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ExtendedListValueModelWrapperTests.java
@@ -27,7 +27,8 @@ import org.eclipse.jpt.utility.model.event.ListEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
-import org.eclipse.jpt.utility.model.listener.ListChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
@@ -189,7 +190,7 @@ public class ExtendedListValueModelWrapperTests extends TestCase {
 	}
 
 	public void testListChangeGeneric() {
-		this.extendedListHolder.addListChangeListener(this.buildListener());
+		this.extendedListHolder.addChangeListener(this.buildListener());
 		this.verifyListChange();
 	}
 
@@ -233,28 +234,34 @@ public class ExtendedListValueModelWrapperTests extends TestCase {
 		assertTrue(CollectionTools.contains(((ListReplaceEvent) this.event).getNewItems(), "AA"));
 	}
 
-	private ListChangeListener buildListener() {
-		return new ListChangeListener() {
+	private ChangeListener buildListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void itemsAdded(ListAddEvent e) {
 				ExtendedListValueModelWrapperTests.this.eventType = ADD;
 				ExtendedListValueModelWrapperTests.this.event = e;
 			}
+			@Override
 			public void itemsRemoved(ListRemoveEvent e) {
 				ExtendedListValueModelWrapperTests.this.eventType = REMOVE;
 				ExtendedListValueModelWrapperTests.this.event = e;
 			}
+			@Override
 			public void itemsReplaced(ListReplaceEvent e) {
 				ExtendedListValueModelWrapperTests.this.eventType = REPLACE;
 				ExtendedListValueModelWrapperTests.this.event = e;
 			}
+			@Override
 			public void itemsMoved(ListMoveEvent e) {
 				ExtendedListValueModelWrapperTests.this.eventType = MOVE;
 				ExtendedListValueModelWrapperTests.this.event = e;
 			}
+			@Override
 			public void listCleared(ListClearEvent e) {
 				ExtendedListValueModelWrapperTests.this.eventType = CLEAR;
 				ExtendedListValueModelWrapperTests.this.event = e;
 			}
+			@Override
 			public void listChanged(ListChangeEvent e) {
 				ExtendedListValueModelWrapperTests.this.eventType = CHANGE;
 				ExtendedListValueModelWrapperTests.this.event = e;
@@ -288,7 +295,7 @@ public class ExtendedListValueModelWrapperTests extends TestCase {
 		 */
 		assertFalse(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		ListChangeListener listener = this.buildListener();
+		ChangeListener listener = this.buildListener();
 
 		this.extendedListHolder.addListChangeListener(ListValueModel.LIST_VALUES, listener);
 		assertTrue(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
@@ -296,10 +303,10 @@ public class ExtendedListValueModelWrapperTests extends TestCase {
 		this.extendedListHolder.removeListChangeListener(ListValueModel.LIST_VALUES, listener);
 		assertFalse(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		this.extendedListHolder.addListChangeListener(listener);
+		this.extendedListHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		this.extendedListHolder.removeListChangeListener(listener);
+		this.extendedListHolder.removeChangeListener(listener);
 		assertFalse(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringCollectionValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringCollectionValueModelTests.java
index abbd34059a..52932de479 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringCollectionValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringCollectionValueModelTests.java
@@ -24,6 +24,8 @@ import org.eclipse.jpt.utility.model.event.CollectionAddEvent;
 import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
 import org.eclipse.jpt.utility.model.event.CollectionClearEvent;
 import org.eclipse.jpt.utility.model.event.CollectionRemoveEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -120,10 +122,10 @@ public class FilteringCollectionValueModelTests extends TestCase {
 
 	public void testLazyListening() {
 		assertTrue(((AbstractModel) this.collectionHolder).hasNoCollectionChangeListeners(CollectionValueModel.VALUES));
-		CollectionChangeListener listener = this.buildFilteredListener();
-		this.filteredCollectionHolder.addCollectionChangeListener(listener);
+		ChangeListener listener = this.buildFilteredChangeListener();
+		this.filteredCollectionHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.collectionHolder).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
-		this.filteredCollectionHolder.removeCollectionChangeListener(listener);
+		this.filteredCollectionHolder.removeChangeListener(listener);
 		assertTrue(((AbstractModel) this.collectionHolder).hasNoCollectionChangeListeners(CollectionValueModel.VALUES));
 
 		this.filteredCollectionHolder.addCollectionChangeListener(CollectionValueModel.VALUES, listener);
@@ -133,8 +135,8 @@ public class FilteringCollectionValueModelTests extends TestCase {
 	}
 
 	public void testCollectionChange1() {
-		this.collectionHolder.addCollectionChangeListener(this.buildListener());
-		this.filteredCollectionHolder.addCollectionChangeListener(this.buildFilteredListener());
+		this.collectionHolder.addChangeListener(this.buildChangeListener());
+		this.filteredCollectionHolder.addChangeListener(this.buildFilteredChangeListener());
 		this.verifyCollectionChanges();
 	}
 
@@ -219,6 +221,27 @@ public class FilteringCollectionValueModelTests extends TestCase {
 		};
 	}
 
+	private ChangeListener buildChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void itemsAdded(CollectionAddEvent e) {
+				FilteringCollectionValueModelTests.this.addEvent = e;
+			}
+			@Override
+			public void itemsRemoved(CollectionRemoveEvent e) {
+				FilteringCollectionValueModelTests.this.removeEvent = e;
+			}
+			@Override
+			public void collectionCleared(CollectionClearEvent e) {
+				FilteringCollectionValueModelTests.this.collectionClearedEvent = e;
+			}
+			@Override
+			public void collectionChanged(CollectionChangeEvent e) {
+				FilteringCollectionValueModelTests.this.collectionChangedEvent = e;
+			}
+		};
+	}
+
 	private CollectionChangeListener buildFilteredListener() {
 		return new CollectionChangeListener() {
 			public void itemsAdded(CollectionAddEvent e) {
@@ -236,6 +259,27 @@ public class FilteringCollectionValueModelTests extends TestCase {
 		};
 	}
 
+	private ChangeListener buildFilteredChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void itemsAdded(CollectionAddEvent e) {
+				FilteringCollectionValueModelTests.this.filteredAddEvent = e;
+			}
+			@Override
+			public void itemsRemoved(CollectionRemoveEvent e) {
+				FilteringCollectionValueModelTests.this.filteredRemoveEvent = e;
+			}
+			@Override
+			public void collectionCleared(CollectionClearEvent e) {
+				FilteringCollectionValueModelTests.this.filteredCollectionClearedEvent = e;
+			}
+			@Override
+			public void collectionChanged(CollectionChangeEvent e) {
+				FilteringCollectionValueModelTests.this.filteredCollectionChangedEvent = e;
+			}
+		};
+	}
+
 	private void verifyEvent(CollectionChangeEvent event, Object source) {
 		assertEquals(source, event.getSource());
 		assertEquals(CollectionValueModel.VALUES, event.getCollectionName());
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringPropertyValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringPropertyValueModelTests.java
index 7c3b8a6e59..b676dda6a5 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringPropertyValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/FilteringPropertyValueModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,16 +10,19 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.BidiFilter;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.FilteringWritablePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
+@SuppressWarnings("nls")
 public class FilteringPropertyValueModelTests extends TestCase {
 	private WritablePropertyValueModel<String> objectHolder;
 	PropertyChangeEvent event;
@@ -98,10 +101,10 @@ public class FilteringPropertyValueModelTests extends TestCase {
 
 	public void testLazyListening() {
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
-		PropertyChangeListener listener = this.buildFilteredListener();
-		this.filteredObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = this.buildFilteredListener();
+		this.filteredObjectHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
-		this.filteredObjectHolder.removePropertyChangeListener(listener);
+		this.filteredObjectHolder.removeChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		this.filteredObjectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, listener);
@@ -111,8 +114,8 @@ public class FilteringPropertyValueModelTests extends TestCase {
 	}
 
 	public void testPropertyChange1() {
-		this.objectHolder.addPropertyChangeListener(this.buildListener());
-		this.filteredObjectHolder.addPropertyChangeListener(this.buildFilteredListener());
+		this.objectHolder.addChangeListener(this.buildListener());
+		this.filteredObjectHolder.addChangeListener(this.buildFilteredListener());
 		this.verifyPropertyChanges();
 	}
 
@@ -160,16 +163,18 @@ public class FilteringPropertyValueModelTests extends TestCase {
 		this.verifyEvent(this.filteredEvent, this.filteredObjectHolder, null, "bar");
 	}
 
-	private PropertyChangeListener buildListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				FilteringPropertyValueModelTests.this.event = e;
 			}
 		};
 	}
 
-	private PropertyChangeListener buildFilteredListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildFilteredListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				FilteringPropertyValueModelTests.this.filteredEvent = e;
 			}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListAspectAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListAspectAdapterTests.java
index b228f8c56e..37c6718d6d 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListAspectAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListAspectAdapterTests.java
@@ -27,6 +27,8 @@ import org.eclipse.jpt.utility.model.event.ListEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -316,11 +318,11 @@ public class ListAspectAdapterTests extends TestCase {
 		assertFalse(this.subject1.hasAnyListChangeListeners(TestSubject.NAMES_LIST));
 		assertFalse(this.aa1.hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		ListChangeListener listener2 = this.buildValueChangeListener1();
-		this.aa1.addListChangeListener(listener2);
+		ChangeListener listener2 = new ChangeAdapter();
+		this.aa1.addChangeListener(listener2);
 		assertTrue(this.aa1.hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 		assertTrue(this.subject1.hasAnyListChangeListeners(TestSubject.NAMES_LIST));
-		this.aa1.removeListChangeListener(listener2);
+		this.aa1.removeChangeListener(listener2);
 		assertFalse(this.subject1.hasAnyListChangeListeners(TestSubject.NAMES_LIST));
 		assertFalse(this.aa1.hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 	}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCollectionValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCollectionValueModelAdapterTests.java
index 4057c6c012..b45f29c03c 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCollectionValueModelAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCollectionValueModelAdapterTests.java
@@ -28,6 +28,8 @@ import org.eclipse.jpt.utility.model.event.CollectionAddEvent;
 import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
 import org.eclipse.jpt.utility.model.event.CollectionClearEvent;
 import org.eclipse.jpt.utility.model.event.CollectionRemoveEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -206,9 +208,11 @@ public class ListCollectionValueModelAdapterTests extends TestCase {
 		assertTrue(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 		this.adapter.removeCollectionChangeListener(CollectionValueModel.VALUES, synchCollection);
 		assertFalse(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
-		this.adapter.addCollectionChangeListener(synchCollection);
+
+		ChangeListener cl = new ChangeAdapter();
+		this.adapter.addChangeListener(cl);
 		assertTrue(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
-		this.adapter.removeCollectionChangeListener(synchCollection);
+		this.adapter.removeChangeListener(cl);
 		assertFalse(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 	}
 	
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCuratorTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCuratorTests.java
index 5f4b8b1cc8..49ce46fdd6 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCuratorTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ListCuratorTests.java
@@ -28,6 +28,8 @@ import org.eclipse.jpt.utility.model.event.ListEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -252,15 +254,44 @@ public final class ListCuratorTests
 		assertFalse(this.subject1.hasAnyStateChangeListeners());
 		assertFalse(this.curator.hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		ListChangeListener listener2 = this.buildListChangeListener1();
-		this.curator.addListChangeListener(listener2);
+		ChangeListener listener2 = this.buildChangeListener();
+		this.curator.addChangeListener(listener2);
 		assertTrue(this.curator.hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 		assertTrue(this.subject1.hasAnyStateChangeListeners());
-		this.curator.removeListChangeListener(listener2);
+		this.curator.removeChangeListener(listener2);
 		assertFalse(this.subject1.hasAnyStateChangeListeners());
 		assertFalse(this.curator.hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 	}
 	
+	private ChangeListener buildChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void itemsAdded(ListAddEvent e) {
+				ListCuratorTests.this.value1Changed(e);
+			}
+			@Override
+			public void itemsRemoved(ListRemoveEvent e) {
+				ListCuratorTests.this.value1Changed(e);
+			}
+			@Override
+			public void itemsReplaced(ListReplaceEvent e) {
+				ListCuratorTests.this.value1Changed(e);
+			}
+			@Override
+			public void itemsMoved(ListMoveEvent e) {
+				ListCuratorTests.this.value1Changed(e);
+			}
+			@Override
+			public void listCleared(ListClearEvent e) {
+				ListCuratorTests.this.value1Changed(e);
+			}
+			@Override
+			public void listChanged(ListChangeEvent e) {
+				ListCuratorTests.this.value1Changed(e);
+			}
+		};
+	}
+
 	
 	// **************** Inner Class *******************************************
 	
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
index 4f8eb206b4..06abc834ef 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
@@ -10,11 +10,13 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -78,8 +80,9 @@ public class PropertyAspectAdapterTests extends TestCase {
 		};
 	}
 
-	private PropertyChangeListener buildValueChangeListener1() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildValueChangeListener1() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				PropertyAspectAdapterTests.this.value1Changed(e);
 			}
@@ -194,11 +197,11 @@ public class PropertyAspectAdapterTests extends TestCase {
 		assertFalse(this.subject1.hasAnyPropertyChangeListeners(TestSubject.NAME_PROPERTY));
 		assertFalse(this.aa1.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
-		PropertyChangeListener listener2 = this.buildValueChangeListener1();
-		this.aa1.addPropertyChangeListener(listener2);
+		ChangeListener listener2 = this.buildValueChangeListener1();
+		this.aa1.addChangeListener(listener2);
 		assertTrue(this.aa1.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertTrue(this.subject1.hasAnyPropertyChangeListeners(TestSubject.NAME_PROPERTY));
-		this.aa1.removePropertyChangeListener(listener2);
+		this.aa1.removeChangeListener(listener2);
 		assertFalse(this.subject1.hasAnyPropertyChangeListeners(TestSubject.NAME_PROPERTY));
 		assertFalse(this.aa1.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 	}
@@ -282,8 +285,8 @@ public class PropertyAspectAdapterTests extends TestCase {
 	 * if the bug is present; otherwise, it completes silently.
 	 */
 	public void testDuplicateListener() {
-		PropertyChangeListener listener2 = new PropertyChangeAdapter();
-		this.aa1.addPropertyChangeListener(listener2);
+		ChangeListener listener2 = new ChangeAdapter();
+		this.aa1.addChangeListener(listener2);
 	}
 
 	private WritablePropertyValueModel<String> buildCustomAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) {
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyCollectionValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyCollectionValueModelAdapterTests.java
index 443f432219..9661ef4d4f 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyCollectionValueModelAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyCollectionValueModelAdapterTests.java
@@ -26,6 +26,8 @@ import org.eclipse.jpt.utility.model.event.CollectionAddEvent;
 import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
 import org.eclipse.jpt.utility.model.event.CollectionClearEvent;
 import org.eclipse.jpt.utility.model.event.CollectionRemoveEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -99,9 +101,11 @@ public class PropertyCollectionValueModelAdapterTests extends TestCase {
 		assertTrue(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 		this.adapter.removeCollectionChangeListener(CollectionValueModel.VALUES, synchCollection);
 		assertFalse(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
-		this.adapter.addCollectionChangeListener(synchCollection);
+
+		ChangeListener cl = new ChangeAdapter();
+		this.adapter.addChangeListener(cl);
 		assertTrue(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
-		this.adapter.removeCollectionChangeListener(synchCollection);
+		this.adapter.removeChangeListener(cl);
 		assertFalse(((AbstractModel) this.adapter).hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyListValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyListValueModelAdapterTests.java
index 44d7459163..d91b03d473 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyListValueModelAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/PropertyListValueModelAdapterTests.java
@@ -29,6 +29,8 @@ import org.eclipse.jpt.utility.model.event.ListClearEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -129,9 +131,11 @@ public class PropertyListValueModelAdapterTests extends TestCase {
 		assertTrue(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 		this.adapter.removeListChangeListener(ListValueModel.LIST_VALUES, synchList);
 		assertFalse(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
-		this.adapter.addListChangeListener(synchList);
+
+		ChangeListener cl = new ChangeAdapter();
+		this.adapter.addChangeListener(cl);
 		assertTrue(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
-		this.adapter.removeListChangeListener(synchList);
+		this.adapter.removeChangeListener(cl);
 		assertFalse(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ReadOnlyWritablePropertyValueModelWrapperTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ReadOnlyWritablePropertyValueModelWrapperTests.java
index 30ddbc3113..c8678a7dfa 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ReadOnlyWritablePropertyValueModelWrapperTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ReadOnlyWritablePropertyValueModelWrapperTests.java
@@ -1,25 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.ReadOnlyWritablePropertyValueModelWrapper;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
+@SuppressWarnings("nls")
 public class ReadOnlyWritablePropertyValueModelWrapperTests 
 	extends TestCase
 {
 	private WritablePropertyValueModel<String> objectHolder;
 	
-	private PropertyChangeEvent event;
+	PropertyChangeEvent event;
 	
 	private WritablePropertyValueModel<String> wrapperObjectHolder;
 	
-	private PropertyChangeEvent wrapperEvent;
+	PropertyChangeEvent wrapperEvent;
 	
 	
 	public ReadOnlyWritablePropertyValueModelWrapperTests(String name) {
@@ -74,10 +86,10 @@ public class ReadOnlyWritablePropertyValueModelWrapperTests
 	
 	public void testLazyListening() {
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
-		PropertyChangeListener listener = buildWrapperListener();
-		this.wrapperObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = buildWrapperListener();
+		this.wrapperObjectHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
-		this.wrapperObjectHolder.removePropertyChangeListener(listener);
+		this.wrapperObjectHolder.removeChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
 		
 		this.wrapperObjectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, listener);
@@ -87,8 +99,8 @@ public class ReadOnlyWritablePropertyValueModelWrapperTests
 	}
 	
 	public void testPropertyChange1() {
-		this.objectHolder.addPropertyChangeListener(this.buildListener());
-		this.wrapperObjectHolder.addPropertyChangeListener(this.buildWrapperListener());
+		this.objectHolder.addChangeListener(this.buildListener());
+		this.wrapperObjectHolder.addChangeListener(this.buildWrapperListener());
 		this.verifyPropertyChanges();
 	}
 	
@@ -118,16 +130,18 @@ public class ReadOnlyWritablePropertyValueModelWrapperTests
 		verifyEvent(this.wrapperEvent, this.wrapperObjectHolder, null, "foo");
 	}
 
-	private PropertyChangeListener buildListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				ReadOnlyWritablePropertyValueModelWrapperTests.this.event = e;
 			}
 		};
 	}
 
-	private PropertyChangeListener buildWrapperListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildWrapperListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				ReadOnlyWritablePropertyValueModelWrapperTests.this.wrapperEvent = e;
 			}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleCollectionValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleCollectionValueModelTests.java
index 8192feff10..91dc0e19e0 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleCollectionValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleCollectionValueModelTests.java
@@ -24,7 +24,8 @@ import org.eclipse.jpt.utility.model.event.CollectionChangeEvent;
 import org.eclipse.jpt.utility.model.event.CollectionClearEvent;
 import org.eclipse.jpt.utility.model.event.CollectionEvent;
 import org.eclipse.jpt.utility.model.event.CollectionRemoveEvent;
-import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
@@ -229,10 +230,10 @@ public class SimpleCollectionValueModelTests extends TestCase {
 	}
 
 	public void testCollectionChange1() {
-		this.bagHolder.addCollectionChangeListener(this.buildBagListener());
+		this.bagHolder.addChangeListener(this.buildBagListener());
 		this.verifyBagChange();
 
-		this.setHolder.addCollectionChangeListener(this.buildSetListener());
+		this.setHolder.addChangeListener(this.buildSetListener());
 		this.verifySetChange();
 	}
 
@@ -349,20 +350,24 @@ public class SimpleCollectionValueModelTests extends TestCase {
 		assertNull(this.setEventType);
 	}
 
-	private CollectionChangeListener buildBagListener() {
-		return new CollectionChangeListener() {
+	private ChangeListener buildBagListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void itemsAdded(CollectionAddEvent e) {
 				SimpleCollectionValueModelTests.this.bagEventType = ADD;
 				SimpleCollectionValueModelTests.this.bagEvent = e;
 			}
+			@Override
 			public void itemsRemoved(CollectionRemoveEvent e) {
 				SimpleCollectionValueModelTests.this.bagEventType = REMOVE;
 				SimpleCollectionValueModelTests.this.bagEvent = e;
 			}
+			@Override
 			public void collectionCleared(CollectionClearEvent e) {
 				SimpleCollectionValueModelTests.this.bagEventType = CLEAR;
 				SimpleCollectionValueModelTests.this.bagEvent = e;
 			}
+			@Override
 			public void collectionChanged(CollectionChangeEvent e) {
 				SimpleCollectionValueModelTests.this.bagEventType = CHANGE;
 				SimpleCollectionValueModelTests.this.bagEvent = e;
@@ -370,20 +375,24 @@ public class SimpleCollectionValueModelTests extends TestCase {
 		};
 	}
 
-	private CollectionChangeListener buildSetListener() {
-		return new CollectionChangeListener() {
+	private ChangeListener buildSetListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void itemsAdded(CollectionAddEvent e) {
 				SimpleCollectionValueModelTests.this.setEventType = ADD;
 				SimpleCollectionValueModelTests.this.setEvent = e;
 			}
+			@Override
 			public void itemsRemoved(CollectionRemoveEvent e) {
 				SimpleCollectionValueModelTests.this.setEventType = REMOVE;
 				SimpleCollectionValueModelTests.this.setEvent = e;
 			}
+			@Override
 			public void collectionCleared(CollectionClearEvent e) {
 				SimpleCollectionValueModelTests.this.setEventType = CLEAR;
 				SimpleCollectionValueModelTests.this.setEvent = e;
 			}
+			@Override
 			public void collectionChanged(CollectionChangeEvent e) {
 				SimpleCollectionValueModelTests.this.setEventType = CHANGE;
 				SimpleCollectionValueModelTests.this.setEvent = e;
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleListValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleListValueModelTests.java
index 8cbf00d74a..7f8db7b639 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleListValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimpleListValueModelTests.java
@@ -26,6 +26,8 @@ import org.eclipse.jpt.utility.model.event.ListEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -243,7 +245,7 @@ public class SimpleListValueModelTests extends TestCase {
 	}
 
 	public void testListChange1() {
-		this.listHolder.addListChangeListener(this.buildListener());
+		this.listHolder.addChangeListener(this.buildChangeListener());
 		this.verifyListChange();
 	}
 
@@ -321,6 +323,41 @@ public class SimpleListValueModelTests extends TestCase {
 		};
 	}
 
+	private ChangeListener buildChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void itemsAdded(ListAddEvent e) {
+				SimpleListValueModelTests.this.eventType = ADD;
+				SimpleListValueModelTests.this.event = e;
+			}
+			@Override
+			public void itemsRemoved(ListRemoveEvent e) {
+				SimpleListValueModelTests.this.eventType = REMOVE;
+				SimpleListValueModelTests.this.event = e;
+			}
+			@Override
+			public void itemsReplaced(ListReplaceEvent e) {
+				SimpleListValueModelTests.this.eventType = REPLACE;
+				SimpleListValueModelTests.this.event = e;
+			}
+			@Override
+			public void itemsMoved(ListMoveEvent e) {
+				SimpleListValueModelTests.this.eventType = MOVE;
+				SimpleListValueModelTests.this.event = e;
+			}
+			@Override
+			public void listCleared(ListClearEvent e) {
+				SimpleListValueModelTests.this.eventType = CLEAR;
+				SimpleListValueModelTests.this.event = e;
+			}
+			@Override
+			public void listChanged(ListChangeEvent e) {
+				SimpleListValueModelTests.this.eventType = CHANGE;
+				SimpleListValueModelTests.this.event = e;
+			}
+		};
+	}
+
 	private void verifyEvent(String e) {
 		assertEquals(e, this.eventType);
 		assertEquals(this.listHolder, this.event.getSource());
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimplePropertyValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimplePropertyValueModelTests.java
index 57ed0d8c70..e1a617fc71 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimplePropertyValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SimplePropertyValueModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,13 +10,16 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
+@SuppressWarnings("nls")
 public class SimplePropertyValueModelTests extends TestCase {
 	private WritablePropertyValueModel<String> objectHolder;
 	PropertyChangeEvent event;
@@ -52,7 +55,7 @@ public class SimplePropertyValueModelTests extends TestCase {
 	}
 
 	public void testPropertyChange1() {
-		this.objectHolder.addPropertyChangeListener(this.buildListener());
+		this.objectHolder.addChangeListener(this.buildListener());
 		this.verifyPropertyChange();
 	}
 
@@ -75,8 +78,9 @@ public class SimplePropertyValueModelTests extends TestCase {
 		this.verifyEvent(null, "baz");
 	}
 
-	private PropertyChangeListener buildListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				SimplePropertyValueModelTests.this.event = e;
 			}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SortedListValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SortedListValueModelAdapterTests.java
index ef2f6d73e8..051b1cd38c 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SortedListValueModelAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/SortedListValueModelAdapterTests.java
@@ -30,6 +30,8 @@ import org.eclipse.jpt.utility.model.event.ListClearEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -174,9 +176,11 @@ public class SortedListValueModelAdapterTests extends TestCase {
 		assertTrue(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 		this.adapter.removeListChangeListener(ListValueModel.LIST_VALUES, synchList);
 		assertFalse(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
-		this.adapter.addListChangeListener(synchList);
+
+		ChangeListener cl = new ChangeAdapter();
+		this.adapter.addChangeListener(cl);
 		assertTrue(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
-		this.adapter.removeListChangeListener(synchList);
+		this.adapter.removeChangeListener(cl);
 		assertFalse(((AbstractModel) this.adapter).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationListValueModelAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationListValueModelAdapterTests.java
index d7684b25ac..83ce590d81 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationListValueModelAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationListValueModelAdapterTests.java
@@ -29,6 +29,8 @@ import org.eclipse.jpt.utility.model.event.ListEvent;
 import org.eclipse.jpt.utility.model.event.ListMoveEvent;
 import org.eclipse.jpt.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.utility.model.event.ListReplaceEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -192,7 +194,7 @@ public class TransformationListValueModelAdapterTests extends TestCase {
 	}
 
 	public void testListChangeGeneric() {
-		this.transformedListHolder.addListChangeListener(this.buildListener());
+		this.transformedListHolder.addChangeListener(this.buildListener());
 		this.verifyListChange();
 	}
 
@@ -236,28 +238,34 @@ public class TransformationListValueModelAdapterTests extends TestCase {
 		assertTrue(CollectionTools.contains(((ListReplaceEvent) this.event).getNewItems(), "JOO"));
 	}
 
-	private ListChangeListener buildListener() {
-		return new ListChangeListener() {
+	private ChangeListener buildListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void itemsAdded(ListAddEvent e) {
 				TransformationListValueModelAdapterTests.this.eventType = ADD;
 				TransformationListValueModelAdapterTests.this.event = e;
 			}
+			@Override
 			public void itemsRemoved(ListRemoveEvent e) {
 				TransformationListValueModelAdapterTests.this.eventType = REMOVE;
 				TransformationListValueModelAdapterTests.this.event = e;
 			}
+			@Override
 			public void itemsReplaced(ListReplaceEvent e) {
 				TransformationListValueModelAdapterTests.this.eventType = REPLACE;
 				TransformationListValueModelAdapterTests.this.event = e;
 			}
+			@Override
 			public void itemsMoved(ListMoveEvent e) {
 				TransformationListValueModelAdapterTests.this.eventType = MOVE;
 				TransformationListValueModelAdapterTests.this.event = e;
 			}
+			@Override
 			public void listCleared(ListClearEvent e) {
 				TransformationListValueModelAdapterTests.this.eventType = CLEAR;
 				TransformationListValueModelAdapterTests.this.event = e;
 			}
+			@Override
 			public void listChanged(ListChangeEvent e) {
 				TransformationListValueModelAdapterTests.this.eventType = CHANGE;
 				TransformationListValueModelAdapterTests.this.event = e;
@@ -291,7 +299,7 @@ public class TransformationListValueModelAdapterTests extends TestCase {
 		 */
 		assertFalse(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		ListChangeListener listener = this.buildListener();
+		ChangeListener listener = this.buildListener();
 
 		this.transformedListHolder.addListChangeListener(ListValueModel.LIST_VALUES, listener);
 		assertTrue(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
@@ -299,10 +307,10 @@ public class TransformationListValueModelAdapterTests extends TestCase {
 		this.transformedListHolder.removeListChangeListener(ListValueModel.LIST_VALUES, listener);
 		assertFalse(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		this.transformedListHolder.addListChangeListener(listener);
+		this.transformedListHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 
-		this.transformedListHolder.removeListChangeListener(listener);
+		this.transformedListHolder.removeChangeListener(listener);
 		assertFalse(((AbstractModel) this.listHolder).hasAnyListChangeListeners(ListValueModel.LIST_VALUES));
 	}
 
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationPropertyValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationPropertyValueModelTests.java
index a732202671..0aaa6e4ee5 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationPropertyValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TransformationPropertyValueModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -10,12 +10,14 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.BidiTransformer;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.TransformationWritablePropertyValueModel;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
@@ -97,10 +99,10 @@ public class TransformationPropertyValueModelTests extends TestCase {
 
 	public void testLazyListening() {
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
-		PropertyChangeListener listener = this.buildTransformationListener();
-		this.transformationObjectHolder.addPropertyChangeListener(listener);
+		ChangeListener listener = this.buildTransformationListener();
+		this.transformationObjectHolder.addChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
-		this.transformationObjectHolder.removePropertyChangeListener(listener);
+		this.transformationObjectHolder.removeChangeListener(listener);
 		assertTrue(((AbstractModel) this.objectHolder).hasNoPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		this.transformationObjectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, listener);
@@ -110,8 +112,8 @@ public class TransformationPropertyValueModelTests extends TestCase {
 	}
 
 	public void testPropertyChange1() {
-		this.objectHolder.addPropertyChangeListener(this.buildListener());
-		this.transformationObjectHolder.addPropertyChangeListener(this.buildTransformationListener());
+		this.objectHolder.addChangeListener(this.buildListener());
+		this.transformationObjectHolder.addChangeListener(this.buildTransformationListener());
 		this.verifyPropertyChanges();
 	}
 
@@ -159,16 +161,18 @@ public class TransformationPropertyValueModelTests extends TestCase {
 		this.verifyEvent(this.transformationEvent, this.transformationObjectHolder, null, "BAR");
 	}
 
-	private PropertyChangeListener buildListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				TransformationPropertyValueModelTests.this.event = e;
 			}
 		};
 	}
 
-	private PropertyChangeListener buildTransformationListener() {
-		return new PropertyChangeListener() {
+	private ChangeListener buildTransformationListener() {
+		return new ChangeAdapter() {
+			@Override
 			public void propertyChanged(PropertyChangeEvent e) {
 				TransformationPropertyValueModelTests.this.transformationEvent = e;
 			}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TreeAspectAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TreeAspectAdapterTests.java
index 088e286977..4f851b4e9c 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TreeAspectAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/TreeAspectAdapterTests.java
@@ -29,6 +29,8 @@ import org.eclipse.jpt.utility.model.event.TreeChangeEvent;
 import org.eclipse.jpt.utility.model.event.TreeClearEvent;
 import org.eclipse.jpt.utility.model.event.TreeEvent;
 import org.eclipse.jpt.utility.model.event.TreeRemoveEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.TreeChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.TreeValueModel;
@@ -113,17 +115,21 @@ public class TreeAspectAdapterTests extends TestCase {
 		};
 	}
 
-	private TreeChangeListener buildValueChangeListener1() {
-		return new TreeChangeListener() {
+	private ChangeListener buildValueChangeListener1() {
+		return new ChangeAdapter() {
+			@Override
 			public void nodeAdded(TreeAddEvent e) {
 				TreeAspectAdapterTests.this.value1Changed(e);
 			}
+			@Override
 			public void nodeRemoved(TreeRemoveEvent e) {
 				TreeAspectAdapterTests.this.value1Changed(e);
 			}
+			@Override
 			public void treeCleared(TreeClearEvent e) {
 				TreeAspectAdapterTests.this.value1Changed(e);
 			}
+			@Override
 			public void treeChanged(TreeChangeEvent e) {
 				TreeAspectAdapterTests.this.value1Changed(e);
 			}
@@ -201,11 +207,11 @@ public class TreeAspectAdapterTests extends TestCase {
 		assertFalse(this.subject1.hasAnyTreeChangeListeners(TestSubject.NAMES_TREE));
 		assertFalse(this.aa1.hasAnyTreeChangeListeners(TreeValueModel.NODES));
 
-		TreeChangeListener listener2 = this.buildValueChangeListener1();
-		this.aa1.addTreeChangeListener(listener2);
+		ChangeListener listener2 = this.buildValueChangeListener1();
+		this.aa1.addChangeListener(listener2);
 		assertTrue(this.aa1.hasAnyTreeChangeListeners(TreeValueModel.NODES));
 		assertTrue(this.subject1.hasAnyTreeChangeListeners(TestSubject.NAMES_TREE));
-		this.aa1.removeTreeChangeListener(listener2);
+		this.aa1.removeChangeListener(listener2);
 		assertFalse(this.subject1.hasAnyTreeChangeListeners(TestSubject.NAMES_TREE));
 		assertFalse(this.aa1.hasAnyTreeChangeListeners(TreeValueModel.NODES));
 	}
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueCollectionAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueCollectionAdapterTests.java
index eee3d73bc9..f9e5e72674 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueCollectionAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueCollectionAdapterTests.java
@@ -11,14 +11,15 @@ package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import java.util.ArrayList;
 import java.util.Collection;
+
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.ValueCollectionAdapter;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
@@ -50,7 +51,7 @@ public class ValueCollectionAdapterTests extends TestCase {
 	public void testWrappedPVM() {
 		Junk junk2 = new Junk("bar");
 		LocalListener l = new LocalListener(this.junkHolder2, this.junk, junk2);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		this.junkHolder.setValue(junk2);
 		assertTrue(l.eventReceived());
 	}
@@ -60,11 +61,11 @@ public class ValueCollectionAdapterTests extends TestCase {
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		LocalListener l = new LocalListener(this.junkHolder2, null, this.junk);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		assertTrue(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertTrue(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
-		this.junkHolder2.removePropertyChangeListener(l);
+		this.junkHolder2.removeChangeListener(l);
 		assertFalse(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 	}
@@ -98,7 +99,7 @@ public class ValueCollectionAdapterTests extends TestCase {
 	}
 
 
-	private class LocalListener implements PropertyChangeListener, StateChangeListener {
+	class LocalListener extends ChangeAdapter {
 		private boolean eventReceived = false;
 		private final Object source;
 		private final Object oldValue;
@@ -112,6 +113,7 @@ public class ValueCollectionAdapterTests extends TestCase {
 			this.oldValue = oldValue;
 			this.newValue = newValue;
 		}
+		@Override
 		public void propertyChanged(PropertyChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
@@ -119,6 +121,7 @@ public class ValueCollectionAdapterTests extends TestCase {
 			assertEquals(this.newValue, e.getNewValue());
 			assertEquals(PropertyValueModel.VALUE, e.getPropertyName());
 		}
+		@Override
 		public void stateChanged(StateChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueListAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueListAdapterTests.java
index b5a5dfa952..89d3c25a42 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueListAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueListAdapterTests.java
@@ -11,14 +11,15 @@ package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.ValueListAdapter;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
@@ -50,7 +51,7 @@ public class ValueListAdapterTests extends TestCase {
 	public void testWrappedPVM() {
 		Junk junk2 = new Junk("bar");
 		LocalListener l = new LocalListener(this.junkHolder2, this.junk, junk2);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		this.junkHolder.setValue(junk2);
 		assertTrue(l.eventReceived());
 	}
@@ -60,11 +61,11 @@ public class ValueListAdapterTests extends TestCase {
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		LocalListener l = new LocalListener(this.junkHolder2, null, this.junk);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		assertTrue(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertTrue(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
-		this.junkHolder2.removePropertyChangeListener(l);
+		this.junkHolder2.removeChangeListener(l);
 		assertFalse(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 	}
@@ -105,7 +106,7 @@ public class ValueListAdapterTests extends TestCase {
 	}
 
 
-	class LocalListener implements PropertyChangeListener, StateChangeListener {
+	class LocalListener extends ChangeAdapter {
 		private boolean eventReceived = false;
 		private final Object source;
 		private final Object oldValue;
@@ -119,6 +120,7 @@ public class ValueListAdapterTests extends TestCase {
 			this.oldValue = oldValue;
 			this.newValue = newValue;
 		}
+		@Override
 		public void propertyChanged(PropertyChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
@@ -126,6 +128,7 @@ public class ValueListAdapterTests extends TestCase {
 			assertEquals(this.newValue, e.getNewValue());
 			assertEquals(PropertyValueModel.VALUE, e.getPropertyName());
 		}
+		@Override
 		public void stateChanged(StateChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValuePropertyAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValuePropertyAdapterTests.java
index 6254f213ae..e3912484c5 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValuePropertyAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValuePropertyAdapterTests.java
@@ -10,13 +10,13 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.ValuePropertyAdapter;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
@@ -48,7 +48,7 @@ public class ValuePropertyAdapterTests extends TestCase {
 	public void testWrappedPVM() {
 		Junk junk2 = new Junk("bar");
 		LocalListener l = new LocalListener(this.junkHolder2, this.junk, junk2);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		this.junkHolder.setValue(junk2);
 		assertTrue(l.eventReceived());
 	}
@@ -58,11 +58,11 @@ public class ValuePropertyAdapterTests extends TestCase {
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		LocalListener l = new LocalListener(this.junkHolder2, null, this.junk);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		assertTrue(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertTrue(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
-		this.junkHolder2.removePropertyChangeListener(l);
+		this.junkHolder2.removeChangeListener(l);
 		assertFalse(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 	}
@@ -89,7 +89,7 @@ public class ValuePropertyAdapterTests extends TestCase {
 	}
 
 
-	class LocalListener implements PropertyChangeListener, StateChangeListener {
+	class LocalListener extends ChangeAdapter {
 		private boolean eventReceived = false;
 		private final Object source;
 		private final Object oldValue;
@@ -103,6 +103,7 @@ public class ValuePropertyAdapterTests extends TestCase {
 			this.oldValue = oldValue;
 			this.newValue = newValue;
 		}
+		@Override
 		public void propertyChanged(PropertyChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
@@ -110,6 +111,7 @@ public class ValuePropertyAdapterTests extends TestCase {
 			assertEquals(this.newValue, e.getNewValue());
 			assertEquals(PropertyValueModel.VALUE, e.getPropertyName());
 		}
+		@Override
 		public void stateChanged(StateChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
@@ -119,7 +121,7 @@ public class ValuePropertyAdapterTests extends TestCase {
 		}
 	}
 
-	private class Junk extends AbstractModel {
+	class Junk extends AbstractModel {
 		private String name;
 			public static final String NAME_PROPERTY = "name";
 
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueStateAdapterTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueStateAdapterTests.java
index ed14f7bfd1..e0002e388a 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueStateAdapterTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/ValueStateAdapterTests.java
@@ -10,13 +10,13 @@
 package org.eclipse.jpt.utility.tests.internal.model.value;
 
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.ValueStateAdapter;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.utility.model.event.StateChangeEvent;
-import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
-import org.eclipse.jpt.utility.model.listener.StateChangeListener;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
@@ -48,7 +48,7 @@ public class ValueStateAdapterTests extends TestCase {
 	public void testWrappedPVM() {
 		Junk junk2 = new Junk("bar");
 		LocalListener l = new LocalListener(this.junkHolder2, this.junk, junk2);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		this.junkHolder.setValue(junk2);
 		assertTrue(l.eventReceived());
 	}
@@ -58,11 +58,11 @@ public class ValueStateAdapterTests extends TestCase {
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
 		LocalListener l = new LocalListener(this.junkHolder2, null, this.junk);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		assertTrue(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertTrue(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
-		this.junkHolder2.removePropertyChangeListener(l);
+		this.junkHolder2.removeChangeListener(l);
 		assertFalse(this.junkHolder.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertFalse(this.junkHolder2.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 	}
@@ -83,14 +83,14 @@ public class ValueStateAdapterTests extends TestCase {
 
 	public void testChangeState() {
 		LocalListener l = new LocalListener(this.junkHolder2, null, this.junk);
-		this.junkHolder2.addPropertyChangeListener(l);
+		this.junkHolder2.addChangeListener(l);
 		this.junkHolder2.addStateChangeListener(l);
 		this.junk.setName("bar");
 		assertTrue(l.eventReceived());
 	}
 
 
-	class LocalListener implements PropertyChangeListener, StateChangeListener {
+	class LocalListener extends ChangeAdapter {
 		private boolean eventReceived = false;
 		private final Object source;
 		private final Object oldValue;
@@ -104,6 +104,7 @@ public class ValueStateAdapterTests extends TestCase {
 			this.oldValue = oldValue;
 			this.newValue = newValue;
 		}
+		@Override
 		public void propertyChanged(PropertyChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
@@ -111,6 +112,7 @@ public class ValueStateAdapterTests extends TestCase {
 			assertEquals(this.newValue, e.getNewValue());
 			assertEquals(PropertyValueModel.VALUE, e.getPropertyName());
 		}
+		@Override
 		public void stateChanged(StateChangeEvent e) {
 			this.eventReceived = true;
 			assertEquals(this.source, e.getSource());
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java
index b04df31695..49aab95fc0 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencePropertyValueModelTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2009 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -14,15 +14,19 @@ import java.util.prefs.NodeChangeListener;
 import java.util.prefs.PreferenceChangeEvent;
 import java.util.prefs.PreferenceChangeListener;
 import java.util.prefs.Preferences;
+
 import org.eclipse.jpt.utility.internal.ClassTools;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.prefs.PreferencePropertyValueModel;
 import org.eclipse.jpt.utility.model.Model;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
 
+@SuppressWarnings("nls")
 public class PreferencePropertyValueModelTests extends PreferencesTestCase {
 	private WritablePropertyValueModel<Preferences> nodeHolder;
 	PreferencePropertyValueModel<String> preferenceAdapter;
@@ -129,15 +133,27 @@ public class PreferencePropertyValueModelTests extends PreferencesTestCase {
 		assertFalse(this.nodeHasAnyPrefListeners(this.testNode));
 		assertFalse(this.preferenceAdapter.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 
-		PropertyChangeListener listener2 = this.buildValueChangeListener();
-		this.preferenceAdapter.addPropertyChangeListener(listener2);
+		ChangeListener listener2 = this.buildChangeListener();
+		this.preferenceAdapter.addChangeListener(listener2);
 		assertTrue(this.preferenceAdapter.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 		assertTrue(this.nodeHasAnyPrefListeners(this.testNode));
-		this.preferenceAdapter.removePropertyChangeListener(listener2);
+		this.preferenceAdapter.removeChangeListener(listener2);
 		assertFalse(this.nodeHasAnyPrefListeners(this.testNode));
 		assertFalse(this.preferenceAdapter.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE));
 	}
 
+	private ChangeListener buildChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void propertyChanged(PropertyChangeEvent e) {
+				if (PreferencePropertyValueModelTests.this.event != null) {
+					throw new IllegalStateException("unexpected this.event: " + e);
+				}
+				PreferencePropertyValueModelTests.this.event = e;
+			}
+		};
+	}
+
 	public void testRemoveAndReAddPreference() throws Exception {
 		assertEquals(STRING_VALUE, this.testNode.get(KEY_NAME, null));
 		assertEquals(STRING_VALUE, this.preferenceAdapter.getValue());
diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencesCollectionValueModelTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencesCollectionValueModelTests.java
index 08f1ce474a..c57af46fb6 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencesCollectionValueModelTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/model/value/prefs/PreferencesCollectionValueModelTests.java
@@ -26,6 +26,8 @@ import org.eclipse.jpt.utility.model.event.CollectionClearEvent;
 import org.eclipse.jpt.utility.model.event.CollectionEvent;
 import org.eclipse.jpt.utility.model.event.CollectionRemoveEvent;
 import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
+import org.eclipse.jpt.utility.model.listener.ChangeAdapter;
+import org.eclipse.jpt.utility.model.listener.ChangeListener;
 import org.eclipse.jpt.utility.model.listener.CollectionChangeListener;
 import org.eclipse.jpt.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.utility.model.value.CollectionValueModel;
@@ -231,15 +233,42 @@ public class PreferencesCollectionValueModelTests extends PreferencesTestCase {
 		assertFalse(this.nodeHasAnyPrefListeners(this.testNode));
 		assertFalse(this.preferencesAdapter.hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 
-		CollectionChangeListener listener2 = this.buildCollectionChangeListener();
-		this.preferencesAdapter.addCollectionChangeListener(listener2);
+		ChangeListener listener2 = this.buildChangeListener();
+		this.preferencesAdapter.addChangeListener(listener2);
 		assertTrue(this.preferencesAdapter.hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 		assertTrue(this.nodeHasAnyPrefListeners(this.testNode));
-		this.preferencesAdapter.removeCollectionChangeListener(listener2);
+		this.preferencesAdapter.removeChangeListener(listener2);
 		assertFalse(this.nodeHasAnyPrefListeners(this.testNode));
 		assertFalse(this.preferencesAdapter.hasAnyCollectionChangeListeners(CollectionValueModel.VALUES));
 	}
 
+	private ChangeListener buildChangeListener() {
+		return new ChangeAdapter() {
+			@Override
+			public void collectionChanged(CollectionChangeEvent e) {
+				this.logEvent(e);
+			}
+			@Override
+			public void collectionCleared(CollectionClearEvent e) {
+				this.logEvent(e);
+			}
+			@Override
+			public void itemsAdded(CollectionAddEvent e) {
+				this.logEvent(e);
+			}
+			@Override
+			public void itemsRemoved(CollectionRemoveEvent e) {
+				this.logEvent(e);
+			}
+			private void logEvent(CollectionEvent e) {
+				if (PreferencesCollectionValueModelTests.this.event != null) {
+					throw new IllegalStateException("unexpected this.event: " + e);
+				}
+				PreferencesCollectionValueModelTests.this.event = e;
+			}
+		};
+	}
+
 	private void verifyEvent(Map<String, String> items) {
 		this.verifyEvent();
 		assertEquals(items.size(), ((CollectionAddEvent) this.event).getItemsSize());