convert ListenerList to Iterable

14 files changed, 28 insertions, 50 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java
index 94f9bceb57..e140be0953 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/gen/AbstractJptGenerator.java
@@ -159,7 +159,7 @@ public abstract class AbstractJptGenerator implements JptGenerator
 	}
 
 	private void notifyLaunchConfigListeners(boolean generationSuccessful) {
-		for(LaunchConfigListener launchConfigListener : this.launchConfigListenerList.getListeners()) {
+		for(LaunchConfigListener launchConfigListener : this.launchConfigListenerList) {
 			launchConfigListener.launchCompleted(generationSuccessful);
 		}	
 	}
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/RootBinaryModel.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/RootBinaryModel.java
index 350edf21d6..fc7961cea0 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/RootBinaryModel.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/RootBinaryModel.java
@@ -60,7 +60,7 @@ abstract class RootBinaryModel
 	// ********** JavaResourceNode.Root implementation **********
 
 	public void resourceModelChanged() {
-		for (JptResourceModelListener listener : this.resourceModelListenerList.getListeners()) {
+		for (JptResourceModelListener listener : this.resourceModelListenerList) {
 			listener.resourceModelChanged(this);
 		}
 	}
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceCompilationUnit.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceCompilationUnit.java
index ba4456c0ba..81eaad7cf3 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceCompilationUnit.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceCompilationUnit.java
@@ -111,7 +111,7 @@ public abstract class SourceCompilationUnit
 	// ********** JavaResourceNode.Root implementation **********
 
 	public void resourceModelChanged() {
-		for (JptResourceModelListener listener : this.resourceModelListenerList.getListeners()) {
+		for (JptResourceModelListener listener : this.resourceModelListenerList) {
 			listener.resourceModelChanged(this);
 		}
 	}
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/NotifyingRepeatingJobCommandWrapper.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/NotifyingRepeatingJobCommandWrapper.java
index 168dd95b35..cb24027a48 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/NotifyingRepeatingJobCommandWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/utility/command/NotifyingRepeatingJobCommandWrapper.java
@@ -78,7 +78,7 @@ public class NotifyingRepeatingJobCommandWrapper
 	 * cancel the notifications (e.g. via a monitor or exception).
 	 */
 	private void executionQuiesced() {
-		for (Listener listener : this.listenerList.getListeners()) {
+		for (Listener listener : this.listenerList) {
 			this.notifyListener(listener);
 		}
 	}
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JptXmlResource.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JptXmlResource.java
index 689631aebc..68909994a5 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JptXmlResource.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/JptXmlResource.java
@@ -278,7 +278,7 @@ public class JptXmlResource
 	// ********** listener notifications **********
 
 	protected void resourceModelChanged() {
-		for (JptResourceModelListener listener : this.resourceModelListenerList.getListeners()) {
+		for (JptResourceModelListener listener : this.resourceModelListenerList) {
 			try {
 				listener.resourceModelChanged(this);
 			} catch (Exception ex) {
@@ -288,7 +288,7 @@ public class JptXmlResource
 	}
 
 	protected void resourceModelReverted() {
-		for (JptResourceModelListener listener : this.resourceModelListenerList.getListeners()) {
+		for (JptResourceModelListener listener : this.resourceModelListenerList) {
 			try {
 				listener.resourceModelReverted(this);
 			} catch (Exception ex) {
@@ -298,7 +298,7 @@ public class JptXmlResource
 	}
 
 	protected void resourceModelUnloaded() {
-		for (JptResourceModelListener listener : this.resourceModelListenerList.getListeners()) {
+		for (JptResourceModelListener listener : this.resourceModelListenerList) {
 			try {
 				listener.resourceModelUnloaded(this);
 			} catch (Exception ex) {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java
index 502adf35ef..50e8de4957 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractItemStructuredStateProviderManager.java
@@ -330,7 +330,7 @@ abstract class AbstractItemStructuredStateProviderManager<V extends StructuredVi
 	}
 
 	/* private-protected */ void fireLabelProviderChanged(LabelProviderChangedEvent event) {
-		for (ILabelProviderListener listener : this.listenerList.getListeners()) {
+		for (ILabelProviderListener listener : this.listenerList) {
 			try {
 				listener.labelProviderChanged(event);
 			} catch (Throwable t) {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractSelectionProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractSelectionProvider.java
index cb30c5d9e1..28882d1ce9 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractSelectionProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractSelectionProvider.java
@@ -44,7 +44,7 @@ public abstract class AbstractSelectionProvider
 
 	protected void fireSelectionChanged(ISelection selection) {
 		SelectionChangedEvent event = new SelectionChangedEvent(this, selection);
-		for (ISelectionChangedListener listener : this.listenerList.getListeners()) {
+		for (ISelectionChangedListener listener : this.listenerList) {
 			this.fireSelectionChanged(listener, event);
         }
 	}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java
index ca9a6f55a6..e0a5d8e5f3 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java
@@ -511,7 +511,7 @@ public abstract class AbstractComboModelAdapter<E> {
 	private void notifyListeners(E selectedItem) {
 		if (this.selectionChangeListenerList.size() > 0) {
 			SelectionChangeEvent<E> scEvent = new SelectionChangeEvent<E>(this, selectedItem);
-			for (SelectionChangeListener<E> selectionChangeListener : this.selectionChangeListenerList.getListeners()) {
+			for (SelectionChangeListener<E> selectionChangeListener : this.selectionChangeListenerList) {
 				selectionChangeListener.selectionChanged(scEvent);
 			}
 		}
@@ -566,7 +566,7 @@ public abstract class AbstractComboModelAdapter<E> {
 			// there should be only a single item selected during a double-click(?)
 			E selection = this.listHolder.get(this.comboHolder.getSelectionIndex());
 			DoubleClickEvent<E> dcEvent = new DoubleClickEvent<E>(this, selection);
-			for (DoubleClickListener<E> doubleClickListener : this.doubleClickListenerList.getListeners()) {
+			for (DoubleClickListener<E> doubleClickListener : this.doubleClickListenerList) {
 				doubleClickListener.doubleClick(dcEvent);
 			}
 		}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java
index 8efabfa013..bf4bb33957 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java
@@ -613,7 +613,7 @@ public class TableModelAdapter<E> {
 	protected void tableSelectionChanged(@SuppressWarnings("unused") SelectionEvent event) {
 		if (this.selectionChangeListenerList.size() > 0) {
 			SelectionChangeEvent<E> scEvent = new SelectionChangeEvent<E>(this, this.selectedItems());
-			for (SelectionChangeListener<E> selectionChangeListener : this.selectionChangeListenerList.getListeners()) {
+			for (SelectionChangeListener<E> selectionChangeListener : this.selectionChangeListenerList) {
 				selectionChangeListener.selectionChanged(scEvent);
 			}
 		}
@@ -638,7 +638,7 @@ public class TableModelAdapter<E> {
 			// there should be only a single item selected during a double-click(?)
 			E selection = this.listHolder.get(this.table.getSelectionIndex());
 			DoubleClickEvent<E> dcEvent = new DoubleClickEvent<E>(this, selection);
-			for (DoubleClickListener<E> doubleClickListener : this.doubleClickListenerList.getListeners()) {
+			for (DoubleClickListener<E> doubleClickListener : this.doubleClickListenerList) {
 				doubleClickListener.doubleClick(dcEvent);
 			}
 		}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ListenerList.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ListenerList.java
index 77cd47eb62..cc870b3038 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ListenerList.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/ListenerList.java
@@ -11,7 +11,8 @@ package org.eclipse.jpt.common.utility.internal;
 
 import java.lang.reflect.Array;
 import java.util.Arrays;
-import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
+import java.util.Iterator;
+import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 
 /**
  * Maintain a thread-safe list of listeners that does not allow adding
@@ -19,7 +20,9 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
  * 
  * @param <L> the type of listeners held by the list
  */
-public class ListenerList<L> {
+public class ListenerList<L>
+	implements Iterable<L>
+{
 	/**
 	 * We can mark this <code>volatile</code> and not synchronize the read
 	 * methods because we never change the <em>contents</em> of the array.
@@ -56,8 +59,8 @@ public class ListenerList<L> {
 	/**
 	 * Return the listeners.
 	 */
-	public Iterable<L> getListeners() {
-		return IterableTools.iterable(this.listeners);
+	public Iterator<L> iterator() {
+		return IteratorTools.iterator(this.listeners);
 	}
 
 	/**
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/AsynchronousNotifyingRepeatingCommandWrapper.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/AsynchronousNotifyingRepeatingCommandWrapper.java
index 3ad226fade..cb925e3b95 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/AsynchronousNotifyingRepeatingCommandWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/AsynchronousNotifyingRepeatingCommandWrapper.java
@@ -108,7 +108,7 @@ public class AsynchronousNotifyingRepeatingCommandWrapper
 	 * Notify our listeners.
 	 */
 	/* CU private */ void executionQuiesced() {
-		for (Listener listener : this.listenerList.getListeners()) {
+		for (Listener listener : this.listenerList) {
 			try {
 				listener.executionQuiesced(this);
 			} catch (Throwable ex) {
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/NotifyingRepeatingCommandWrapper.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/NotifyingRepeatingCommandWrapper.java
index 58eba1229c..046c7a3b54 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/NotifyingRepeatingCommandWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/command/NotifyingRepeatingCommandWrapper.java
@@ -87,7 +87,7 @@ public class NotifyingRepeatingCommandWrapper
 	 * Notify our listeners.
 	 */
 	private void executionQuiesced() {
-		for (Listener listener : this.listenerList.getListeners()) {
+		for (Listener listener : this.listenerList) {
 			try {
 				listener.executionQuiesced(this);
 			} catch (Throwable ex) {
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/AspectChangeSupport.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/AspectChangeSupport.java
index 81427e140f..b4aacbf4bd 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/AspectChangeSupport.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/AspectChangeSupport.java
@@ -77,7 +77,7 @@ public class AspectChangeSupport
 
 	private Iterable<Listener> getListeners() {
 		ListenerList<Listener> listenerList = this.getListenerList();
-		return (listenerList == null) ? null : listenerList.getListeners();
+		return (listenerList == null) ? null : listenerList;
 	}
 
 	private ListenerList<Listener> getListenerList() {
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/ChangeSupport.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/ChangeSupport.java
index 4db36fe52f..826cd9d31a 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/ChangeSupport.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/ChangeSupport.java
@@ -282,13 +282,8 @@ public class ChangeSupport {
 		return this.hasAnyListeners(this.getChangeListenerClass());
 	}
 
-	private ListenerList<ChangeListener> getChangeListenerList() {
-		return this.getListenerList(CHANGE_LISTENER_CLASS);
-	}
-
 	private Iterable<ChangeListener> getChangeListeners() {
-		ListenerList<ChangeListener> listenerList = this.getChangeListenerList();
-		return (listenerList == null) ? null : listenerList.getListeners();
+		return this.getListenerList(CHANGE_LISTENER_CLASS);
 	}
 
 	private boolean hasChangeListener(ChangeListener listener) {
@@ -321,13 +316,8 @@ public class ChangeSupport {
 		return this.hasAnyListeners(STATE_CHANGE_LISTENER_CLASS);
 	}
 
-	private ListenerList<StateChangeListener> getStateChangeListenerList() {
-		return this.getListenerList(STATE_CHANGE_LISTENER_CLASS);
-	}
-
 	private Iterable<StateChangeListener> getStateChangeListeners() {
-		ListenerList<StateChangeListener> listenerList = this.getStateChangeListenerList();
-		return (listenerList == null) ? null : listenerList.getListeners();
+		return this.getListenerList(STATE_CHANGE_LISTENER_CLASS);
 	}
 
 	private boolean hasStateChangeListener(StateChangeListener listener) {
@@ -433,13 +423,8 @@ public class ChangeSupport {
 		return this.hasAnyListeners(PROPERTY_CHANGE_LISTENER_CLASS, propertyName);
 	}
 
-	private ListenerList<PropertyChangeListener> getPropertyChangeListenerList(String propertyName) {
-		return this.getListenerList(PROPERTY_CHANGE_LISTENER_CLASS, propertyName);
-	}
-
 	private Iterable<PropertyChangeListener> getPropertyChangeListeners(String propertyName) {
-		ListenerList<PropertyChangeListener> listenerList = this.getPropertyChangeListenerList(propertyName);
-		return (listenerList == null) ? null : listenerList.getListeners();
+		return this.getListenerList(PROPERTY_CHANGE_LISTENER_CLASS, propertyName);
 	}
 
 	private boolean hasPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
@@ -685,13 +670,8 @@ public class ChangeSupport {
 		return this.hasAnyListeners(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
 	}
 
-	private ListenerList<CollectionChangeListener> getCollectionChangeListenerList(String collectionName) {
-		return this.getListenerList(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
-	}
-
 	private Iterable<CollectionChangeListener> getCollectionChangeListeners(String collectionName) {
-		ListenerList<CollectionChangeListener> listenerList = this.getCollectionChangeListenerList(collectionName);
-		return (listenerList == null) ? null : listenerList.getListeners();
+		return this.getListenerList(COLLECTION_CHANGE_LISTENER_CLASS, collectionName);
 	}
 
 	private boolean hasCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
@@ -1446,13 +1426,8 @@ public class ChangeSupport {
 		return this.hasAnyListeners(LIST_CHANGE_LISTENER_CLASS, listName);
 	}
 
-	private ListenerList<ListChangeListener> getListChangeListenerList(String listName) {
-		return this.getListenerList(LIST_CHANGE_LISTENER_CLASS, listName);
-	}
-
 	private Iterable<ListChangeListener> getListChangeListeners(String listName) {
-		ListenerList<ListChangeListener> listenerList = this.getListChangeListenerList(listName);
-		return (listenerList == null) ? null : listenerList.getListeners();
+		return this.getListenerList(LIST_CHANGE_LISTENER_CLASS, listName);
 	}
 
 	private boolean hasListChangeListener(String listName, ListChangeListener listener) {