renamed parms

47 files changed, 397 insertions, 397 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectAdapter.java
index 556ae2bea5..d4ebb94c4f 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectAdapter.java
@@ -90,7 +90,7 @@ public abstract class AspectAdapter<S>
 	 */
 	protected PropertyChangeListener buildSubjectChangeListener() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
+			public void propertyChanged(PropertyChangeEvent event) {
 				AspectAdapter.this.subjectChanged();
 			}
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/BufferedWritablePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/BufferedWritablePropertyValueModel.java
index 086cd2c154..e476c84609 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/BufferedWritablePropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/BufferedWritablePropertyValueModel.java
@@ -98,8 +98,8 @@ public class BufferedWritablePropertyValueModel<T>
 
 	protected PropertyChangeListener buildTriggerChangeListener() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				BufferedWritablePropertyValueModel.this.triggerChanged(e);
+			public void propertyChanged(PropertyChangeEvent event) {
+				BufferedWritablePropertyValueModel.this.triggerChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -161,16 +161,16 @@ public class BufferedWritablePropertyValueModel<T>
 	 * If we do have a "buffered" value, do nothing.
 	 */
 	@Override
-	protected void valueChanged(PropertyChangeEvent e) {
+	protected void valueChanged(PropertyChangeEvent event) {
 		if (this.accepting) {
 			// if we are currently "accepting" the value, ignore change notifications,
 			// since we caused them and our own listeners are already aware of the change
 			return;
 		}
 		if (this.buffering) {
-			this.handleChangeConflict(e);
+			this.handleChangeConflict(event);
 		} else {
-			this.firePropertyChanged(e.cloneWithSource(this));
+			this.firePropertyChanged(event.cloneWithSource(this));
 		}
 	}
 	
@@ -183,7 +183,7 @@ public class BufferedWritablePropertyValueModel<T>
 	 * and replace it with the new "wrapped" value, or you could throw an
 	 * exception.
 	 */
-	protected void handleChangeConflict(PropertyChangeEvent e) {
+	protected void handleChangeConflict(PropertyChangeEvent event) {
 		// the default is to do nothing
 	}
 	
@@ -193,13 +193,13 @@ public class BufferedWritablePropertyValueModel<T>
 	 * it to the wrapped value holder.
 	 * If it is now false, "reset" the buffered value to its original value.
 	 */
-	protected void triggerChanged(PropertyChangeEvent e) {
+	protected void triggerChanged(PropertyChangeEvent event) {
 		if ( ! this.buffering) {
 			// if nothing has been "buffered", we don't need to do anything:
 			// nothing needs to be passed through; nothing needs to be reset;
 			return;
 		}
-		if (((Boolean) e.newValue()).booleanValue()) {
+		if (((Boolean) event.newValue()).booleanValue()) {
 			// set the accepting flag so we ignore any events
 			// fired by the wrapped value holder
 			this.accepting = true;
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionAspectAdapter.java
index 5e22ec2598..2308044112 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionAspectAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionAspectAdapter.java
@@ -109,17 +109,17 @@ public abstract class CollectionAspectAdapter<S extends Model, E>
 	protected CollectionChangeListener buildCollectionChangeListener() {
 		// transform the subject's collection change events into VALUE collection change events
 		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent e) {
-				CollectionAspectAdapter.this.itemsAdded(e);
+			public void itemsAdded(CollectionChangeEvent event) {
+				CollectionAspectAdapter.this.itemsAdded(event);
 			}
-			public void itemsRemoved(CollectionChangeEvent e) {
-				CollectionAspectAdapter.this.itemsRemoved(e);
+			public void itemsRemoved(CollectionChangeEvent event) {
+				CollectionAspectAdapter.this.itemsRemoved(event);
 			}
-			public void collectionCleared(CollectionChangeEvent e) {
-				CollectionAspectAdapter.this.collectionCleared(e);
+			public void collectionCleared(CollectionChangeEvent event) {
+				CollectionAspectAdapter.this.collectionCleared(event);
 			}
-			public void collectionChanged(CollectionChangeEvent e) {
-				CollectionAspectAdapter.this.collectionChanged(e);
+			public void collectionChanged(CollectionChangeEvent event) {
+				CollectionAspectAdapter.this.collectionChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -218,19 +218,19 @@ public abstract class CollectionAspectAdapter<S extends Model, E>
 
 	// ********** behavior **********
 
-	protected void itemsAdded(CollectionChangeEvent e) {
-		this.fireItemsAdded(e.cloneWithSource(this, VALUES));
+	protected void itemsAdded(CollectionChangeEvent event) {
+		this.fireItemsAdded(event.cloneWithSource(this, VALUES));
 	}
 
-	protected void itemsRemoved(CollectionChangeEvent e) {
-		this.fireItemsRemoved(e.cloneWithSource(this, VALUES));
+	protected void itemsRemoved(CollectionChangeEvent event) {
+		this.fireItemsRemoved(event.cloneWithSource(this, VALUES));
 	}
 
-	protected void collectionCleared(CollectionChangeEvent e) {
+	protected void collectionCleared(CollectionChangeEvent event) {
 		this.fireCollectionCleared(VALUES);  // nothing from original event to forward
 	}
 
-	protected void collectionChanged(CollectionChangeEvent e) {
+	protected void collectionChanged(CollectionChangeEvent event) {
 		this.fireCollectionChanged(VALUES);  // nothing from original event to forward
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionListValueModelAdapter.java
index 1a1e0ebff6..1086423c0b 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionListValueModelAdapter.java
@@ -85,17 +85,17 @@ public class CollectionListValueModelAdapter<E>
 	 */
 	protected CollectionChangeListener buildCollectionChangeListener() {
 		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent e) {
-				CollectionListValueModelAdapter.this.itemsAdded(e);
+			public void itemsAdded(CollectionChangeEvent event) {
+				CollectionListValueModelAdapter.this.itemsAdded(event);
 			}
-			public void itemsRemoved(CollectionChangeEvent e) {
-				CollectionListValueModelAdapter.this.itemsRemoved(e);
+			public void itemsRemoved(CollectionChangeEvent event) {
+				CollectionListValueModelAdapter.this.itemsRemoved(event);
 			}
-			public void collectionCleared(CollectionChangeEvent e) {
-				CollectionListValueModelAdapter.this.collectionCleared(e);
+			public void collectionCleared(CollectionChangeEvent event) {
+				CollectionListValueModelAdapter.this.collectionCleared(event);
 			}
-			public void collectionChanged(CollectionChangeEvent e) {
-				CollectionListValueModelAdapter.this.collectionChanged(e);
+			public void collectionChanged(CollectionChangeEvent event) {
+				CollectionListValueModelAdapter.this.collectionChanged(event);
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionPropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionPropertyValueModelAdapter.java
index b03ebfb4a5..c24d0a3f32 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionPropertyValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CollectionPropertyValueModelAdapter.java
@@ -24,10 +24,10 @@ import org.eclipse.jpt.utility.internal.model.listener.CollectionChangeListener;
  *     current collection value
  * 
  * Subclasses might want to override:
- * - #itemsAdded(CollectionChangeEvent e)
- * - #itemsRemoved(CollectionChangeEvent e)
- * - #collectionCleared(CollectionChangeEvent e)
- * - #collectionChanged(CollectionChangeEvent e)
+ * - #itemsAdded(CollectionChangeEvent event)
+ * - #itemsRemoved(CollectionChangeEvent event)
+ * - #collectionCleared(CollectionChangeEvent event)
+ * - #collectionChanged(CollectionChangeEvent event)
  *     to improve performance (by not recalculating the value, if possible)
  */
 public abstract class CollectionPropertyValueModelAdapter<T>
@@ -54,17 +54,17 @@ public abstract class CollectionPropertyValueModelAdapter<T>
 
 	protected CollectionChangeListener buildCollectionChangeListener() {
 		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent e) {
-				CollectionPropertyValueModelAdapter.this.itemsAdded(e);
+			public void itemsAdded(CollectionChangeEvent event) {
+				CollectionPropertyValueModelAdapter.this.itemsAdded(event);
 			}		
-			public void itemsRemoved(CollectionChangeEvent e) {
-				CollectionPropertyValueModelAdapter.this.itemsRemoved(e);
+			public void itemsRemoved(CollectionChangeEvent event) {
+				CollectionPropertyValueModelAdapter.this.itemsRemoved(event);
 			}
-			public void collectionCleared(CollectionChangeEvent e) {
-				CollectionPropertyValueModelAdapter.this.collectionCleared(e);
+			public void collectionCleared(CollectionChangeEvent event) {
+				CollectionPropertyValueModelAdapter.this.collectionCleared(event);
 			}
-			public void collectionChanged(CollectionChangeEvent e) {
-				CollectionPropertyValueModelAdapter.this.collectionChanged(e);
+			public void collectionChanged(CollectionChangeEvent event) {
+				CollectionPropertyValueModelAdapter.this.collectionChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -104,7 +104,7 @@ public abstract class CollectionPropertyValueModelAdapter<T>
 	 * Items were added to the wrapped collection holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected void itemsAdded(CollectionChangeEvent e) {
+	protected void itemsAdded(CollectionChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -113,7 +113,7 @@ public abstract class CollectionPropertyValueModelAdapter<T>
 	 * Items were removed from the wrapped collection holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected void itemsRemoved(CollectionChangeEvent e) {
+	protected void itemsRemoved(CollectionChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -122,7 +122,7 @@ public abstract class CollectionPropertyValueModelAdapter<T>
 	 * The wrapped collection holder was cleared;
 	 * propagate the change notification appropriately.
 	 */
-	protected void collectionCleared(CollectionChangeEvent e) {
+	protected void collectionCleared(CollectionChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -131,7 +131,7 @@ public abstract class CollectionPropertyValueModelAdapter<T>
 	 * The value of the wrapped collection holder has changed;
 	 * propagate the change notification appropriately.
 	 */
-	protected void collectionChanged(CollectionChangeEvent e) {
+	protected void collectionChanged(CollectionChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ExtendedListValueModelWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ExtendedListValueModelWrapper.java
index 1d69c3e39c..bec66aa5c0 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ExtendedListValueModelWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ExtendedListValueModelWrapper.java
@@ -150,32 +150,32 @@ public class ExtendedListValueModelWrapper<E>
 	// ********** ListValueModelWrapper implementation/overrides **********
 
 	@Override
-	protected void itemsAdded(ListChangeEvent e) {
-		this.fireItemsAdded(e.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
+	protected void itemsAdded(ListChangeEvent event) {
+		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
 	}
 
 	@Override
-	protected void itemsRemoved(ListChangeEvent e) {
-		this.fireItemsRemoved(e.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
+	protected void itemsRemoved(ListChangeEvent event) {
+		this.fireItemsRemoved(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
 	}
 
 	@Override
-	protected void itemsReplaced(ListChangeEvent e) {
-		this.fireItemsReplaced(e.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
+	protected void itemsReplaced(ListChangeEvent event) {
+		this.fireItemsReplaced(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
 	}
 
 	@Override
-	protected void itemsMoved(ListChangeEvent e) {
-		this.fireItemsMoved(e.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
+	protected void itemsMoved(ListChangeEvent event) {
+		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES, this.prefix.size()));
 	}
 
 	@Override
-	protected void listCleared(ListChangeEvent e) {
-		this.fireListCleared(LIST_VALUES);
+	protected void listCleared(ListChangeEvent event) {
+		this.fireListChanged(LIST_VALUES);  // not "cleared"
 	}
 
 	@Override
-	protected void listChanged(ListChangeEvent e) {
+	protected void listChanged(ListChangeEvent event) {
 		this.fireListChanged(LIST_VALUES);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringCollectionValueModel.java
index e645484d6f..c76875fab5 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringCollectionValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringCollectionValueModel.java
@@ -117,26 +117,26 @@ public class FilteringCollectionValueModel<E>
 	}
 
 	@Override
-	protected void itemsAdded(CollectionChangeEvent e) {
+	protected void itemsAdded(CollectionChangeEvent event) {
 		// filter the values before propagating the change event
-		this.addItemsToCollection(this.filter(this.items(e)), this.filteredItems, VALUES);
+		this.addItemsToCollection(this.filter(this.items(event)), this.filteredItems, VALUES);
 	}
 
 	@Override
-	protected void itemsRemoved(CollectionChangeEvent e) {
+	protected void itemsRemoved(CollectionChangeEvent event) {
 		// do *not* filter the values, because they may no longer be
 		// "accepted" and that might be why they were removed in the first place;
 		// anyway, any extraneous items are harmless
-		this.removeItemsFromCollection(e.items(), this.filteredItems, VALUES);
+		this.removeItemsFromCollection(event.items(), this.filteredItems, VALUES);
 	}
 
 	@Override
-	protected void collectionCleared(CollectionChangeEvent e) {
+	protected void collectionCleared(CollectionChangeEvent event) {
 		this.clearCollection(this.filteredItems, VALUES);
 	}
 
 	@Override
-	protected void collectionChanged(CollectionChangeEvent e) {
+	protected void collectionChanged(CollectionChangeEvent event) {
 		this.rebuildFilteredItems();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringPropertyValueModel.java
index 6ac16b63e7..ac2691226c 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringPropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringPropertyValueModel.java
@@ -92,12 +92,12 @@ public class FilteringPropertyValueModel<T>
 	// ********** PropertyValueModelWrapper implementation **********
 
 	@Override
-	protected void valueChanged(PropertyChangeEvent e) {
+	protected void valueChanged(PropertyChangeEvent event) {
 		// filter the values before propagating the change event
 		@SuppressWarnings("unchecked")
-		Object oldValue = this.filterValue((T) e.oldValue());
+		Object oldValue = this.filterValue((T) event.oldValue());
 		@SuppressWarnings("unchecked")
-		Object newValue = this.filterValue((T) e.newValue());
+		Object newValue = this.filterValue((T) event.newValue());
 		this.firePropertyChanged(VALUE, oldValue, newValue);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemAspectListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemAspectListValueModelAdapter.java
index 2460a1d814..e389716406 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemAspectListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemAspectListValueModelAdapter.java
@@ -175,10 +175,10 @@ public abstract class ItemAspectListValueModelAdapter<E>
 	 * Forward the event and begin listening to the added items.
 	 */
 	@Override
-	protected void itemsAdded(ListChangeEvent e) {
+	protected void itemsAdded(ListChangeEvent event) {
 		// re-fire event with the wrapper as the source
-		this.fireItemsAdded(e.cloneWithSource(this, LIST_VALUES));
-		this.engageItems(this.items(e));
+		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES));
+		this.engageItems(this.items(event));
 	}
 
 	/**
@@ -186,10 +186,10 @@ public abstract class ItemAspectListValueModelAdapter<E>
 	 * Stop listening to the removed items and forward the event.
 	 */
 	@Override
-	protected void itemsRemoved(ListChangeEvent e) {
-		this.disengageItems(this.items(e));
+	protected void itemsRemoved(ListChangeEvent event) {
+		this.disengageItems(this.items(event));
 		// re-fire event with the wrapper as the source
-		this.fireItemsRemoved(e.cloneWithSource(this, LIST_VALUES));
+		this.fireItemsRemoved(event.cloneWithSource(this, LIST_VALUES));
 	}
 
 	/**
@@ -198,11 +198,11 @@ public abstract class ItemAspectListValueModelAdapter<E>
 	 * and begin listening to the added items.
 	 */
 	@Override
-	protected void itemsReplaced(ListChangeEvent e) {
-		this.disengageItems(this.replacedItems(e));
+	protected void itemsReplaced(ListChangeEvent event) {
+		this.disengageItems(this.replacedItems(event));
 		// re-fire event with the wrapper as the source
-		this.fireItemsReplaced(e.cloneWithSource(this, LIST_VALUES));
-		this.engageItems(this.items(e));
+		this.fireItemsReplaced(event.cloneWithSource(this, LIST_VALUES));
+		this.engageItems(this.items(event));
 	}
 
 	/**
@@ -210,9 +210,9 @@ public abstract class ItemAspectListValueModelAdapter<E>
 	 * No need to change any listeners; just forward the event.
 	 */
 	@Override
-	protected void itemsMoved(ListChangeEvent e) {
+	protected void itemsMoved(ListChangeEvent event) {
 		// re-fire event with the wrapper as the source
-		this.fireItemsMoved(e.cloneWithSource(this, LIST_VALUES));
+		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES));
 	}
 
 	/**
@@ -220,7 +220,7 @@ public abstract class ItemAspectListValueModelAdapter<E>
 	 * Stop listening to the removed items and forward the event.
 	 */
 	@Override
-	protected void listCleared(ListChangeEvent e) {
+	protected void listCleared(ListChangeEvent event) {
 		// we should only need to disengage each item once...
 		// make a copy to prevent a ConcurrentModificationException
 		Collection<E> keys = new ArrayList<E>(this.counters.keySet());
@@ -235,7 +235,7 @@ public abstract class ItemAspectListValueModelAdapter<E>
 	 * Reconfigure our listeners and forward the event.
 	 */
 	@Override
-	protected void listChanged(ListChangeEvent e) {
+	protected void listChanged(ListChangeEvent event) {
 		// we should only need to disengage each item once...
 		// make a copy to prevent a ConcurrentModificationException
 		Collection<E> keys = new ArrayList<E>(this.counters.keySet());
@@ -253,8 +253,8 @@ public abstract class ItemAspectListValueModelAdapter<E>
 	 * The specified item has a bound property that has changed.
 	 * Notify listeners of the change.
 	 */
-	protected void itemAspectChanged(EventObject e) {
-		Object item = e.getSource();
+	protected void itemAspectChanged(EventObject event) {
+		Object item = event.getSource();
 		int index = this.lastIdentityIndexOf(item);
 		while (index != -1) {
 			this.itemAspectChanged(index, item);
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemCollectionListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemCollectionListValueModelAdapter.java
index 6157a6a3e0..2315c96ffa 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemCollectionListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemCollectionListValueModelAdapter.java
@@ -57,17 +57,17 @@ public class ItemCollectionListValueModelAdapter<E>
 	 */
 	protected CollectionChangeListener buildItemCollectionListener() {
 		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent e) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(e);
+			public void itemsAdded(CollectionChangeEvent event) {
+				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void itemsRemoved(CollectionChangeEvent e) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(e);
+			public void itemsRemoved(CollectionChangeEvent event) {
+				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void collectionCleared(CollectionChangeEvent e) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(e);
+			public void collectionCleared(CollectionChangeEvent event) {
+				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void collectionChanged(CollectionChangeEvent e) {
-				ItemCollectionListValueModelAdapter.this.itemAspectChanged(e);
+			public void collectionChanged(CollectionChangeEvent event) {
+				ItemCollectionListValueModelAdapter.this.itemAspectChanged(event);
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemListListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemListListValueModelAdapter.java
index e6174055bd..e521b9f44a 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemListListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemListListValueModelAdapter.java
@@ -57,23 +57,23 @@ public class ItemListListValueModelAdapter<E>
 	 */
 	protected ListChangeListener buildItemListListener() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(e);
+			public void itemsAdded(ListChangeEvent event) {
+				ItemListListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void itemsRemoved(ListChangeEvent e) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(e);
+			public void itemsRemoved(ListChangeEvent event) {
+				ItemListListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(e);
+			public void itemsReplaced(ListChangeEvent event) {
+				ItemListListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(e);
+			public void itemsMoved(ListChangeEvent event) {
+				ItemListListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void listCleared(ListChangeEvent e) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(e);
+			public void listCleared(ListChangeEvent event) {
+				ItemListListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void listChanged(ListChangeEvent e) {
-				ItemListListValueModelAdapter.this.itemAspectChanged(e);
+			public void listChanged(ListChangeEvent event) {
+				ItemListListValueModelAdapter.this.itemAspectChanged(event);
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemPropertyListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemPropertyListValueModelAdapter.java
index 9ec52ca98d..57e26c5dc9 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemPropertyListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemPropertyListValueModelAdapter.java
@@ -53,8 +53,8 @@ public class ItemPropertyListValueModelAdapter<E>
 
 	protected PropertyChangeListener buildItemPropertyListener() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				ItemPropertyListValueModelAdapter.this.itemAspectChanged(e);
+			public void propertyChanged(PropertyChangeEvent event) {
+				ItemPropertyListValueModelAdapter.this.itemAspectChanged(event);
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemStateListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemStateListValueModelAdapter.java
index 50c1a52c46..2eb1a14612 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemStateListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemStateListValueModelAdapter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 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.
@@ -46,8 +46,8 @@ public class ItemStateListValueModelAdapter<E>
 
 	protected StateChangeListener buildItemStateListener() {
 		return new StateChangeListener() {
-			public void stateChanged(StateChangeEvent e) {
-				ItemStateListValueModelAdapter.this.itemAspectChanged(e);
+			public void stateChanged(StateChangeEvent event) {
+				ItemStateListValueModelAdapter.this.itemAspectChanged(event);
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemTreeListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemTreeListValueModelAdapter.java
index 86ec2f5b89..160e25ffe5 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemTreeListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ItemTreeListValueModelAdapter.java
@@ -57,17 +57,17 @@ public class ItemTreeListValueModelAdapter<E>
 	 */
 	protected TreeChangeListener buildItemTreeListener() {
 		return new TreeChangeListener() {
-			public void nodeAdded(TreeChangeEvent e) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(e);
+			public void nodeAdded(TreeChangeEvent event) {
+				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void nodeRemoved(TreeChangeEvent e) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(e);
+			public void nodeRemoved(TreeChangeEvent event) {
+				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void treeCleared(TreeChangeEvent e) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(e);
+			public void treeCleared(TreeChangeEvent event) {
+				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
 			}
-			public void treeChanged(TreeChangeEvent e) {
-				ItemTreeListValueModelAdapter.this.itemAspectChanged(e);
+			public void treeChanged(TreeChangeEvent event) {
+				ItemTreeListValueModelAdapter.this.itemAspectChanged(event);
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListAspectAdapter.java
index fc94f933cb..dc9d140159 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListAspectAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListAspectAdapter.java
@@ -114,23 +114,23 @@ public abstract class ListAspectAdapter<S extends Model, E>
 	protected ListChangeListener buildListChangeListener() {
 		// transform the subject's list change events into VALUE list change events
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				ListAspectAdapter.this.itemsAdded(e);
+			public void itemsAdded(ListChangeEvent event) {
+				ListAspectAdapter.this.itemsAdded(event);
 			}
-			public void itemsRemoved(ListChangeEvent e) {
-				ListAspectAdapter.this.itemsRemoved(e);
+			public void itemsRemoved(ListChangeEvent event) {
+				ListAspectAdapter.this.itemsRemoved(event);
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				ListAspectAdapter.this.itemsReplaced(e);
+			public void itemsReplaced(ListChangeEvent event) {
+				ListAspectAdapter.this.itemsReplaced(event);
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				ListAspectAdapter.this.itemsMoved(e);
+			public void itemsMoved(ListChangeEvent event) {
+				ListAspectAdapter.this.itemsMoved(event);
 			}
-			public void listCleared(ListChangeEvent e) {
-				ListAspectAdapter.this.listCleared(e);
+			public void listCleared(ListChangeEvent event) {
+				ListAspectAdapter.this.listCleared(event);
 			}
-			public void listChanged(ListChangeEvent e) {
-				ListAspectAdapter.this.listChanged(e);
+			public void listChanged(ListChangeEvent event) {
+				ListAspectAdapter.this.listChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -259,27 +259,27 @@ public abstract class ListAspectAdapter<S extends Model, E>
 
 	// ********** behavior **********
 
-	protected void itemsAdded(ListChangeEvent e) {
-		this.fireItemsAdded(e.cloneWithSource(this, LIST_VALUES));
+	protected void itemsAdded(ListChangeEvent event) {
+		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES));
 	}
 
-	protected void itemsRemoved(ListChangeEvent e) {
-		this.fireItemsRemoved(e.cloneWithSource(this, LIST_VALUES));
+	protected void itemsRemoved(ListChangeEvent event) {
+		this.fireItemsRemoved(event.cloneWithSource(this, LIST_VALUES));
 	}
 
-	protected void itemsReplaced(ListChangeEvent e) {
-		this.fireItemsReplaced(e.cloneWithSource(this, LIST_VALUES));
+	protected void itemsReplaced(ListChangeEvent event) {
+		this.fireItemsReplaced(event.cloneWithSource(this, LIST_VALUES));
 	}
 
-	protected void itemsMoved(ListChangeEvent e) {
-		this.fireItemsMoved(e.cloneWithSource(this, LIST_VALUES));
+	protected void itemsMoved(ListChangeEvent event) {
+		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES));
 	}
 
-	protected void listCleared(ListChangeEvent e) {
+	protected void listCleared(ListChangeEvent event) {
 		this.fireListCleared(LIST_VALUES);  // nothing from original event to forward
 	}
 
-	protected void listChanged(ListChangeEvent e) {
+	protected void listChanged(ListChangeEvent event) {
 		this.fireListChanged(LIST_VALUES);  // nothing from original event to forward
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCollectionValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCollectionValueModelAdapter.java
index 42eab093f3..a1f905b71c 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCollectionValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCollectionValueModelAdapter.java
@@ -80,23 +80,23 @@ public class ListCollectionValueModelAdapter<E>
 	 */
 	protected ListChangeListener buildListChangeListener() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				ListCollectionValueModelAdapter.this.itemsAdded(e);
+			public void itemsAdded(ListChangeEvent event) {
+				ListCollectionValueModelAdapter.this.itemsAdded(event);
 			}
-			public void itemsRemoved(ListChangeEvent e) {
-				ListCollectionValueModelAdapter.this.itemsRemoved(e);
+			public void itemsRemoved(ListChangeEvent event) {
+				ListCollectionValueModelAdapter.this.itemsRemoved(event);
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				ListCollectionValueModelAdapter.this.itemsReplaced(e);
+			public void itemsReplaced(ListChangeEvent event) {
+				ListCollectionValueModelAdapter.this.itemsReplaced(event);
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				ListCollectionValueModelAdapter.this.itemsMoved(e);
+			public void itemsMoved(ListChangeEvent event) {
+				ListCollectionValueModelAdapter.this.itemsMoved(event);
 			}
-			public void listCleared(ListChangeEvent e) {
-				ListCollectionValueModelAdapter.this.listCleared(e);
+			public void listCleared(ListChangeEvent event) {
+				ListCollectionValueModelAdapter.this.listCleared(event);
 			}
-			public void listChanged(ListChangeEvent e) {
-				ListCollectionValueModelAdapter.this.listChanged(e);
+			public void listChanged(ListChangeEvent event) {
+				ListCollectionValueModelAdapter.this.listChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -225,18 +225,18 @@ public class ListCollectionValueModelAdapter<E>
 
 	// minimize suppressed warnings
 	@SuppressWarnings("unchecked")
-	protected ListIterator<E> items(ListChangeEvent e) {
-		return (ListIterator<E>) e.items();
+	protected ListIterator<E> items(ListChangeEvent event) {
+		return (ListIterator<E>) event.items();
 	}
 
 	// minimize suppressed warnings
 	@SuppressWarnings("unchecked")
-	protected ListIterator<E> replacedItems(ListChangeEvent e) {
-		return (ListIterator<E>) e.replacedItems();
+	protected ListIterator<E> replacedItems(ListChangeEvent event) {
+		return (ListIterator<E>) event.replacedItems();
 	}
 
-	protected void itemsAdded(ListChangeEvent e) {
-		this.addItemsToCollection(this.items(e), this.collection, VALUES);
+	protected void itemsAdded(ListChangeEvent event) {
+		this.addItemsToCollection(this.items(event), this.collection, VALUES);
 	}
 
 	protected void removeInternalItems(Iterator<E> items) {
@@ -250,20 +250,20 @@ public class ListCollectionValueModelAdapter<E>
 		}
 	}
 
-	protected void itemsRemoved(ListChangeEvent e) {
-		this.removeInternalItems(this.items(e));
+	protected void itemsRemoved(ListChangeEvent event) {
+		this.removeInternalItems(this.items(event));
 	}
 
-	protected void itemsReplaced(ListChangeEvent e) {
-		this.removeInternalItems(this.replacedItems(e));
-		this.addItemsToCollection(this.items(e), this.collection, VALUES);
+	protected void itemsReplaced(ListChangeEvent event) {
+		this.removeInternalItems(this.replacedItems(event));
+		this.addItemsToCollection(this.items(event), this.collection, VALUES);
 	}
 
-	protected void itemsMoved(ListChangeEvent e) {
+	protected void itemsMoved(ListChangeEvent event) {
 		// do nothing? moving items in a list has no net effect on a collection...
 	}
 
-	protected void listCleared(ListChangeEvent e) {
+	protected void listCleared(ListChangeEvent event) {
 		// put in empty check so we don't fire events unnecessarily
 		if ( ! this.collection.isEmpty()) {
 			this.collection.clear();
@@ -275,7 +275,7 @@ public class ListCollectionValueModelAdapter<E>
 	 * synchronize our internal collection with the wrapped list
 	 * and fire the appropriate events
 	 */
-	protected void listChanged(ListChangeEvent e) {
+	protected void listChanged(ListChangeEvent event) {
 		// put in empty check so we don't fire events unnecessarily
 		if ( ! this.collection.isEmpty()) {
 			@SuppressWarnings("unchecked")
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCurator.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCurator.java
index 900b5d5635..1a8d33fa0e 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCurator.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListCurator.java
@@ -65,7 +65,7 @@ public abstract class ListCurator<S extends Model, E>
 	 */
 	protected StateChangeListener buildStateChangeListener() {
 		return new StateChangeListener() {
-			public void stateChanged(StateChangeEvent e) {
+			public void stateChanged(StateChangeEvent event) {
 				ListCurator.this.submitInventoryReport();
 			}
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListPropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListPropertyValueModelAdapter.java
index 5d7d4ccc1b..82daa6a531 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListPropertyValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListPropertyValueModelAdapter.java
@@ -24,12 +24,12 @@ import org.eclipse.jpt.utility.internal.model.listener.ListChangeListener;
  *     current list value
  * 
  * Subclasses might want to override:
- * - #itemsAdded(ListChangeEvent e)
- * - #itemsRemoved(ListChangeEvent e)
- * - #itemsReplaced(ListChangeEvent e)
- * - #itemsMoved(ListChangeEvent e)
- * - #listCleared(ListChangeEvent e)
- * - #listChanged(ListChangeEvent e)
+ * - #itemsAdded(ListChangeEvent event)
+ * - #itemsRemoved(ListChangeEvent event)
+ * - #itemsReplaced(ListChangeEvent event)
+ * - #itemsMoved(ListChangeEvent event)
+ * - #listCleared(ListChangeEvent event)
+ * - #listChanged(ListChangeEvent event)
  *     to improve performance (by not recalculating the value, if possible)
  */
 public abstract class ListPropertyValueModelAdapter<T>
@@ -56,23 +56,23 @@ public abstract class ListPropertyValueModelAdapter<T>
 
 	protected ListChangeListener buildListChangeListener() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				ListPropertyValueModelAdapter.this.itemsAdded(e);
+			public void itemsAdded(ListChangeEvent event) {
+				ListPropertyValueModelAdapter.this.itemsAdded(event);
 			}		
-			public void itemsRemoved(ListChangeEvent e) {
-				ListPropertyValueModelAdapter.this.itemsRemoved(e);
+			public void itemsRemoved(ListChangeEvent event) {
+				ListPropertyValueModelAdapter.this.itemsRemoved(event);
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				ListPropertyValueModelAdapter.this.itemsReplaced(e);
+			public void itemsReplaced(ListChangeEvent event) {
+				ListPropertyValueModelAdapter.this.itemsReplaced(event);
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				ListPropertyValueModelAdapter.this.itemsMoved(e);
+			public void itemsMoved(ListChangeEvent event) {
+				ListPropertyValueModelAdapter.this.itemsMoved(event);
 			}
-			public void listCleared(ListChangeEvent e) {
-				ListPropertyValueModelAdapter.this.listCleared(e);
+			public void listCleared(ListChangeEvent event) {
+				ListPropertyValueModelAdapter.this.listCleared(event);
 			}
-			public void listChanged(ListChangeEvent e) {
-				ListPropertyValueModelAdapter.this.listChanged(e);
+			public void listChanged(ListChangeEvent event) {
+				ListPropertyValueModelAdapter.this.listChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -112,7 +112,7 @@ public abstract class ListPropertyValueModelAdapter<T>
 	 * Items were added to the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected void itemsAdded(ListChangeEvent e) {
+	protected void itemsAdded(ListChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -121,7 +121,7 @@ public abstract class ListPropertyValueModelAdapter<T>
 	 * Items were removed from the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected void itemsRemoved(ListChangeEvent e) {
+	protected void itemsRemoved(ListChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -130,7 +130,7 @@ public abstract class ListPropertyValueModelAdapter<T>
 	 * Items were replaced in the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected void itemsReplaced(ListChangeEvent e) {
+	protected void itemsReplaced(ListChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -139,7 +139,7 @@ public abstract class ListPropertyValueModelAdapter<T>
 	 * Items were moved in the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected void itemsMoved(ListChangeEvent e) {
+	protected void itemsMoved(ListChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -148,7 +148,7 @@ public abstract class ListPropertyValueModelAdapter<T>
 	 * The wrapped list holder was cleared;
 	 * propagate the change notification appropriately.
 	 */
-	protected void listCleared(ListChangeEvent e) {
+	protected void listCleared(ListChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
@@ -157,7 +157,7 @@ public abstract class ListPropertyValueModelAdapter<T>
 	 * The value of the wrapped list holder has changed;
 	 * propagate the change notification appropriately.
 	 */
-	protected void listChanged(ListChangeEvent e) {
+	protected void listChanged(ListChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListValueModelWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListValueModelWrapper.java
index 3c09087e12..96e5b9f10e 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListValueModelWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ListValueModelWrapper.java
@@ -58,23 +58,23 @@ public abstract class ListValueModelWrapper<E>
 
 	protected ListChangeListener buildListChangeListener() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				ListValueModelWrapper.this.itemsAdded(e);
+			public void itemsAdded(ListChangeEvent event) {
+				ListValueModelWrapper.this.itemsAdded(event);
 			}
-			public void itemsRemoved(ListChangeEvent e) {
-				ListValueModelWrapper.this.itemsRemoved(e);
+			public void itemsRemoved(ListChangeEvent event) {
+				ListValueModelWrapper.this.itemsRemoved(event);
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				ListValueModelWrapper.this.itemsReplaced(e);
+			public void itemsReplaced(ListChangeEvent event) {
+				ListValueModelWrapper.this.itemsReplaced(event);
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				ListValueModelWrapper.this.itemsMoved(e);
+			public void itemsMoved(ListChangeEvent event) {
+				ListValueModelWrapper.this.itemsMoved(event);
 			}
-			public void listCleared(ListChangeEvent e) {
-				ListValueModelWrapper.this.listCleared(e);
+			public void listCleared(ListChangeEvent event) {
+				ListValueModelWrapper.this.listCleared(event);
 			}
-			public void listChanged(ListChangeEvent e) {
-				ListValueModelWrapper.this.listChanged(e);
+			public void listChanged(ListChangeEvent event) {
+				ListValueModelWrapper.this.listChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -154,14 +154,14 @@ public abstract class ListValueModelWrapper<E>
 
 	// minimize suppressed warnings
 	@SuppressWarnings("unchecked")
-	protected ListIterator<E> items(ListChangeEvent e) {
-		return (ListIterator<E>) e.items();
+	protected ListIterator<E> items(ListChangeEvent event) {
+		return (ListIterator<E>) event.items();
 	}
 
 	// minimize suppressed warnings
 	@SuppressWarnings("unchecked")
-	protected ListIterator<E> replacedItems(ListChangeEvent e) {
-		return (ListIterator<E>) e.replacedItems();
+	protected ListIterator<E> replacedItems(ListChangeEvent event) {
+		return (ListIterator<E>) event.replacedItems();
 	}
 
 
@@ -171,36 +171,36 @@ public abstract class ListValueModelWrapper<E>
 	 * Items were added to the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected abstract void itemsAdded(ListChangeEvent e);
+	protected abstract void itemsAdded(ListChangeEvent event);
 
 	/**
 	 * Items were removed from the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected abstract void itemsRemoved(ListChangeEvent e);
+	protected abstract void itemsRemoved(ListChangeEvent event);
 
 	/**
 	 * Items were replaced in the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected abstract void itemsReplaced(ListChangeEvent e);
+	protected abstract void itemsReplaced(ListChangeEvent event);
 
 	/**
 	 * Items were moved in the wrapped list holder;
 	 * propagate the change notification appropriately.
 	 */
-	protected abstract void itemsMoved(ListChangeEvent e);
+	protected abstract void itemsMoved(ListChangeEvent event);
 
 	/**
 	 * The wrapped list holder was cleared;
 	 * propagate the change notification appropriately.
 	 */
-	protected abstract void listCleared(ListChangeEvent e);
+	protected abstract void listCleared(ListChangeEvent event);
 
 	/**
 	 * The value of the wrapped list holder has changed;
 	 * propagate the change notification appropriately.
 	 */
-	protected abstract void listChanged(ListChangeEvent e);
+	protected abstract void listChanged(ListChangeEvent event);
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyAspectAdapter.java
index 15f00844f1..1f4c0ab3c7 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyAspectAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyAspectAdapter.java
@@ -118,7 +118,7 @@ public abstract class PropertyAspectAdapter<S extends Model, T>
 	protected PropertyChangeListener buildPropertyChangeListener() {
 		// transform the subject's property change events into VALUE property change events
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
+			public void propertyChanged(PropertyChangeEvent event) {
 				PropertyAspectAdapter.this.propertyChanged();
 			}
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyValueModelWrapper.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyValueModelWrapper.java
index b94d9bc798..e4e910fd91 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyValueModelWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyValueModelWrapper.java
@@ -53,8 +53,8 @@ public abstract class PropertyValueModelWrapper<T>
 
 	protected PropertyChangeListener buildValueChangeListener() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				PropertyValueModelWrapper.this.valueChanged(e);
+			public void propertyChanged(PropertyChangeEvent event) {
+				PropertyValueModelWrapper.this.valueChanged(event);
 			}
 		    @Override
 			public String toString() {
@@ -139,6 +139,6 @@ public abstract class PropertyValueModelWrapper<T>
 	 * The value of the wrapped value holder has changed;
 	 * propagate the change notification appropriately.
 	 */
-	protected abstract void valueChanged(PropertyChangeEvent e);
+	protected abstract void valueChanged(PropertyChangeEvent event);
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SortedListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SortedListValueModelAdapter.java
index f94552adba..cafa67e74c 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SortedListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SortedListValueModelAdapter.java
@@ -105,9 +105,9 @@ public class SortedListValueModelAdapter<E>
 	 * the list will need to be sorted after the item is added
 	 */
 	@Override
-	protected void itemsAdded(CollectionChangeEvent e) {
+	protected void itemsAdded(CollectionChangeEvent event) {
 		// first add the items and notify our listeners...
-		super.itemsAdded(e);
+		super.itemsAdded(event);
 		// ...then sort the list
 		this.sortList();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StatePropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StatePropertyValueModelAdapter.java
index cdbabb5711..fc9fa5f254 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StatePropertyValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StatePropertyValueModelAdapter.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.utility.internal.model.listener.StateChangeListener;
  *     current model
  * 
  * Subclasses might want to override:
- * - #stateChanged(StateChangeEvent e)
+ * - #stateChanged(StateChangeEvent event)
  *     to improve performance (by not recalculating the value, if possible)
  */
 public abstract class StatePropertyValueModelAdapter<T>
@@ -92,7 +92,7 @@ public abstract class StatePropertyValueModelAdapter<T>
 	 * The model's state changed;
 	 * propagate the change notification appropriately.
 	 */
-	protected void stateChanged(StateChangeEvent e) {
+	protected void stateChanged(StateChangeEvent event) {
 		// by default, simply recalculate the value and fire an event
 		this.propertyChanged();
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationListValueModelAdapter.java
index 582b1a362b..430ec64f6e 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationListValueModelAdapter.java
@@ -123,8 +123,8 @@ public class TransformationListValueModelAdapter<E1, E2>
 	/**
 	 * Transform the items associated with the specified event.
 	 */
-	protected List<E2> transformItems(ListChangeEvent e) {
-		return this.transformItems(this.items(e), e.itemsSize());
+	protected List<E2> transformItems(ListChangeEvent event) {
+		return this.transformItems(this.items(event), event.itemsSize());
 	}
 
 	/**
@@ -137,8 +137,8 @@ public class TransformationListValueModelAdapter<E1, E2>
 	/**
 	 * Transform the replaced items associated with the specified event.
 	 */
-	protected List<E2> transformReplacedItems(ListChangeEvent e) {
-		return this.transformItems(this.replacedItems(e), e.itemsSize());
+	protected List<E2> transformReplacedItems(ListChangeEvent event) {
+		return this.transformItems(this.replacedItems(event), event.itemsSize());
 	}
 
 	/**
@@ -185,8 +185,8 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 * and notify our listeners.
 	 */
     @Override
-	protected void itemsAdded(ListChangeEvent e) {
-		this.addItemsToList(e.index(), this.transformItems(e), this.transformedList, LIST_VALUES);
+	protected void itemsAdded(ListChangeEvent event) {
+		this.addItemsToList(event.index(), this.transformItems(event), this.transformedList, LIST_VALUES);
 	}
 
 	/**
@@ -195,8 +195,8 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 * and notify our listeners.
 	 */
     @Override
-	protected void itemsRemoved(ListChangeEvent e) {
-		this.removeItemsFromList(e.index(), e.itemsSize(), this.transformedList, LIST_VALUES);
+	protected void itemsRemoved(ListChangeEvent event) {
+		this.removeItemsFromList(event.index(), event.itemsSize(), this.transformedList, LIST_VALUES);
 	}
 
 	/**
@@ -205,8 +205,8 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 * and notify our listeners.
 	 */
     @Override
-	protected void itemsReplaced(ListChangeEvent e) {
-		this.setItemsInList(e.index(), this.transformItems(e), this.transformedList, LIST_VALUES);
+	protected void itemsReplaced(ListChangeEvent event) {
+		this.setItemsInList(event.index(), this.transformItems(event), this.transformedList, LIST_VALUES);
 	}
 
 	/**
@@ -215,8 +215,8 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 * and notify our listeners.
 	 */
     @Override
-	protected void itemsMoved(ListChangeEvent e) {
-    	this.moveItemsInList(e.targetIndex(), e.sourceIndex(), e.moveLength(), this.transformedList, LIST_VALUES);
+	protected void itemsMoved(ListChangeEvent event) {
+    	this.moveItemsInList(event.targetIndex(), event.sourceIndex(), event.moveLength(), this.transformedList, LIST_VALUES);
 	}
 
 	/**
@@ -224,7 +224,7 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 * Clear our transformation list and notify our listeners.
 	 */
     @Override
-	protected void listCleared(ListChangeEvent e) {
+	protected void listCleared(ListChangeEvent event) {
     	this.clearList(this.transformedList, LIST_VALUES);
 	}
 
@@ -233,7 +233,7 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 * Rebuild our transformation list and notify our listeners.
 	 */
     @Override
-	protected void listChanged(ListChangeEvent e) {
+	protected void listChanged(ListChangeEvent event) {
 		this.rebuildTransformedList();
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationPropertyValueModel.java
index b89e6ec117..2865606df9 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationPropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TransformationPropertyValueModel.java
@@ -69,12 +69,12 @@ public class TransformationPropertyValueModel<T1, T2>
 	// ********** PropertyValueModelWrapper implementation **********
 
 	@Override
-	protected void valueChanged(PropertyChangeEvent e) {
+	protected void valueChanged(PropertyChangeEvent event) {
 		// transform the values before propagating the change event
 	    @SuppressWarnings("unchecked")
-		Object oldValue = this.transform((T1) e.oldValue());
+		Object oldValue = this.transform((T1) event.oldValue());
 	    @SuppressWarnings("unchecked")
-		Object newValue = this.transform((T1) e.newValue());
+		Object newValue = this.transform((T1) event.newValue());
 		this.firePropertyChanged(VALUE, oldValue, newValue);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreeAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreeAspectAdapter.java
index 66a6bb4fe6..e48f0e3450 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreeAspectAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreeAspectAdapter.java
@@ -102,17 +102,17 @@ public abstract class TreeAspectAdapter<S extends Model, E>
 	protected TreeChangeListener buildTreeChangeListener() {
 		// transform the subject's tree change events into VALUE tree change events
 		return new TreeChangeListener() {
-			public void nodeAdded(TreeChangeEvent e) {
-				TreeAspectAdapter.this.nodeAdded(e);
+			public void nodeAdded(TreeChangeEvent event) {
+				TreeAspectAdapter.this.nodeAdded(event);
 			}
-			public void nodeRemoved(TreeChangeEvent e) {
-				TreeAspectAdapter.this.nodeRemoved(e);
+			public void nodeRemoved(TreeChangeEvent event) {
+				TreeAspectAdapter.this.nodeRemoved(event);
 			}
-			public void treeCleared(TreeChangeEvent e) {
-				TreeAspectAdapter.this.treeCleared(e);
+			public void treeCleared(TreeChangeEvent event) {
+				TreeAspectAdapter.this.treeCleared(event);
 			}
-			public void treeChanged(TreeChangeEvent e) {
-				TreeAspectAdapter.this.treeChanged(e);
+			public void treeChanged(TreeChangeEvent event) {
+				TreeAspectAdapter.this.treeChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -195,20 +195,20 @@ public abstract class TreeAspectAdapter<S extends Model, E>
 
 	// ********** behavior **********
 
-	protected void nodeAdded(TreeChangeEvent e) {
-		this.fireNodeAdded(NODES, e.path());
+	protected void nodeAdded(TreeChangeEvent event) {
+		this.fireNodeAdded(NODES, event.path());
 	}
 
-	protected void nodeRemoved(TreeChangeEvent e) {
-		this.fireNodeRemoved(NODES, e.path());
+	protected void nodeRemoved(TreeChangeEvent event) {
+		this.fireNodeRemoved(NODES, event.path());
 	}
 
-	protected void treeCleared(TreeChangeEvent e) {
+	protected void treeCleared(TreeChangeEvent event) {
 		this.fireTreeCleared(NODES);
 	}
 
-	protected void treeChanged(TreeChangeEvent e) {
-		this.fireTreeChanged(NODES, e.path());
+	protected void treeChanged(TreeChangeEvent event) {
+		this.fireTreeChanged(NODES, event.path());
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreePropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreePropertyValueModelAdapter.java
index d0bcd1bbaf..3f0114a547 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreePropertyValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/TreePropertyValueModelAdapter.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.utility.internal.model.listener.TreeChangeListener;
  *     current collection value
  * 
  * Subclasses might want to override:
- * - #stateChanged(StateChangeEvent e)
+ * - #stateChanged(StateChangeEvent event)
  *     to improve performance (by not recalculating the value, if possible)
  */
 public abstract class TreePropertyValueModelAdapter<T>
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueAspectAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueAspectAdapter.java
index 34651e2c20..72b300aa4b 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueAspectAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueAspectAdapter.java
@@ -84,10 +84,10 @@ public abstract class ValueAspectAdapter<T>
 	// ********** PropertyValueModelWrapper implementation **********
 
 	@Override
-	protected void valueChanged(PropertyChangeEvent e) {
+	protected void valueChanged(PropertyChangeEvent event) {
 		this.disengageValue();
 		this.engageValue();
-		this.firePropertyChanged(e.cloneWithSource(this));
+		this.firePropertyChanged(event.cloneWithSource(this));
 	}
 
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueCollectionAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueCollectionAdapter.java
index f56497b23c..6c3f75b530 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueCollectionAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueCollectionAdapter.java
@@ -50,16 +50,16 @@ public class ValueCollectionAdapter<T extends Model>
 	 */
 	protected CollectionChangeListener buildValueCollectionListener() {
 		return new CollectionChangeListener() {
-			public void itemsAdded(CollectionChangeEvent e) {
+			public void itemsAdded(CollectionChangeEvent event) {
 				ValueCollectionAdapter.this.valueAspectChanged();
 			}
-			public void itemsRemoved(CollectionChangeEvent e) {
+			public void itemsRemoved(CollectionChangeEvent event) {
 				ValueCollectionAdapter.this.valueAspectChanged();
 			}
-			public void collectionCleared(CollectionChangeEvent e) {
+			public void collectionCleared(CollectionChangeEvent event) {
 				ValueCollectionAdapter.this.valueAspectChanged();
 			}
-			public void collectionChanged(CollectionChangeEvent e) {
+			public void collectionChanged(CollectionChangeEvent event) {
 				ValueCollectionAdapter.this.valueAspectChanged();
 			}
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueListAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueListAdapter.java
index c6c2fceda9..5930ecd9dc 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueListAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueListAdapter.java
@@ -50,22 +50,22 @@ public class ValueListAdapter<T extends Model>
 	 */
 	protected ListChangeListener buildValueListListener() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
+			public void itemsAdded(ListChangeEvent event) {
 				ValueListAdapter.this.valueAspectChanged();
 			}
-			public void itemsRemoved(ListChangeEvent e) {
+			public void itemsRemoved(ListChangeEvent event) {
 				ValueListAdapter.this.valueAspectChanged();
 			}
-			public void itemsReplaced(ListChangeEvent e) {
+			public void itemsReplaced(ListChangeEvent event) {
 				ValueListAdapter.this.valueAspectChanged();
 			}
-			public void itemsMoved(ListChangeEvent e) {
+			public void itemsMoved(ListChangeEvent event) {
 				ValueListAdapter.this.valueAspectChanged();
 			}
-			public void listCleared(ListChangeEvent e) {
+			public void listCleared(ListChangeEvent event) {
 				ValueListAdapter.this.valueAspectChanged();
 			}
-			public void listChanged(ListChangeEvent e) {
+			public void listChanged(ListChangeEvent event) {
 				ValueListAdapter.this.valueAspectChanged();
 			}
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValuePropertyAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValuePropertyAdapter.java
index 5fc1714744..72064a8d55 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValuePropertyAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValuePropertyAdapter.java
@@ -45,7 +45,7 @@ public class ValuePropertyAdapter<T extends Model>
 
 	protected PropertyChangeListener buildValuePropertyListener() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
+			public void propertyChanged(PropertyChangeEvent event) {
 				ValuePropertyAdapter.this.valueAspectChanged();
 			}
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueStateAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueStateAdapter.java
index b127dbcc69..ddc6870a39 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueStateAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/ValueStateAdapter.java
@@ -39,7 +39,7 @@ public class ValueStateAdapter<T extends Model>
 
 	protected StateChangeListener buildValueStateListener() {
 		return new StateChangeListener() {
-			public void stateChanged(StateChangeEvent e) {
+			public void stateChanged(StateChangeEvent event) {
 				ValueStateAdapter.this.valueAspectChanged();
 			}
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
index c94a3758eb..344879ed13 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
@@ -163,8 +163,8 @@ public class PreferencePropertyValueModel<P>
 	protected PreferenceChangeListener buildPreferenceChangeListener() {
 		// transform the preference change events into VALUE property change events
 		return new PreferenceChangeListener() {
-			public void preferenceChange(PreferenceChangeEvent e) {
-				PreferencePropertyValueModel.this.preferenceChanged(e.getKey(), e.getNewValue());
+			public void preferenceChange(PreferenceChangeEvent event) {
+				PreferencePropertyValueModel.this.preferenceChanged(event.getKey(), event.getNewValue());
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
index e30c0239be..7626548514 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
@@ -69,8 +69,8 @@ public class PreferencesCollectionValueModel<P>
 	protected PreferenceChangeListener buildPreferenceChangeListener() {
 		// transform the preference change events into VALUE collection change events
 		return new PreferenceChangeListener() {
-			public void preferenceChange(PreferenceChangeEvent e) {
-				PreferencesCollectionValueModel.this.preferenceChanged(e.getKey(), e.getNewValue());
+			public void preferenceChange(PreferenceChangeEvent event) {
+				PreferencesCollectionValueModel.this.preferenceChanged(event.getKey(), event.getNewValue());
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/AbstractTreeModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/AbstractTreeModel.java
index b16f57df22..0e464155f5 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/AbstractTreeModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/AbstractTreeModel.java
@@ -86,16 +86,16 @@ public abstract class AbstractTreeModel
 	protected void fireTreeNodesChanged(Object[] path, int[] childIndices, Object[] children) {
 		// guaranteed to return a non-null array
 		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent e = null;
+		TreeModelEvent event = null;
 		// process the listeners last to first, notifying
 		// those that are interested in this event
 		for (int i = listeners.length-2; i>=0; i-=2) {
 			if (listeners[i]==TreeModelListener.class) {
 				// lazily create the event
-				if (e == null) {
-					e = new TreeModelEvent(this, path, childIndices, children);
+				if (event == null) {
+					event = new TreeModelEvent(this, path, childIndices, children);
 				}
-				((TreeModelListener) listeners[i+1]).treeNodesChanged(e);
+				((TreeModelListener) listeners[i+1]).treeNodesChanged(event);
 			}
 		}
 	}
@@ -129,16 +129,16 @@ public abstract class AbstractTreeModel
 	protected void fireTreeNodesInserted(Object[] path, int[] childIndices, Object[] children) {
 		// guaranteed to return a non-null array
 		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent e = null;
+		TreeModelEvent event = null;
 		// process the listeners last to first, notifying
 		// those that are interested in this event
 		for (int i = listeners.length-2; i>=0; i-=2) {
 			if (listeners[i]==TreeModelListener.class) {
 				// lazily create the event
-				if (e == null) {
-					e = new TreeModelEvent(this, path, childIndices, children);
+				if (event == null) {
+					event = new TreeModelEvent(this, path, childIndices, children);
 				}
-				((TreeModelListener) listeners[i+1]).treeNodesInserted(e);
+				((TreeModelListener) listeners[i+1]).treeNodesInserted(event);
 			}
 		}
 	}
@@ -160,16 +160,16 @@ public abstract class AbstractTreeModel
 	protected void fireTreeNodesRemoved(Object[] path, int[] childIndices, Object[] children) {
 		// guaranteed to return a non-null array
 		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent e = null;
+		TreeModelEvent event = null;
 		// process the listeners last to first, notifying
 		// those that are interested in this event
 		for (int i = listeners.length-2; i>=0; i-=2) {
 			if (listeners[i]==TreeModelListener.class) {
 				// lazily create the event
-				if (e == null) {
-					e = new TreeModelEvent(this, path, childIndices, children);
+				if (event == null) {
+					event = new TreeModelEvent(this, path, childIndices, children);
 				}
-				((TreeModelListener) listeners[i+1]).treeNodesRemoved(e);
+				((TreeModelListener) listeners[i+1]).treeNodesRemoved(event);
 			}
 		}
 	}
@@ -191,16 +191,16 @@ public abstract class AbstractTreeModel
 	protected void fireTreeStructureChanged(Object[] path) {
 		// guaranteed to return a non-null array
 		Object[] listeners = this.listenerList.getListenerList();
-		TreeModelEvent e = null;
+		TreeModelEvent event = null;
 		// process the listeners last to first, notifying
 		// those that are interested in this event
 		for (int i = listeners.length-2; i>=0; i-=2) {
 			if (listeners[i]==TreeModelListener.class) {
 				// lazily create the event
-				if (e == null) {
-					e = new TreeModelEvent(this, path);
+				if (event == null) {
+					event = new TreeModelEvent(this, path);
 				}
-				((TreeModelListener) listeners[i+1]).treeStructureChanged(e);
+				((TreeModelListener) listeners[i+1]).treeStructureChanged(event);
 			}
 		}
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ComboBoxModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ComboBoxModelAdapter.java
index f09e4a3a90..476cb26209 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ComboBoxModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ComboBoxModelAdapter.java
@@ -82,7 +82,7 @@ public class ComboBoxModelAdapter
 
 	protected PropertyChangeListener buildSelectionListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
+			public void propertyChanged(PropertyChangeEvent event) {
 				// notify listeners that the selection has changed
 				ComboBoxModelAdapter.this.fireSelectionChanged();
 			}
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DateSpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DateSpinnerModelAdapter.java
index d289b38211..13280516b0 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DateSpinnerModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DateSpinnerModelAdapter.java
@@ -98,8 +98,8 @@ public class DateSpinnerModelAdapter
 
 	protected PropertyChangeListener buildDateChangeListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				DateSpinnerModelAdapter.this.synchronize(e.newValue());
+			public void propertyChanged(PropertyChangeEvent event) {
+				DateSpinnerModelAdapter.this.synchronize(event.newValue());
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DocumentAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DocumentAdapter.java
index 48378b66be..040b565dee 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DocumentAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/DocumentAdapter.java
@@ -96,8 +96,8 @@ public class DocumentAdapter
 
 	protected PropertyChangeListener buildStringListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				DocumentAdapter.this.stringChanged(e);
+			public void propertyChanged(PropertyChangeEvent event) {
+				DocumentAdapter.this.stringChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -235,8 +235,8 @@ public class DocumentAdapter
 	 * A third party has modified the underlying model string.
 	 * Synchronize the delegate document accordingly.
 	 */
-	protected void stringChanged(PropertyChangeEvent e) {
-		this.synchronizeDelegate((String) e.newValue());
+	protected void stringChanged(PropertyChangeEvent event) {
+		this.synchronizeDelegate((String) event.newValue());
 	}
 
 	/**
@@ -265,40 +265,40 @@ public class DocumentAdapter
 		this.stringHolder.removePropertyChangeListener(PropertyValueModel.VALUE, this.stringListener);
 	}
 
-	protected void delegateChangedUpdate(DocumentEvent e) {
+	protected void delegateChangedUpdate(DocumentEvent event) {
 		// no need to lazy-initialize the event;
 		// we wouldn't get here if we did not have listeners...
-		DocumentEvent ee = new InternalDocumentEvent(this, e);
+		DocumentEvent ee = new InternalDocumentEvent(this, event);
 		DocumentListener[] listeners = this.documentListeners();
 		for (int i = listeners.length; i-- > 0; ) {
 			listeners[i].changedUpdate(ee);
 		}
 	}
 
-	protected void delegateInsertUpdate(DocumentEvent e) {
+	protected void delegateInsertUpdate(DocumentEvent event) {
 		// no need to lazy-initialize the event;
 		// we wouldn't get here if we did not have listeners...
-		DocumentEvent ee = new InternalDocumentEvent(this, e);
+		DocumentEvent ee = new InternalDocumentEvent(this, event);
 		DocumentListener[] listeners = this.documentListeners();
 		for (int i = listeners.length; i-- > 0; ) {
 			listeners[i].insertUpdate(ee);
 		}
 	}
 
-	protected void delegateRemoveUpdate(DocumentEvent e) {
+	protected void delegateRemoveUpdate(DocumentEvent event) {
 		// no need to lazy-initialize the event;
 		// we wouldn't get here if we did not have listeners...
-		DocumentEvent ee = new InternalDocumentEvent(this, e);
+		DocumentEvent ee = new InternalDocumentEvent(this, event);
 		DocumentListener[] listeners = this.documentListeners();
 		for (int i = listeners.length; i-- > 0; ) {
 			listeners[i].removeUpdate(ee);
 		}
 	}
 
-	protected void delegateUndoableEditHappened(UndoableEditEvent e) {
+	protected void delegateUndoableEditHappened(UndoableEditEvent event) {
 		// no need to lazy-initialize the event;
 		// we wouldn't get here if we did not have listeners...
-		UndoableEditEvent ee = new UndoableEditEvent(this, e.getEdit());
+		UndoableEditEvent ee = new UndoableEditEvent(this, event.getEdit());
 		UndoableEditListener[] listeners = this.undoableEditListeners();
 		for (int i = listeners.length; i-- > 0; ) {
 			listeners[i].undoableEditHappened(ee);
@@ -320,17 +320,17 @@ public class DocumentAdapter
 	}
 
 	protected class InternalListener implements CombinedListener {
-		public void changedUpdate(DocumentEvent e) {
-			DocumentAdapter.this.delegateChangedUpdate(e);
+		public void changedUpdate(DocumentEvent event) {
+			DocumentAdapter.this.delegateChangedUpdate(event);
 		}
-		public void insertUpdate(DocumentEvent e) {
-			DocumentAdapter.this.delegateInsertUpdate(e);
+		public void insertUpdate(DocumentEvent event) {
+			DocumentAdapter.this.delegateInsertUpdate(event);
 		}
-		public void removeUpdate(DocumentEvent e) {
-			DocumentAdapter.this.delegateRemoveUpdate(e);
+		public void removeUpdate(DocumentEvent event) {
+			DocumentAdapter.this.delegateRemoveUpdate(event);
 		}
-		public void undoableEditHappened(UndoableEditEvent e) {
-			DocumentAdapter.this.delegateUndoableEditHappened(e);
+		public void undoableEditHappened(UndoableEditEvent event) {
+			DocumentAdapter.this.delegateUndoableEditHappened(event);
 		}
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListModelAdapter.java
index 5e691b92a3..db02a03255 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListModelAdapter.java
@@ -81,22 +81,22 @@ public class ListModelAdapter
 
 	protected ListChangeListener buildListChangeListener_() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				ListModelAdapter.this.itemsAdded(e);
+			public void itemsAdded(ListChangeEvent event) {
+				ListModelAdapter.this.itemsAdded(event);
 			}
-			public void itemsRemoved(ListChangeEvent e) {
-				ListModelAdapter.this.itemsRemoved(e);
+			public void itemsRemoved(ListChangeEvent event) {
+				ListModelAdapter.this.itemsRemoved(event);
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				ListModelAdapter.this.itemsReplaced(e);
+			public void itemsReplaced(ListChangeEvent event) {
+				ListModelAdapter.this.itemsReplaced(event);
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				ListModelAdapter.this.itemsMoved(e);
+			public void itemsMoved(ListChangeEvent event) {
+				ListModelAdapter.this.itemsMoved(event);
 			}
-			public void listCleared(ListChangeEvent e) {
+			public void listCleared(ListChangeEvent event) {
 				ListModelAdapter.this.listCleared();
 			}
-			public void listChanged(ListChangeEvent e) {
+			public void listChanged(ListChangeEvent event) {
 				ListModelAdapter.this.listChanged();
 			}
 			@Override
@@ -213,31 +213,31 @@ public class ListModelAdapter
 	 * Items were added to the underlying model list.
 	 * Notify listeners of the changes.
 	 */
-	protected void itemsAdded(ListChangeEvent e) {
-		int start = e.index();
-		int end = start + e.itemsSize() - 1;
+	protected void itemsAdded(ListChangeEvent event) {
+		int start = event.index();
+		int end = start + event.itemsSize() - 1;
 		this.fireIntervalAdded(this, start, end);
-		this.listSize += e.itemsSize();
+		this.listSize += event.itemsSize();
 	}
 
 	/**
 	 * Items were removed from the underlying model list.
 	 * Notify listeners of the changes.
 	 */
-	protected void itemsRemoved(ListChangeEvent e) {
-		int start = e.index();
-		int end = start + e.itemsSize() - 1;
+	protected void itemsRemoved(ListChangeEvent event) {
+		int start = event.index();
+		int end = start + event.itemsSize() - 1;
 		this.fireIntervalRemoved(this, start, end);
-		this.listSize -= e.itemsSize();
+		this.listSize -= event.itemsSize();
 	}
 
 	/**
 	 * Items were replaced in the underlying model list.
 	 * Notify listeners of the changes.
 	 */
-	protected void itemsReplaced(ListChangeEvent e) {
-		int start = e.index();
-		int end = start + e.itemsSize() - 1;
+	protected void itemsReplaced(ListChangeEvent event) {
+		int start = event.index();
+		int end = start + event.itemsSize() - 1;
 		this.fireContentsChanged(this, start, end);
 	}
 
@@ -245,9 +245,9 @@ public class ListModelAdapter
 	 * Items were moved in the underlying model list.
 	 * Notify listeners of the changes.
 	 */
-	protected void itemsMoved(ListChangeEvent e) {
-		int start = Math.min(e.sourceIndex(), e.targetIndex());
-		int end = Math.max(e.sourceIndex(), e.targetIndex()) + e.moveLength() - 1;
+	protected void itemsMoved(ListChangeEvent event) {
+		int start = Math.min(event.sourceIndex(), event.targetIndex());
+		int end = Math.max(event.sourceIndex(), event.targetIndex()) + event.moveLength() - 1;
 		this.fireContentsChanged(this, start, end);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListSpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListSpinnerModelAdapter.java
index 37a750001d..b7f7a5326a 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListSpinnerModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ListSpinnerModelAdapter.java
@@ -118,8 +118,8 @@ public class ListSpinnerModelAdapter
 
 	protected PropertyChangeListener buildValueChangeListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				ListSpinnerModelAdapter.this.synchronize(e.newValue());
+			public void propertyChanged(PropertyChangeEvent event) {
+				ListSpinnerModelAdapter.this.synchronize(event.newValue());
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/NumberSpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/NumberSpinnerModelAdapter.java
index 86820054ac..6d046a954f 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/NumberSpinnerModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/NumberSpinnerModelAdapter.java
@@ -122,8 +122,8 @@ public class NumberSpinnerModelAdapter
 
 	protected PropertyChangeListener buildNumberChangeListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				NumberSpinnerModelAdapter.this.synchronize(e.newValue());
+			public void propertyChanged(PropertyChangeEvent event) {
+				NumberSpinnerModelAdapter.this.synchronize(event.newValue());
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ObjectListSelectionModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ObjectListSelectionModel.java
index a1d0437682..e40a6a1c15 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ObjectListSelectionModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ObjectListSelectionModel.java
@@ -50,14 +50,14 @@ public class ObjectListSelectionModel
 
 	private ListDataListener buildListDataListener() {
 		return new ListDataListener() {
-			public void intervalAdded(ListDataEvent e) {
+			public void intervalAdded(ListDataEvent event) {
 				// this does not affect the selection
 			}
-			public void intervalRemoved(ListDataEvent e) {
+			public void intervalRemoved(ListDataEvent event) {
 				// this does not affect the selection
 			}
-			public void contentsChanged(ListDataEvent e) {
-				ObjectListSelectionModel.this.listModelContentsChanged(e);
+			public void contentsChanged(ListDataEvent event) {
+				ObjectListSelectionModel.this.listModelContentsChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -75,7 +75,7 @@ public class ObjectListSelectionModel
 	 * A subclass can override this method if the selection
 	 * should be cleared because a change could mean the selection is invalid.
 	 */
-	protected void listModelContentsChanged(ListDataEvent e) {
+	protected void listModelContentsChanged(ListDataEvent event) {
 		/**this.clearSelection();*/
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/PrimitiveListTreeModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/PrimitiveListTreeModel.java
index cc3b4f2ac4..fa3c5dcd9a 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/PrimitiveListTreeModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/PrimitiveListTreeModel.java
@@ -191,42 +191,42 @@ public abstract class PrimitiveListTreeModel
 			super();
 		}
 
-		public void itemsAdded(ListChangeEvent e) {
-			int i = e.index();
-			for (ListIterator<?> stream = e.items(); stream.hasNext(); ) {
+		public void itemsAdded(ListChangeEvent event) {
+			int i = event.index();
+			for (ListIterator<?> stream = event.items(); stream.hasNext(); ) {
 				PrimitiveListTreeModel.this.insertPrimitive(i++, stream.next());
 			}
 		}
 
-		public void itemsRemoved(ListChangeEvent e) {
-			for (int i = 0; i < e.itemsSize(); i++) {
-				PrimitiveListTreeModel.this.removeNode(e.index());
+		public void itemsRemoved(ListChangeEvent event) {
+			for (int i = 0; i < event.itemsSize(); i++) {
+				PrimitiveListTreeModel.this.removeNode(event.index());
 			}
 		}
 
-		public void itemsReplaced(ListChangeEvent e) {
-			int i = e.index();
-			for (ListIterator<?> stream = e.items(); stream.hasNext(); ) {
+		public void itemsReplaced(ListChangeEvent event) {
+			int i = event.index();
+			for (ListIterator<?> stream = event.items(); stream.hasNext(); ) {
 				PrimitiveListTreeModel.this.replacePrimitive(i++, stream.next());
 			}
 		}
 
-		public void itemsMoved(ListChangeEvent e) {
-			ArrayList<MutableTreeNode> temp = new ArrayList<MutableTreeNode>(e.moveLength());
-			for (int i = 0; i < e.moveLength(); i++) {
-				temp.add(PrimitiveListTreeModel.this.removeNode(e.sourceIndex()));
+		public void itemsMoved(ListChangeEvent event) {
+			ArrayList<MutableTreeNode> temp = new ArrayList<MutableTreeNode>(event.moveLength());
+			for (int i = 0; i < event.moveLength(); i++) {
+				temp.add(PrimitiveListTreeModel.this.removeNode(event.sourceIndex()));
 			}
-			int i = e.targetIndex();
+			int i = event.targetIndex();
 			for (MutableTreeNode node : temp) {
 				PrimitiveListTreeModel.this.insertPrimitive(i++, node);
 			}
 		}
 
-		public void listCleared(ListChangeEvent e) {
+		public void listCleared(ListChangeEvent event) {
 			PrimitiveListTreeModel.this.clearList();
 		}
 
-		public void listChanged(ListChangeEvent e) {
+		public void listChanged(ListChangeEvent event) {
 			PrimitiveListTreeModel.this.synchronizeList();
 		}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/SpinnerModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/SpinnerModelAdapter.java
index b6cfdebc1b..7a6d09518d 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/SpinnerModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/SpinnerModelAdapter.java
@@ -87,8 +87,8 @@ public class SpinnerModelAdapter
 
 	protected PropertyChangeListener buildValueListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				SpinnerModelAdapter.this.valueChanged(e);
+			public void propertyChanged(PropertyChangeEvent event) {
+				SpinnerModelAdapter.this.valueChanged(event);
 			}
 			@Override
 			public String toString() {
@@ -107,7 +107,7 @@ public class SpinnerModelAdapter
 
 	protected ChangeListener buildDelegateListener() {
 		return new ChangeListener() {
-			public void stateChanged(ChangeEvent e) {
+			public void stateChanged(ChangeEvent event) {
 				// forward the event, with this as the source
 				SpinnerModelAdapter.this.fireStateChanged();
 			}
@@ -173,8 +173,8 @@ public class SpinnerModelAdapter
 	 * A third party has modified the underlying value.
 	 * Synchronize the delegate model accordingly.
 	 */
-	protected void valueChanged(PropertyChangeEvent e) {
-		this.synchronizeDelegate(e.newValue());
+	protected void valueChanged(PropertyChangeEvent event) {
+		this.synchronizeDelegate(event.newValue());
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TableModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TableModelAdapter.java
index 905d26480e..e61301aaa0 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TableModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TableModelAdapter.java
@@ -123,22 +123,22 @@ public class TableModelAdapter<E>
 
 	protected ListChangeListener buildListChangeListener_() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				TableModelAdapter.this.addRows(e.index(), e.itemsSize(), this.items(e));
+			public void itemsAdded(ListChangeEvent event) {
+				TableModelAdapter.this.addRows(event.index(), event.itemsSize(), this.items(event));
 			}
-			public void itemsRemoved(ListChangeEvent e) {
-				TableModelAdapter.this.removeRows(e.index(), e.itemsSize());
+			public void itemsRemoved(ListChangeEvent event) {
+				TableModelAdapter.this.removeRows(event.index(), event.itemsSize());
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				TableModelAdapter.this.replaceRows(e.index(), this.items(e));
+			public void itemsReplaced(ListChangeEvent event) {
+				TableModelAdapter.this.replaceRows(event.index(), this.items(event));
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				TableModelAdapter.this.moveRows(e.targetIndex(), e.sourceIndex(), e.moveLength());
+			public void itemsMoved(ListChangeEvent event) {
+				TableModelAdapter.this.moveRows(event.targetIndex(), event.sourceIndex(), event.moveLength());
 			}
-			public void listCleared(ListChangeEvent e) {
+			public void listCleared(ListChangeEvent event) {
 				TableModelAdapter.this.clearTable();
 			}
-			public void listChanged(ListChangeEvent e) {
+			public void listChanged(ListChangeEvent event) {
 				TableModelAdapter.this.rebuildTable();
 			}
 			/**
@@ -163,8 +163,8 @@ public class TableModelAdapter<E>
 	protected PropertyChangeListener buildCellListener_() {
 		return new PropertyChangeListener() {
 			@SuppressWarnings("unchecked")
-			public void propertyChanged(PropertyChangeEvent evt) {
-				TableModelAdapter.this.cellChanged((WritablePropertyValueModel<Object>) evt.getSource());
+			public void propertyChanged(PropertyChangeEvent event) {
+				TableModelAdapter.this.cellChanged((WritablePropertyValueModel<Object>) event.getSource());
 			}
 			@Override
 			public String toString() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ToggleButtonModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ToggleButtonModelAdapter.java
index 0fc40049ea..97b8cfeedc 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ToggleButtonModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/ToggleButtonModelAdapter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2008 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.
@@ -80,8 +80,8 @@ public class ToggleButtonModelAdapter
 
 	protected PropertyChangeListener buildBooleanChangeListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
-				ToggleButtonModelAdapter.this.booleanChanged(e);
+			public void propertyChanged(PropertyChangeEvent event) {
+				ToggleButtonModelAdapter.this.booleanChanged(event);
 			}
 		    @Override
 			public String toString() {
@@ -202,8 +202,8 @@ public class ToggleButtonModelAdapter
 	/**
 	 * The underlying model has changed - synchronize accordingly.
 	 */
-	protected void booleanChanged(PropertyChangeEvent e) {
-		this.setSelected((Boolean) e.newValue());
+	protected void booleanChanged(PropertyChangeEvent event) {
+		this.setSelected((Boolean) event.newValue());
 	}
 
 	protected void engageModel() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TreeModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TreeModelAdapter.java
index 380286cf31..a15ec49c87 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TreeModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/swing/TreeModelAdapter.java
@@ -140,7 +140,7 @@ public class TreeModelAdapter<T>
 
 	protected PropertyChangeListener buildRootListener_() {
 		return new PropertyChangeListener() {
-			public void propertyChanged(PropertyChangeEvent e) {
+			public void propertyChanged(PropertyChangeEvent event) {
 				TreeModelAdapter.this.rootChanged();
 			}
 			@Override
@@ -157,8 +157,8 @@ public class TreeModelAdapter<T>
 	protected PropertyChangeListener buildNodeValueListener_() {
 		return new PropertyChangeListener() {
 			@SuppressWarnings("unchecked")
-			public void propertyChanged(PropertyChangeEvent e) {
-				TreeModelAdapter.this.nodeChanged((TreeNodeValueModel<T>) e.getSource());
+			public void propertyChanged(PropertyChangeEvent event) {
+				TreeModelAdapter.this.nodeChanged((TreeNodeValueModel<T>) event.getSource());
 			}
 			@Override
 			public String toString() {
@@ -174,8 +174,8 @@ public class TreeModelAdapter<T>
 	protected StateChangeListener buildNodeStateListener_() {
 		return new StateChangeListener() {
 			@SuppressWarnings("unchecked")
-			public void stateChanged(StateChangeEvent e) {
-				TreeModelAdapter.this.nodeChanged((TreeNodeValueModel<T>) e.getSource());
+			public void stateChanged(StateChangeEvent event) {
+				TreeModelAdapter.this.nodeChanged((TreeNodeValueModel<T>) event.getSource());
 			}
 			@Override
 			public String toString() {
@@ -190,23 +190,23 @@ public class TreeModelAdapter<T>
 
 	protected ListChangeListener buildChildrenListener_() {
 		return new ListChangeListener() {
-			public void itemsAdded(ListChangeEvent e) {
-				new EventChangePolicy(e).addChildren();
+			public void itemsAdded(ListChangeEvent event) {
+				new EventChangePolicy(event).addChildren();
 			}
-			public void itemsRemoved(ListChangeEvent e) {
-				new EventChangePolicy(e).removeChildren();
+			public void itemsRemoved(ListChangeEvent event) {
+				new EventChangePolicy(event).removeChildren();
 			}
-			public void itemsReplaced(ListChangeEvent e) {
-				new EventChangePolicy(e).replaceChildren();
+			public void itemsReplaced(ListChangeEvent event) {
+				new EventChangePolicy(event).replaceChildren();
 			}
-			public void itemsMoved(ListChangeEvent e) {
-				new EventChangePolicy(e).moveChildren();
+			public void itemsMoved(ListChangeEvent event) {
+				new EventChangePolicy(event).moveChildren();
 			}
-			public void listCleared(ListChangeEvent e) {
-				new EventChangePolicy(e).clearChildren();
+			public void listCleared(ListChangeEvent event) {
+				new EventChangePolicy(event).clearChildren();
 			}
-			public void listChanged(ListChangeEvent e) {
-				new EventChangePolicy(e).rebuildChildren();
+			public void listChanged(ListChangeEvent event) {
+				new EventChangePolicy(event).rebuildChildren();
 			}
 			@Override
 			public String toString() {