rework change events - tree and list

1 files changed, 19 insertions, 11 deletions

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 816bb599cc..ef2f6d73e8 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
@@ -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,7 +14,9 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 import java.util.TreeSet;
+
 import junit.framework.TestCase;
+
 import org.eclipse.jpt.utility.internal.Bag;
 import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.HashBag;
@@ -22,11 +24,17 @@ import org.eclipse.jpt.utility.internal.ReverseComparator;
 import org.eclipse.jpt.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.utility.internal.model.value.SimpleCollectionValueModel;
 import org.eclipse.jpt.utility.internal.model.value.SortedListValueModelAdapter;
+import org.eclipse.jpt.utility.model.event.ListAddEvent;
 import org.eclipse.jpt.utility.model.event.ListChangeEvent;
+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.ListChangeListener;
 import org.eclipse.jpt.utility.model.value.ListValueModel;
 import org.eclipse.jpt.utility.tests.internal.TestTools;
 
+@SuppressWarnings("nls")
 public class SortedListValueModelAdapterTests extends TestCase {
 	private SortedListValueModelAdapter<String> adapter;
 	private SimpleCollectionValueModel<String> wrappedCollectionHolder;
@@ -66,9 +74,9 @@ public class SortedListValueModelAdapterTests extends TestCase {
 	public void testAdd() {
 		this.adapter.addListChangeListener(ListValueModel.LIST_VALUES, new TestListChangeListener() {
 			@Override
-			public void itemsAdded(ListChangeEvent e) {/* OK */}
+			public void itemsAdded(ListAddEvent e) {/* OK */}
 			@Override
-			public void itemsReplaced(ListChangeEvent e) {/* OK */}
+			public void itemsReplaced(ListReplaceEvent e) {/* OK */}
 		});
 		this.wrappedCollectionHolder.add("foo");
 		this.wrappedCollectionHolder.add("bar");
@@ -117,11 +125,11 @@ public class SortedListValueModelAdapterTests extends TestCase {
 	public void testListSynch() {
 		this.adapter.addListChangeListener(ListValueModel.LIST_VALUES, new TestListChangeListener() {
 			@Override
-			public void itemsAdded(ListChangeEvent e) {/* OK */}
+			public void itemsAdded(ListAddEvent e) {/* OK */}
 			@Override
-			public void itemsRemoved(ListChangeEvent e) {/* OK */}
+			public void itemsRemoved(ListRemoveEvent e) {/* OK */}
 			@Override
-			public void itemsReplaced(ListChangeEvent e) {/* OK */}
+			public void itemsReplaced(ListReplaceEvent e) {/* OK */}
 		});
 		this.wrappedCollectionHolder.add("foo");
 		this.wrappedCollectionHolder.add("bar");
@@ -173,19 +181,19 @@ public class SortedListValueModelAdapterTests extends TestCase {
 	}
 
 	class TestListChangeListener implements ListChangeListener {
-		public void itemsAdded(ListChangeEvent e) {
+		public void itemsAdded(ListAddEvent e) {
 			fail("unexpected event");
 		}
-		public void itemsRemoved(ListChangeEvent e) {
+		public void itemsRemoved(ListRemoveEvent e) {
 			fail("unexpected event");
 		}
-		public void itemsReplaced(ListChangeEvent e) {
+		public void itemsReplaced(ListReplaceEvent e) {
 			fail("unexpected event");
 		}
-		public void itemsMoved(ListChangeEvent e) {
+		public void itemsMoved(ListMoveEvent e) {
 			fail("unexpected event");
 		}
-		public void listCleared(ListChangeEvent e) {
+		public void listCleared(ListClearEvent e) {
 			fail("unexpected event");
 		}
 		public void listChanged(ListChangeEvent e) {