minor clean-up

2 files changed, 19 insertions, 19 deletions

diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/ListenerListTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/ListenerListTests.java
index d2f7d3ff05..33ea3129b4 100644
--- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/ListenerListTests.java
+++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/ListenerListTests.java
@@ -5,7 +5,7 @@ import java.util.EventListener;
 
 import junit.framework.TestCase;
 
-import org.eclipse.jpt.utility.internal.ArrayTools;
+import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.ListenerList;
 
 @SuppressWarnings("nls")
@@ -19,15 +19,15 @@ public class ListenerListTests extends TestCase {
 		ListenerList<Listener> listenerList = new ListenerList<Listener>(Listener.class);
 		Listener listener1 = new LocalListener();
 		Listener listener2 = new LocalListener();
-		Listener[] listeners = listenerList.getListeners();
-		assertEquals(0, listeners.length);
+		Iterable<Listener> listeners = listenerList.getListeners();
+		assertEquals(0, CollectionTools.size(listeners));
 
 		listenerList.add(listener1);
 		listenerList.add(listener2);
 		listeners = listenerList.getListeners();
-		assertEquals(2, listeners.length);
-		assertTrue(ArrayTools.contains(listeners, listener1));
-		assertTrue(ArrayTools.contains(listeners, listener2));
+		assertEquals(2, CollectionTools.size(listeners));
+		assertTrue(CollectionTools.contains(listeners, listener1));
+		assertTrue(CollectionTools.contains(listeners, listener2));
 	}
 
 	public void testSize() throws Exception {
@@ -85,15 +85,15 @@ public class ListenerListTests extends TestCase {
 		Listener listener2 = new LocalListener();
 		listenerList.add(listener1);
 		listenerList.add(listener2);
-		assertTrue(ArrayTools.contains(listenerList.getListeners(), listener1));
-		assertTrue(ArrayTools.contains(listenerList.getListeners(), listener2));
+		assertTrue(CollectionTools.contains(listenerList.getListeners(), listener1));
+		assertTrue(CollectionTools.contains(listenerList.getListeners(), listener2));
 
 		listenerList.remove(listener1);
-		assertFalse(ArrayTools.contains(listenerList.getListeners(), listener1));
-		assertTrue(ArrayTools.contains(listenerList.getListeners(), listener2));
+		assertFalse(CollectionTools.contains(listenerList.getListeners(), listener1));
+		assertTrue(CollectionTools.contains(listenerList.getListeners(), listener2));
 
 		listenerList.remove(listener2);
-		assertFalse(ArrayTools.contains(listenerList.getListeners(), listener2));
+		assertFalse(CollectionTools.contains(listenerList.getListeners(), listener2));
 	}
 
 	public void testRemove_null() throws Exception {
@@ -130,12 +130,12 @@ public class ListenerListTests extends TestCase {
 		Listener listener2 = new LocalListener();
 		listenerList.add(listener1);
 		listenerList.add(listener2);
-		assertTrue(ArrayTools.contains(listenerList.getListeners(), listener1));
-		assertTrue(ArrayTools.contains(listenerList.getListeners(), listener2));
+		assertTrue(CollectionTools.contains(listenerList.getListeners(), listener1));
+		assertTrue(CollectionTools.contains(listenerList.getListeners(), listener2));
 
 		listenerList.clear();
-		assertFalse(ArrayTools.contains(listenerList.getListeners(), listener1));
-		assertFalse(ArrayTools.contains(listenerList.getListeners(), listener2));
+		assertFalse(CollectionTools.contains(listenerList.getListeners(), listener1));
+		assertFalse(CollectionTools.contains(listenerList.getListeners(), listener2));
 	}
 
 //TODO - This test doesn't pass in the Eclipse build environment (Linux) for some reason
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 acf84ffef1..22276502f7 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
@@ -13,7 +13,7 @@ import java.util.EventListener;
 
 import junit.framework.TestCase;
 
-import org.eclipse.jpt.utility.internal.ArrayTools;
+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;
@@ -154,15 +154,15 @@ public class NewEventTests extends TestCase {
 		private ListenerList<FooChangeListener> getFooChangeListenerList() {
 			return this.getListenerList(FOO_CHANGE_LISTENER_CLASS);
 		}
-		private FooChangeListener[] getFooChangeListeners() {
+		private Iterable<FooChangeListener> getFooChangeListeners() {
 			ListenerList<FooChangeListener> listenerList = this.getFooChangeListenerList();
 			return (listenerList == null) ? null : listenerList.getListeners();
 		}
 		private boolean hasFooChangeListener(FooChangeListener listener) {
-			return ArrayTools.contains(this.getFooChangeListeners(), listener);
+			return CollectionTools.contains(this.getFooChangeListeners(), listener);
 		}
 		public void fireFooChanged() {
-			FooChangeListener[] listeners = this.getFooChangeListeners();
+			Iterable<FooChangeListener> listeners = this.getFooChangeListeners();
 			if (listeners != null) {
 				FooChangeEvent event = null;
 				for (FooChangeListener listener : listeners) {