added get prefixes to utility plugin interfaces

48 files changed, 260 insertions, 260 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/CommandExecutorProvider.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/CommandExecutorProvider.java
index 7e30cf7771..03b62531e4 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/CommandExecutorProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/CommandExecutorProvider.java
@@ -25,6 +25,6 @@ public interface CommandExecutorProvider {
 	/**
 	 * Return the appropriate command executor.
 	 */
-	CommandExecutor commandExecutor();
+	CommandExecutor getCommandExecutor();
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/JavaType.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/JavaType.java
index f76b790617..9347dbdf39 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/JavaType.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/JavaType.java
@@ -64,14 +64,14 @@ public interface JavaType
 	/**
 	 * Return the class corresponding to the type's element type and array depth.
 	 */
-	Class<?> javaClass() throws ClassNotFoundException;
+	Class<?> getJavaClass() throws ClassNotFoundException;
 
 	/**
 	 * Return the version of the type's name that matches that
 	 * returned by java.lang.Class#getName()
 	 * (e.g. "[[J", "[Ljava.lang.Object;", "java.util.Map$Entry").
 	 */
-	String javaClassName();
+	String getJavaClassName();
 
 	boolean equals(String otherElementTypeName, int otherArrayDepth);
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCTools.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCTools.java
index 7ee3bdf227..99736472d7 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCTools.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/JDBCTools.java
@@ -42,7 +42,7 @@ public final class JDBCTools {
 	 * @see java.sql.Types
 	 */
 	public static JDBCType jdbcTypeFor(JavaType javaType) {
-		return jdbcTypeForClassNamed(javaType.javaClassName());
+		return jdbcTypeForClassNamed(javaType.getJavaClassName());
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleJavaType.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleJavaType.java
index dbae97382c..faa3177b91 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleJavaType.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/SimpleJavaType.java
@@ -114,11 +114,11 @@ public final class SimpleJavaType
 		return (this.arrayDepth == 0) && ClassTools.classNamedIsVariablePrimitiveWrapperClass(this.elementTypeName);
 	}
 
-	public Class<?> javaClass() throws ClassNotFoundException {
+	public Class<?> getJavaClass() throws ClassNotFoundException {
 		return ClassTools.classForTypeDeclaration(this.elementTypeName, this.arrayDepth);
 	}
 
-	public String javaClassName() {
+	public String getJavaClassName() {
 		return ClassTools.classNameForTypeDeclaration(this.elementTypeName, this.arrayDepth);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/AbstractModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/AbstractModel.java
index 9908d6aedf..5aa4d9a886 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/AbstractModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/AbstractModel.java
@@ -61,7 +61,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	/**
 	 * This accessor will build the change support when required.
 	 */
-	protected synchronized ChangeSupport changeSupport() {
+	protected synchronized ChangeSupport getChangeSupport() {
 		if (this.changeSupport == null) {
 			this.changeSupport = this.buildChangeSupport();
 		}
@@ -79,117 +79,117 @@ public abstract class AbstractModel implements Model, Serializable {
 	// ********** state change support **********
 
 	public synchronized void addStateChangeListener(StateChangeListener listener) {
-		this.changeSupport().addStateChangeListener(listener);
+		this.getChangeSupport().addStateChangeListener(listener);
 	}
 
 	public synchronized void removeStateChangeListener(StateChangeListener listener) {
-		this.changeSupport().removeStateChangeListener(listener);
+		this.getChangeSupport().removeStateChangeListener(listener);
 	}
 
 	protected final void fireStateChanged() {
-		this.changeSupport().fireStateChanged();
+		this.getChangeSupport().fireStateChanged();
 	}
 
 	protected final void fireStateChanged(StateChangeEvent event) {
-		this.changeSupport().fireStateChanged(event);
+		this.getChangeSupport().fireStateChanged(event);
 	}
 
 
 	// ********** property change support **********
 
 	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
-		this.changeSupport().addPropertyChangeListener(listener);
+		this.getChangeSupport().addPropertyChangeListener(listener);
 	}
 
 	public synchronized void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		this.changeSupport().addPropertyChangeListener(propertyName, listener);
+		this.getChangeSupport().addPropertyChangeListener(propertyName, listener);
 	}
 
 	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
-		this.changeSupport().removePropertyChangeListener(listener);
+		this.getChangeSupport().removePropertyChangeListener(listener);
 	}
 
 	public synchronized void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) {
-		this.changeSupport().removePropertyChangeListener(propertyName, listener);
+		this.getChangeSupport().removePropertyChangeListener(propertyName, listener);
 	}
 
 	protected final void firePropertyChanged(String propertyName, Object oldValue, Object newValue) {
-		this.changeSupport().firePropertyChanged(propertyName, oldValue, newValue);
+		this.getChangeSupport().firePropertyChanged(propertyName, oldValue, newValue);
 	}
 
 	protected final void firePropertyChanged(String propertyName, int oldValue, int newValue) {
-		this.changeSupport().firePropertyChanged(propertyName, oldValue, newValue);
+		this.getChangeSupport().firePropertyChanged(propertyName, oldValue, newValue);
 	}
 
 	protected final void firePropertyChanged(String propertyName, boolean oldValue, boolean newValue) {
-		this.changeSupport().firePropertyChanged(propertyName, oldValue, newValue);
+		this.getChangeSupport().firePropertyChanged(propertyName, oldValue, newValue);
 	}
 
 	protected final void firePropertyChanged(String propertyName, Object newValue) {
-		this.changeSupport().firePropertyChanged(propertyName, null, newValue);
+		this.getChangeSupport().firePropertyChanged(propertyName, null, newValue);
 	}
 
 	protected final void firePropertyChanged(PropertyChangeEvent event) {
-		this.changeSupport().firePropertyChanged(event);
+		this.getChangeSupport().firePropertyChanged(event);
 	}
 
 
 	// ********** collection change support **********
 
 	public synchronized void addCollectionChangeListener(CollectionChangeListener listener) {
-		this.changeSupport().addCollectionChangeListener(listener);
+		this.getChangeSupport().addCollectionChangeListener(listener);
 	}
 
 	public synchronized void addCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		this.changeSupport().addCollectionChangeListener(collectionName, listener);
+		this.getChangeSupport().addCollectionChangeListener(collectionName, listener);
 	}
 
 	public synchronized void removeCollectionChangeListener(CollectionChangeListener listener) {
-		this.changeSupport().removeCollectionChangeListener(listener);
+		this.getChangeSupport().removeCollectionChangeListener(listener);
 	}
 
 	public synchronized void removeCollectionChangeListener(String collectionName, CollectionChangeListener listener) {
-		this.changeSupport().removeCollectionChangeListener(collectionName, listener);
+		this.getChangeSupport().removeCollectionChangeListener(collectionName, listener);
 	}
 
 	protected final void fireItemAdded(String collectionName, Object addedItem) {
-		this.changeSupport().fireItemAdded(collectionName, addedItem);
+		this.getChangeSupport().fireItemAdded(collectionName, addedItem);
 	}
 
 	protected final void fireItemsAdded(String collectionName, Collection<?> addedItems) {
-		this.changeSupport().fireItemsAdded(collectionName, addedItems);
+		this.getChangeSupport().fireItemsAdded(collectionName, addedItems);
 	}
 
 	protected final void fireItemsAdded(CollectionChangeEvent event) {
-		this.changeSupport().fireItemsAdded(event);
+		this.getChangeSupport().fireItemsAdded(event);
 	}
 
 	protected final void fireItemRemoved(String collectionName, Object removedItem) {
-		this.changeSupport().fireItemRemoved(collectionName, removedItem);
+		this.getChangeSupport().fireItemRemoved(collectionName, removedItem);
 	}
 
 	protected final void fireItemsRemoved(String collectionName, Collection<?> removedItems) {
-		this.changeSupport().fireItemsRemoved(collectionName, removedItems);
+		this.getChangeSupport().fireItemsRemoved(collectionName, removedItems);
 	}
 
 	protected final void fireItemsRemoved(CollectionChangeEvent event) {
-		this.changeSupport().fireItemsRemoved(event);
+		this.getChangeSupport().fireItemsRemoved(event);
 	}
 
 	protected final void fireCollectionCleared(String collectionName) {
-		this.changeSupport().fireCollectionCleared(collectionName);
+		this.getChangeSupport().fireCollectionCleared(collectionName);
 	}
 
 	protected final void fireCollectionCleared(CollectionChangeEvent event) {
-		this.changeSupport().fireCollectionCleared(event);
+		this.getChangeSupport().fireCollectionCleared(event);
 	}
 
 	protected final void fireCollectionChanged(String collectionName) {
-		this.changeSupport().fireCollectionChanged(collectionName);
+		this.getChangeSupport().fireCollectionChanged(collectionName);
 	}
 
 	protected final void fireCollectionChanged(CollectionChangeEvent event) {
-		this.changeSupport().fireCollectionChanged(event);
+		this.getChangeSupport().fireCollectionChanged(event);
 	}
 
 	/**
@@ -407,83 +407,83 @@ public abstract class AbstractModel implements Model, Serializable {
 	// ********** list change support **********
 
 	public synchronized void addListChangeListener(ListChangeListener listener) {
-		this.changeSupport().addListChangeListener(listener);
+		this.getChangeSupport().addListChangeListener(listener);
 	}
 
 	public synchronized void addListChangeListener(String listName, ListChangeListener listener) {
-		this.changeSupport().addListChangeListener(listName, listener);
+		this.getChangeSupport().addListChangeListener(listName, listener);
 	}
 
 	public synchronized void removeListChangeListener(ListChangeListener listener) {
-		this.changeSupport().removeListChangeListener(listener);
+		this.getChangeSupport().removeListChangeListener(listener);
 	}
 
 	public synchronized void removeListChangeListener(String listName, ListChangeListener listener) {
-		this.changeSupport().removeListChangeListener(listName, listener);
+		this.getChangeSupport().removeListChangeListener(listName, listener);
 	}
 
 	protected final void fireItemAdded(String listName, int index, Object addedItem) {
-		this.changeSupport().fireItemAdded(listName, index, addedItem);
+		this.getChangeSupport().fireItemAdded(listName, index, addedItem);
 	}
 
 	protected final void fireItemsAdded(String listName, int index, List<?> addedItems) {
-		this.changeSupport().fireItemsAdded(listName, index, addedItems);
+		this.getChangeSupport().fireItemsAdded(listName, index, addedItems);
 	}
 
 	protected final void fireItemsAdded(ListChangeEvent event) {
-		this.changeSupport().fireItemsAdded(event);
+		this.getChangeSupport().fireItemsAdded(event);
 	}
 
 	protected final void fireItemRemoved(String listName, int index, Object removedItem) {
-		this.changeSupport().fireItemRemoved(listName, index, removedItem);
+		this.getChangeSupport().fireItemRemoved(listName, index, removedItem);
 	}
 
 	protected final void fireItemsRemoved(String listName, int index, List<?> removedItems) {
-		this.changeSupport().fireItemsRemoved(listName, index, removedItems);
+		this.getChangeSupport().fireItemsRemoved(listName, index, removedItems);
 	}
 
 	protected final void fireItemsRemoved(ListChangeEvent event) {
-		this.changeSupport().fireItemsRemoved(event);
+		this.getChangeSupport().fireItemsRemoved(event);
 	}
 
 	protected final void fireItemReplaced(String listName, int index, Object newItem, Object replacedItem) {
-		this.changeSupport().fireItemReplaced(listName, index, newItem, replacedItem);
+		this.getChangeSupport().fireItemReplaced(listName, index, newItem, replacedItem);
 	}
 
 	protected final <E> void fireItemsReplaced(String listName, int index, List<? extends E> newItems, List<E> replacedItems) {
-		this.changeSupport().fireItemsReplaced(listName, index, newItems, replacedItems);
+		this.getChangeSupport().fireItemsReplaced(listName, index, newItems, replacedItems);
 	}
 
 	protected final void fireItemsReplaced(ListChangeEvent event) {
-		this.changeSupport().fireItemsReplaced(event);
+		this.getChangeSupport().fireItemsReplaced(event);
 	}
 
 	protected final void fireItemMoved(String listName, int targetIndex, int sourceIndex) {
-		this.changeSupport().fireItemMoved(listName, targetIndex, sourceIndex);
+		this.getChangeSupport().fireItemMoved(listName, targetIndex, sourceIndex);
 	}
 
 	protected final <E> void fireItemsMoved(String listName, int targetIndex, int sourceIndex, int length) {
-		this.changeSupport().fireItemsMoved(listName, targetIndex, sourceIndex, length);
+		this.getChangeSupport().fireItemsMoved(listName, targetIndex, sourceIndex, length);
 	}
 
 	protected final void fireItemsMoved(ListChangeEvent event) {
-		this.changeSupport().fireItemsMoved(event);
+		this.getChangeSupport().fireItemsMoved(event);
 	}
 
 	protected final void fireListCleared(String listName) {
-		this.changeSupport().fireListCleared(listName);
+		this.getChangeSupport().fireListCleared(listName);
 	}
 
 	protected final void fireListCleared(ListChangeEvent event) {
-		this.changeSupport().fireListCleared(event);
+		this.getChangeSupport().fireListCleared(event);
 	}
 
 	protected final void fireListChanged(String listName) {
-		this.changeSupport().fireListChanged(listName);
+		this.getChangeSupport().fireListChanged(listName);
 	}
 
 	protected final void fireListChanged(ListChangeEvent event) {
-		this.changeSupport().fireListChanged(event);
+		this.getChangeSupport().fireListChanged(event);
 	}
 
 	/**
@@ -793,55 +793,55 @@ public abstract class AbstractModel implements Model, Serializable {
 	// ********** tree change support **********
 
 	public synchronized void addTreeChangeListener(TreeChangeListener listener) {
-		this.changeSupport().addTreeChangeListener(listener);
+		this.getChangeSupport().addTreeChangeListener(listener);
 	}
 
 	public synchronized void addTreeChangeListener(String treeName, TreeChangeListener listener) {
-		this.changeSupport().addTreeChangeListener(treeName, listener);
+		this.getChangeSupport().addTreeChangeListener(treeName, listener);
 	}
 
 	public synchronized void removeTreeChangeListener(TreeChangeListener listener) {
-		this.changeSupport().removeTreeChangeListener(listener);
+		this.getChangeSupport().removeTreeChangeListener(listener);
 	}
 
 	public synchronized void removeTreeChangeListener(String treeName, TreeChangeListener listener) {
-		this.changeSupport().removeTreeChangeListener(treeName, listener);
+		this.getChangeSupport().removeTreeChangeListener(treeName, listener);
 	}
 
 	protected final void fireNodeAdded(String treeName, Object[] path) {
-		this.changeSupport().fireNodeAdded(treeName, path);
+		this.getChangeSupport().fireNodeAdded(treeName, path);
 	}
 
 	protected final void fireNodeAdded(TreeChangeEvent event) {
-		this.changeSupport().fireNodeAdded(event);
+		this.getChangeSupport().fireNodeAdded(event);
 	}
 
 	protected final void fireNodeRemoved(String treeName, Object[] path) {
-		this.changeSupport().fireNodeRemoved(treeName, path);
+		this.getChangeSupport().fireNodeRemoved(treeName, path);
 	}
 
 	protected final void fireNodeRemoved(TreeChangeEvent event) {
-		this.changeSupport().fireNodeRemoved(event);
+		this.getChangeSupport().fireNodeRemoved(event);
 	}
 
 	protected final void fireTreeCleared(String treeName) {
-		this.changeSupport().fireTreeCleared(treeName);
+		this.getChangeSupport().fireTreeCleared(treeName);
 	}
 
 	protected final void fireTreeCleared(TreeChangeEvent event) {
-		this.changeSupport().fireTreeCleared(event);
+		this.getChangeSupport().fireTreeCleared(event);
 	}
 
 	protected final void fireTreeChanged(String treeName) {
-		this.changeSupport().fireTreeChanged(treeName);
+		this.getChangeSupport().fireTreeChanged(treeName);
 	}
 
 	protected final void fireTreeChanged(String treeName, Object[] path) {
-		this.changeSupport().fireTreeChanged(treeName, path);
+		this.getChangeSupport().fireTreeChanged(treeName, path);
 	}
 
 	protected final void fireTreeChanged(TreeChangeEvent event) {
-		this.changeSupport().fireTreeChanged(event);
+		this.getChangeSupport().fireTreeChanged(event);
 	}
 
 
@@ -851,7 +851,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	 * Return whether there are any state change listeners.
 	 */
 	public boolean hasAnyStateChangeListeners() {
-		return this.changeSupport().hasAnyStateChangeListeners();
+		return this.getChangeSupport().hasAnyStateChangeListeners();
 	}
 
 	/**
@@ -865,7 +865,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	 * Return whether there are any property change listeners for a specific property.
 	 */
 	public boolean hasAnyPropertyChangeListeners(String propertyName) {
-		return this.changeSupport().hasAnyPropertyChangeListeners(propertyName);
+		return this.getChangeSupport().hasAnyPropertyChangeListeners(propertyName);
 	}
 
 	/**
@@ -879,7 +879,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	 * Return whether there are any collection change listeners for a specific collection.
 	 */
 	public boolean hasAnyCollectionChangeListeners(String collectionName) {
-		return this.changeSupport().hasAnyCollectionChangeListeners(collectionName);
+		return this.getChangeSupport().hasAnyCollectionChangeListeners(collectionName);
 	}
 
 	/**
@@ -893,7 +893,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	 * Return whether there are any list change listeners for a specific list.
 	 */
 	public boolean hasAnyListChangeListeners(String listName) {
-		return this.changeSupport().hasAnyListChangeListeners(listName);
+		return this.getChangeSupport().hasAnyListChangeListeners(listName);
 	}
 
 	/**
@@ -907,7 +907,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	 * Return whether there are any tree change listeners for a specific tree.
 	 */
 	public boolean hasAnyTreeChangeListeners(String treeName) {
-		return this.changeSupport().hasAnyTreeChangeListeners(treeName);
+		return this.getChangeSupport().hasAnyTreeChangeListeners(treeName);
 	}
 
 	/**
@@ -928,7 +928,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	 * ChangeSupport already does that.
 	 */
 	protected final boolean valuesAreEqual(Object value1, Object value2) {
-		return this.changeSupport().valuesAreEqual(value1, value2);
+		return this.getChangeSupport().valuesAreEqual(value1, value2);
 	}
 	protected final boolean attributeValueHasNotChanged(Object oldValue, Object newValue) {
 		return this.valuesAreEqual(oldValue, newValue);
@@ -947,7 +947,7 @@ public abstract class AbstractModel implements Model, Serializable {
 	 * with the state that just changed.
 	 */
 	protected final boolean valuesAreDifferent(Object value1, Object value2) {
-		return this.changeSupport().valuesAreDifferent(value1, value2);
+		return this.getChangeSupport().valuesAreDifferent(value1, value2);
 	}
 	protected final boolean attributeValueHasChanged(Object oldValue, Object newValue) {
 		return this.valuesAreDifferent(oldValue, newValue);
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/ChangeSupport.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/ChangeSupport.java
index c98cdae62b..4e736a3246 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/ChangeSupport.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/ChangeSupport.java
@@ -462,11 +462,11 @@ public class ChangeSupport
 	 * for general purpose notification of changes.
 	 */
 	public void firePropertyChanged(PropertyChangeEvent event) {
-		if (this.valuesAreEqual(event.oldValue(), event.newValue())) {
+		if (this.valuesAreEqual(event.getOldValue(), event.getNewValue())) {
 			return; 
 		}
 
-		String propertyName = event.propertyName();
+		String propertyName = event.getPropertyName();
 
 		PropertyChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -714,7 +714,7 @@ public class ChangeSupport
 			return;
 		}
 
-		String collectionName = event.collectionName();
+		String collectionName = event.getCollectionName();
 
 		CollectionChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -846,7 +846,7 @@ public class ChangeSupport
 			return;
 		}
 
-		String collectionName = event.collectionName();
+		String collectionName = event.getCollectionName();
 
 		CollectionChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -974,7 +974,7 @@ public class ChangeSupport
 	 * Report a bound collection update to any registered listeners.
 	 */
 	public void fireCollectionCleared(CollectionChangeEvent event) {
-		String collectionName = event.collectionName();
+		String collectionName = event.getCollectionName();
 
 		CollectionChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1054,7 +1054,7 @@ public class ChangeSupport
 	 * Report a bound collection update to any registered listeners.
 	 */
 	public void fireCollectionChanged(CollectionChangeEvent event) {
-		String collectionName = event.collectionName();
+		String collectionName = event.getCollectionName();
 
 		CollectionChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1192,7 +1192,7 @@ public class ChangeSupport
 			return;
 		}
 
-		String listName = event.listName();
+		String listName = event.getListName();
 
 		ListChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1324,7 +1324,7 @@ public class ChangeSupport
 			return;
 		}
 
-		String listName = event.listName();
+		String listName = event.getListName();
 
 		ListChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1456,7 +1456,7 @@ public class ChangeSupport
 			return;
 		}
 
-		String listName = event.listName();
+		String listName = event.getListName();
 
 		ListChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1584,11 +1584,11 @@ public class ChangeSupport
 	 * Report a bound list update to any registered listeners.
 	 */
 	public void fireItemsMoved(ListChangeEvent event) {
-		if (event.targetIndex() == event.sourceIndex()) {
+		if (event.getTargetIndex() == event.getSourceIndex()) {
 			return;
 		}
 
-		String listName = event.listName();
+		String listName = event.getListName();
 
 		ListChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1678,7 +1678,7 @@ public class ChangeSupport
 	 * Report a bound list update to any registered listeners.
 	 */
 	public void fireListCleared(ListChangeEvent event) {
-		String listName = event.listName();
+		String listName = event.getListName();
 
 		ListChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1758,7 +1758,7 @@ public class ChangeSupport
 	 * Report a bound list update to any registered listeners.
 	 */
 	public void fireListChanged(ListChangeEvent event) {
-		String listName = event.listName();
+		String listName = event.getListName();
 
 		ListChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1893,7 +1893,7 @@ public class ChangeSupport
 	 * Report a bound tree update to any registered listeners.
 	 */
 	public void fireNodeAdded(TreeChangeEvent event) {
-		String treeName = event.treeName();
+		String treeName = event.getTreeName();
 
 		TreeChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -1973,7 +1973,7 @@ public class ChangeSupport
 	 * Report a bound tree update to any registered listeners.
 	 */
 	public void fireNodeRemoved(TreeChangeEvent event) {
-		String treeName = event.treeName();
+		String treeName = event.getTreeName();
 
 		TreeChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -2053,7 +2053,7 @@ public class ChangeSupport
 	 * Report a bound tree update to any registered listeners.
 	 */
 	public void fireTreeCleared(TreeChangeEvent event) {
-		String treeName = event.treeName();
+		String treeName = event.getTreeName();
 
 		TreeChangeListener[] targets = null;
 		ChangeSupport child = null;
@@ -2140,7 +2140,7 @@ public class ChangeSupport
 	 * Report a bound tree update to any registered listeners.
 	 */
 	public void fireTreeChanged(TreeChangeEvent event) {
-		String treeName = event.treeName();
+		String treeName = event.getTreeName();
 
 		TreeChangeListener[] targets = null;
 		ChangeSupport child = null;
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/SingleAspectChangeSupport.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/SingleAspectChangeSupport.java
index e5f0a74cca..f63e523c6c 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/SingleAspectChangeSupport.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/SingleAspectChangeSupport.java
@@ -100,7 +100,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void firePropertyChanged(PropertyChangeEvent event) {
-		this.check(PROPERTY_CHANGE_LISTENER_CLASS, event.propertyName());
+		this.check(PROPERTY_CHANGE_LISTENER_CLASS, event.getPropertyName());
 		super.firePropertyChanged(event);
 	}
 
@@ -127,7 +127,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireItemsAdded(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.collectionName());
+		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
 		super.fireItemsAdded(event);
 	}
 
@@ -145,7 +145,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireItemsRemoved(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.collectionName());
+		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
 		super.fireItemsRemoved(event);
 	}
 
@@ -163,7 +163,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireCollectionCleared(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.collectionName());
+		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
 		super.fireCollectionCleared(event);
 	}
 
@@ -175,7 +175,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireCollectionChanged(CollectionChangeEvent event) {
-		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.collectionName());
+		this.check(COLLECTION_CHANGE_LISTENER_CLASS, event.getCollectionName());
 		super.fireCollectionChanged(event);
 	}
 
@@ -190,7 +190,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireItemsAdded(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.listName());
+		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
 		super.fireItemsAdded(event);
 	}
 
@@ -208,7 +208,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireItemsRemoved(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.listName());
+		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
 		super.fireItemsRemoved(event);
 	}
 
@@ -226,7 +226,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireItemsReplaced(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.listName());
+		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
 		super.fireItemsReplaced(event);
 	}
 
@@ -244,7 +244,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireItemsMoved(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.listName());
+		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
 		super.fireItemsMoved(event);
 	}
 
@@ -256,7 +256,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireListCleared(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.listName());
+		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
 		super.fireListCleared(event);
 	}
 
@@ -268,7 +268,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireListChanged(ListChangeEvent event) {
-		this.check(LIST_CHANGE_LISTENER_CLASS, event.listName());
+		this.check(LIST_CHANGE_LISTENER_CLASS, event.getListName());
 		super.fireListChanged(event);
 	}
 
@@ -283,7 +283,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireNodeAdded(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.treeName());
+		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
 		super.fireNodeAdded(event);
 	}
 
@@ -295,7 +295,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireNodeRemoved(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.treeName());
+		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
 		super.fireNodeRemoved(event);
 	}
 
@@ -307,7 +307,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireTreeCleared(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.treeName());
+		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
 		super.fireTreeCleared(event);
 	}
 
@@ -319,7 +319,7 @@ public class SingleAspectChangeSupport
 
 	@Override
 	public void fireTreeChanged(TreeChangeEvent event) {
-		this.check(TREE_CHANGE_LISTENER_CLASS, event.treeName());
+		this.check(TREE_CHANGE_LISTENER_CLASS, event.getTreeName());
 		super.fireTreeChanged(event);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AbstractTreeNodeValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AbstractTreeNodeValueModel.java
index 77d2dad9d9..b06c83a3ac 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AbstractTreeNodeValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AbstractTreeNodeValueModel.java
@@ -179,17 +179,17 @@ public abstract class AbstractTreeNodeValueModel<T>
 		}
 		@SuppressWarnings("unchecked")
 		AbstractTreeNodeValueModel<T> other = (AbstractTreeNodeValueModel<T>) o;
-		return this.value().equals(other.value());
+		return this.getValue().equals(other.getValue());
 	}
 
 	@Override
 	public int hashCode() {
-		return this.value().hashCode();
+		return this.getValue().hashCode();
 	}
 
 	@Override
 	public void toString(StringBuilder sb) {
-		sb.append(this.value());
+		sb.append(this.getValue());
 	}
 
 }
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 4d7c178bab..f7d33d56e3 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
@@ -83,7 +83,7 @@ public abstract class AspectAdapter<S>
 
 	@Override
 	protected ChangeSupport buildChangeSupport() {
-		return new LocalChangeSupport(this, this.listenerClass(), this.listenerAspectName());
+		return new LocalChangeSupport(this, this.getListenerClass(), this.getListenerAspectName());
 	}
 
 	/**
@@ -108,35 +108,35 @@ public abstract class AspectAdapter<S>
 	 * The subject has changed. Notify listeners that the value has changed.
 	 */
 	protected synchronized void subjectChanged() {
-		Object oldValue = this.value();
+		Object oldValue = this.getValue();
 		boolean hasListeners = this.hasListeners();
 		if (hasListeners) {
 			this.disengageSubject();
 		}
-		this.subject = this.subjectHolder.value();
+		this.subject = this.subjectHolder.getValue();
 		if (hasListeners) {
 			this.engageSubject();
-			this.fireAspectChange(oldValue, this.value());
+			this.fireAspectChange(oldValue, this.getValue());
 		}
 	}
 
 	/**
 	 * Return the aspect's current value.
 	 */
-	protected abstract Object value();
+	protected abstract Object getValue();
 
 	/**
 	 * Return the class of listener that is interested in the aspect adapter's
 	 * changes.
 	 */
-	protected abstract Class<? extends ChangeListener> listenerClass();
+	protected abstract Class<? extends ChangeListener> getListenerClass();
 
 	/**
 	 * Return the name of the aspect adapter's aspect (e.g. VALUE).
 	 * This is the name of the aspect adapter's single aspect, not the
 	 * name of the subject's aspect the aspect adapter is adapting.
 	 */
-	protected abstract String listenerAspectName();
+	protected abstract String getListenerAspectName();
 
 	/**
 	 * Return whether there are any listeners for the aspect.
@@ -183,7 +183,7 @@ public abstract class AspectAdapter<S>
 		this.subjectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.subjectChangeListener);
 		// synch our subject *after* we start listening to the subject holder,
 		// since its value might change when a listener is added
-		this.subject = this.subjectHolder.value();
+		this.subject = this.subjectHolder.getValue();
 	}
 
 	protected void disengageSubjectHolder() {
@@ -231,7 +231,7 @@ public abstract class AspectAdapter<S>
 
 		protected boolean listenerIsRelevant(Class<? extends ChangeListener> lClass, String listenerAspectName) {
 			return this.listenerIsRelevant(lClass)
-						&& (listenerAspectName == AspectAdapter.this.listenerAspectName());
+						&& (listenerAspectName == AspectAdapter.this.getListenerAspectName());
 		}
 
 		protected boolean hasNoRelevantListeners(Class<? extends ChangeListener> lClass, String listenerAspectName) {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectPropertyValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectPropertyValueModelAdapter.java
index 0d8539e197..75853757ad 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectPropertyValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/AspectPropertyValueModelAdapter.java
@@ -60,7 +60,7 @@ public abstract class AspectPropertyValueModelAdapter<T>
 	/**
 	 * Return the cached value.
 	 */
-	public T value() {
+	public T getValue() {
 		return this.value;
 	}
 
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 4921f843d2..8781be4afd 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
@@ -117,8 +117,8 @@ public class BufferedWritablePropertyValueModel<T>
 	 * If we are currently "buffering" a value, return that;
 	 * otherwise, return the wrapped value.
 	 */
-	public T value() {
-		return this.buffering ? this.bufferedValue : this.valueHolder.value();
+	public T getValue() {
+		return this.buffering ? this.bufferedValue : this.valueHolder.getValue();
 	}
 
 	/**
@@ -127,7 +127,7 @@ public class BufferedWritablePropertyValueModel<T>
 	 * when the trigger is "accepted".
 	 */
 	public void setValue(T value) {
-		Object old = this.value();
+		Object old = this.getValue();
 		this.bufferedValue = value;
 		this.buffering = true;
 		this.firePropertyChanged(VALUE, old, this.bufferedValue);
@@ -201,7 +201,7 @@ public class BufferedWritablePropertyValueModel<T>
 			// nothing needs to be passed through; nothing needs to be reset;
 			return;
 		}
-		if (((Boolean) event.newValue()).booleanValue()) {
+		if (((Boolean) event.getNewValue()).booleanValue()) {
 			// set the accepting flag so we ignore any events
 			// fired by the wrapped value holder
 			this.accepting = true;
@@ -215,13 +215,13 @@ public class BufferedWritablePropertyValueModel<T>
 			Object old = this.bufferedValue;
 			this.bufferedValue = null;
 			this.buffering = false;
-			this.firePropertyChanged(VALUE, old, this.valueHolder.value());
+			this.firePropertyChanged(VALUE, old, this.valueHolder.getValue());
 		}
 	}
 
 	@Override
 	public void toString(StringBuilder sb) {
-		sb.append(this.value());
+		sb.append(this.getValue());
 	}
 
 
@@ -272,7 +272,7 @@ public class BufferedWritablePropertyValueModel<T>
 		 * change notification triggered by #setValue(Object).
 		 */
 		@Override
-		public Boolean value() {
+		public Boolean getValue() {
 			if (this.value == null) {
 				throw new IllegalStateException("The method Trigger.value() may only be called during change notification.");
 			}
@@ -307,7 +307,7 @@ public class BufferedWritablePropertyValueModel<T>
 		 * 	- false indicates "reset"
 		 */
 		public boolean booleanValue() {
-			return this.value().booleanValue();
+			return this.getValue().booleanValue();
 		}
 
 		/**
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 2aeede9576..725c275d31 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
@@ -169,17 +169,17 @@ public abstract class CollectionAspectAdapter<S extends Model, E>
 	// ********** AspectAdapter implementation **********
 
 	@Override
-	protected Object value() {
+	protected Object getValue() {
 		return this.iterator();
 	}
 
 	@Override
-	protected Class<? extends ChangeListener> listenerClass() {
+	protected Class<? extends ChangeListener> getListenerClass() {
 		return CollectionChangeListener.class;
 	}
 
 	@Override
-	protected String listenerAspectName() {
+	protected String getListenerAspectName() {
 		return VALUES;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeListValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeListValueModel.java
index 0282b0cedb..dcc84c447d 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeListValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/CompositeListValueModel.java
@@ -220,7 +220,7 @@ public class CompositeListValueModel<E1, E2>
 	 */
 	@Override
 	protected void itemsAdded(ListChangeEvent event) {
-		this.addComponentSources(event.index(), this.items(event), event.itemsSize(), true);  // true = fire event
+		this.addComponentSources(event.getIndex(), this.items(event), event.itemsSize(), true);  // true = fire event
 	}
 
 	/**
@@ -274,7 +274,7 @@ public class CompositeListValueModel<E1, E2>
 	 */
 	@Override
 	protected void itemsRemoved(ListChangeEvent event) {
-		this.removeComponentSources(event.index(), event.itemsSize(), true);  // true = fire event
+		this.removeComponentSources(event.getIndex(), event.itemsSize(), true);  // true = fire event
 	}
 
 	/**
@@ -321,7 +321,7 @@ public class CompositeListValueModel<E1, E2>
 	 */
 	@Override
 	protected void itemsReplaced(ListChangeEvent event) {
-		this.replaceComponentSources(event.index(), this.items(event), event.itemsSize(), true);  // true = fire event
+		this.replaceComponentSources(event.getIndex(), this.items(event), event.itemsSize(), true);  // true = fire event
 	}
 
 	/**
@@ -339,7 +339,7 @@ public class CompositeListValueModel<E1, E2>
 	 */
 	@Override
 	protected void itemsMoved(ListChangeEvent event) {
-		this.moveComponentSources(event.targetIndex(), event.sourceIndex(), event.moveLength(), true);  // true = fire event
+		this.moveComponentSources(event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength(), true);  // true = fire event
 	}
 
 	protected void moveComponentSources(int targetSourcesIndex, int sourceSourcesIndex, int movedSourcesLength, boolean fireEvent) {
@@ -448,7 +448,7 @@ public class CompositeListValueModel<E1, E2>
 
 		// synchronize the cached list
 		Info info = this.infoList.get(componentLVMIndex);
-		CollectionTools.addAll(info.items, event.index(), this.componentItems(event), event.itemsSize());
+		CollectionTools.addAll(info.items, event.getIndex(), this.componentItems(event), event.itemsSize());
 
 		// translate the event
 		this.fireItemsAdded(event.cloneWithSource(this, LIST_VALUES, info.begin));
@@ -469,7 +469,7 @@ public class CompositeListValueModel<E1, E2>
 
 		// synchronize the cached list
 		Info info = this.infoList.get(componentLVMIndex);
-		int itemIndex = event.index();
+		int itemIndex = event.getIndex();
 		info.items.subList(itemIndex, itemIndex + event.itemsSize()).clear();
 
 		// translate the event
@@ -486,7 +486,7 @@ public class CompositeListValueModel<E1, E2>
 		// synchronize the cached list
 		int componentLVMIndex = this.indexFor(event);
 		Info info = this.infoList.get(componentLVMIndex);
-		int i = event.index();
+		int i = event.getIndex();
 		for (Iterator<E2> stream = this.componentItems(event); stream.hasNext(); ) {
 			info.items.set(i++, stream.next());
 		}
@@ -505,7 +505,7 @@ public class CompositeListValueModel<E1, E2>
 		// synchronize the cached list
 		int componentLVMIndex = this.indexFor(event);
 		Info info = this.infoList.get(componentLVMIndex);
-		CollectionTools.move(info.items, event.targetIndex(), event.sourceIndex(), event.moveLength());
+		CollectionTools.move(info.items, event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength());
 
 		// translate the event
 		this.fireItemsMoved(event.cloneWithSource(this, LIST_VALUES, info.begin));
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 0cb1596c03..a56cc34c80 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
@@ -85,8 +85,8 @@ public class FilteringPropertyValueModel<T>
 
 	// ********** PropertyValueModel implementation **********
 
-	public T value() {
-		return this.filterValue(this.valueHolder.value());
+	public T getValue() {
+		return this.filterValue(this.valueHolder.getValue());
 	}
 
 
@@ -96,9 +96,9 @@ public class FilteringPropertyValueModel<T>
 	protected void valueChanged(PropertyChangeEvent event) {
 		// filter the values before propagating the change event
 		@SuppressWarnings("unchecked")
-		Object oldValue = this.filterValue((T) event.oldValue());
+		Object oldValue = this.filterValue((T) event.getOldValue());
 		@SuppressWarnings("unchecked")
-		Object newValue = this.filterValue((T) event.newValue());
+		Object newValue = this.filterValue((T) event.getNewValue());
 		this.firePropertyChanged(VALUE, oldValue, newValue);
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringWritablePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringWritablePropertyValueModel.java
index b789e00463..d7e20f4cb3 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringWritablePropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/FilteringWritablePropertyValueModel.java
@@ -104,7 +104,7 @@ public class FilteringWritablePropertyValueModel<T>
 	 * alternative to building a <code>BidiFilter</code>.
 	 */
 	protected boolean reverseAccept(T value) {
-		return this.filter().reverseAccept(value);
+		return this.getFilter().reverseAccept(value);
 	}
 
 	/**
@@ -118,7 +118,7 @@ public class FilteringWritablePropertyValueModel<T>
 	/**
 	 * Our constructors accept only a bidirectional filter.
 	 */
-	protected BidiFilter<T> filter() {
+	protected BidiFilter<T> getFilter() {
 		return (BidiFilter<T>) this.filter;
 	}
 
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 17e7cc555d..be004fe730 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
@@ -210,17 +210,17 @@ public abstract class ListAspectAdapter<S extends Model, E>
 	// ********** AspectAdapter implementation **********
 
 	@Override
-	protected Object value() {
+	protected Object getValue() {
 		return this.iterator();
 	}
 
 	@Override
-	protected Class<? extends ChangeListener> listenerClass() {
+	protected Class<? extends ChangeListener> getListenerClass() {
 		return ListChangeListener.class;
 	}
 
 	@Override
-	protected String listenerAspectName() {
+	protected String getListenerAspectName() {
 		return LIST_VALUES;
 	}
 
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 69c7b7b24e..5420b78d84 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
@@ -113,17 +113,17 @@ public abstract class ListCurator<S extends Model, E>
 	// ********** AspectAdapter implementation **********
 
 	@Override
-	protected Object value() {
+	protected Object getValue() {
 		return this.iterator();
 	}
 
 	@Override
-	protected Class<? extends ChangeListener> listenerClass() {
+	protected Class<? extends ChangeListener> getListenerClass() {
 		return ListChangeListener.class;
 	}
 
 	@Override
-	protected String listenerAspectName() {
+	protected String getListenerAspectName() {
 		return LIST_VALUES;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullPropertyValueModel.java
index 7c9b4d5399..12c9b670e8 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullPropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/NullPropertyValueModel.java
@@ -35,7 +35,7 @@ public class NullPropertyValueModel<T>
 
 	// ********** PropertyValueModel implementation **********
 
-	public T value() {
+	public T getValue() {
 		return null;
 	}
 
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 5ded8a5eb1..81e93d8765 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
@@ -137,7 +137,7 @@ public abstract class PropertyAspectAdapter<S extends Model, T>
 	 * Return the value of the subject's property.
 	 */
 	@Override
-	public final T value() {
+	public final T getValue() {
 		return this.value;
 	}
 
@@ -166,12 +166,12 @@ public abstract class PropertyAspectAdapter<S extends Model, T>
 	// ********** AspectAdapter implementation **********
 
 	@Override
-	protected Class<? extends ChangeListener> listenerClass() {
+	protected Class<? extends ChangeListener> getListenerClass() {
 		return PropertyChangeListener.class;
 	}
 
 	@Override
-	protected String listenerAspectName() {
+	protected String getListenerAspectName() {
 		return VALUE;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyCollectionValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyCollectionValueModelAdapter.java
index 5b93ca1c2e..9dcc0d4e24 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyCollectionValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyCollectionValueModelAdapter.java
@@ -72,7 +72,7 @@ public class PropertyCollectionValueModelAdapter<E>
 		return new PropertyChangeListener() {
 			@SuppressWarnings("unchecked")
 			public void propertyChanged(PropertyChangeEvent event) {
-				PropertyCollectionValueModelAdapter.this.valueChanged((E) event.newValue());
+				PropertyCollectionValueModelAdapter.this.valueChanged((E) event.getNewValue());
 			}
 			@Override
 			public String toString() {
@@ -160,7 +160,7 @@ public class PropertyCollectionValueModelAdapter<E>
 		this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListener);
 		// synch our value *after* we start listening to the value holder,
 		// since its value might change when a listener is added
-		this.value = this.valueHolder.value();
+		this.value = this.valueHolder.getValue();
 	}
 
 	protected void disengageModel() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyListValueModelAdapter.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyListValueModelAdapter.java
index 51eb48e9af..6826af4511 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyListValueModelAdapter.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/PropertyListValueModelAdapter.java
@@ -74,7 +74,7 @@ public class PropertyListValueModelAdapter<E>
 		return new PropertyChangeListener() {
 			@SuppressWarnings("unchecked")
 			public void propertyChanged(PropertyChangeEvent event) {
-				PropertyListValueModelAdapter.this.valueChanged((E) event.newValue());
+				PropertyListValueModelAdapter.this.valueChanged((E) event.getNewValue());
 			}
 			@Override
 			public String toString() {
@@ -185,7 +185,7 @@ public class PropertyListValueModelAdapter<E>
 		this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.propertyChangeListener);
 		// synch our value *after* we start listening to the value holder,
 		// since its value might change when a listener is added
-		this.value = this.valueHolder.value();
+		this.value = this.valueHolder.getValue();
 	}
 
 	protected void disengageModel() {
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimplePropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimplePropertyValueModel.java
index c2dcbf8381..e7248e65c5 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimplePropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/SimplePropertyValueModel.java
@@ -48,7 +48,7 @@ public class SimplePropertyValueModel<T>
 	}
 
 
-	public T value() {
+	public T getValue() {
 		return this.value;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticPropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticPropertyValueModel.java
index 32d3ae51e7..e5eccf3ae2 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticPropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/model/value/StaticPropertyValueModel.java
@@ -39,7 +39,7 @@ public class StaticPropertyValueModel<T>
 
 	// ********** PropertyValueModel implementation **********
 
-	public T value() {
+	public T getValue() {
 		return this.value;
 	}
 
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 f1ee2b1c76..ad4a2a3418 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
@@ -188,7 +188,7 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 */
     @Override
 	protected void itemsAdded(ListChangeEvent event) {
-		this.addItemsToList(event.index(), this.transformItems(event), this.transformedList, LIST_VALUES);
+		this.addItemsToList(event.getIndex(), this.transformItems(event), this.transformedList, LIST_VALUES);
 	}
 
 	/**
@@ -198,7 +198,7 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 */
     @Override
 	protected void itemsRemoved(ListChangeEvent event) {
-		this.removeItemsFromList(event.index(), event.itemsSize(), this.transformedList, LIST_VALUES);
+		this.removeItemsFromList(event.getIndex(), event.itemsSize(), this.transformedList, LIST_VALUES);
 	}
 
 	/**
@@ -208,7 +208,7 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 */
     @Override
 	protected void itemsReplaced(ListChangeEvent event) {
-		this.setItemsInList(event.index(), this.transformItems(event), this.transformedList, LIST_VALUES);
+		this.setItemsInList(event.getIndex(), this.transformItems(event), this.transformedList, LIST_VALUES);
 	}
 
 	/**
@@ -218,7 +218,7 @@ public class TransformationListValueModelAdapter<E1, E2>
 	 */
     @Override
 	protected void itemsMoved(ListChangeEvent event) {
-    	this.moveItemsInList(event.targetIndex(), event.sourceIndex(), event.moveLength(), this.transformedList, LIST_VALUES);
+    	this.moveItemsInList(event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength(), this.transformedList, LIST_VALUES);
 	}
 
 	/**
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 219d474b0a..5d3b93e821 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
@@ -61,9 +61,9 @@ public class TransformationPropertyValueModel<T1, T2>
 
 	// ********** PropertyValueModel implementation **********
 
-	public T2 value() {
+	public T2 getValue() {
 		// transform the object returned by the nested value model before returning it
-		return this.transform(this.valueHolder.value());
+		return this.transform(this.valueHolder.getValue());
 	}
 
 
@@ -73,9 +73,9 @@ public class TransformationPropertyValueModel<T1, T2>
 	protected void valueChanged(PropertyChangeEvent event) {
 		// transform the values before propagating the change event
 	    @SuppressWarnings("unchecked")
-		Object oldValue = this.transform((T1) event.oldValue());
+		Object oldValue = this.transform((T1) event.getOldValue());
 	    @SuppressWarnings("unchecked")
-		Object newValue = this.transform((T1) event.newValue());
+		Object newValue = this.transform((T1) event.getNewValue());
 		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 a2e6b9e5dc..ad131da203 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
@@ -146,17 +146,17 @@ public abstract class TreeAspectAdapter<S extends Model, E>
 	// ********** AspectAdapter implementation **********
 
 	@Override
-	protected Object value() {
+	protected Object getValue() {
 		return this.nodes();
 	}
 
 	@Override
-	protected Class<? extends ChangeListener> listenerClass() {
+	protected Class<? extends ChangeListener> getListenerClass() {
 		return TreeChangeListener.class;
 	}
 
 	@Override
-	protected String listenerAspectName() {
+	protected String getListenerAspectName() {
 		return NODES;
 	}
 
@@ -198,11 +198,11 @@ public abstract class TreeAspectAdapter<S extends Model, E>
 	// ********** behavior **********
 
 	protected void nodeAdded(TreeChangeEvent event) {
-		this.fireNodeAdded(NODES, event.path());
+		this.fireNodeAdded(NODES, event.getPath());
 	}
 
 	protected void nodeRemoved(TreeChangeEvent event) {
-		this.fireNodeRemoved(NODES, event.path());
+		this.fireNodeRemoved(NODES, event.getPath());
 	}
 
 	protected void treeCleared(TreeChangeEvent event) {
@@ -210,7 +210,7 @@ public abstract class TreeAspectAdapter<S extends Model, E>
 	}
 
 	protected void treeChanged(TreeChangeEvent event) {
-		this.fireTreeChanged(NODES, event.path());
+		this.fireTreeChanged(NODES, event.getPath());
 	}
 
 }
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 ffd85f751a..d47c50f4a2 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
@@ -70,7 +70,7 @@ public abstract class ValueAspectAdapter<T>
 
 	// ********** PropertyValueModel implementation **********
 
-	public T value() {
+	public T getValue() {
 		return this.value;
 	}
 
@@ -117,7 +117,7 @@ public abstract class ValueAspectAdapter<T>
 	 * Start listening to the current value.
 	 */
 	protected void engageValue() {
-		this.value = this.valueHolder.value();
+		this.value = this.valueHolder.getValue();
 		if (this.value != null) {
 			this.engageValue_();
 		}
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 568e2308a6..c6cca7232a 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
@@ -180,7 +180,7 @@ public class PreferencePropertyValueModel<P>
 	 * Return the cached (converted) value.
 	 */
 	@Override
-	public synchronized P value() {
+	public synchronized P getValue() {
 		return this.value;
 	}
 
@@ -208,12 +208,12 @@ public class PreferencePropertyValueModel<P>
 	// ********** AspectAdapter implementation **********
 
 	@Override
-	protected Class<? extends ChangeListener> listenerClass() {
+	protected Class<? extends ChangeListener> getListenerClass() {
 		return PropertyChangeListener.class;
 	}
 
 	@Override
-	protected String listenerAspectName() {
+	protected String getListenerAspectName() {
 		return VALUE;
 	}
 
@@ -264,7 +264,7 @@ public class PreferencePropertyValueModel<P>
 	/**
 	 * Return the preference's key.
 	 */
-	public String key() {
+	public String getKey() {
 		return this.key;
 	}
 
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 3dcf45bc63..c4cef6640f 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
@@ -97,17 +97,17 @@ public class PreferencesCollectionValueModel<P>
 	// ********** AspectAdapter implementation **********
 
 	@Override
-	protected Object value() {
+	protected Object getValue() {
 		return this.iterator();
 	}
 
 	@Override
-	protected Class<? extends ChangeListener> listenerClass() {
+	protected Class<? extends ChangeListener> getListenerClass() {
 		return CollectionChangeListener.class;
 	}
 
 	@Override
-	protected String listenerAspectName() {
+	protected String getListenerAspectName() {
 		return VALUES;
 	}
 
@@ -126,7 +126,7 @@ public class PreferencesCollectionValueModel<P>
 		this.subject.addPreferenceChangeListener(this.preferenceChangeListener);
 		for (Iterator<PreferencePropertyValueModel<P>> stream = this.preferenceModels(); stream.hasNext(); ) {
 			PreferencePropertyValueModel<P> preferenceModel = stream.next();
-			this.preferences.put(preferenceModel.key(), preferenceModel);
+			this.preferences.put(preferenceModel.getKey(), preferenceModel);
 		}
 	}
 
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 48387b57a3..b6f30cda1d 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
@@ -97,7 +97,7 @@ public class ComboBoxModelAdapter
 	// ********** ComboBoxModel implementation **********
 
 	public Object getSelectedItem() {
-		return this.selectionHolder.value();
+		return this.selectionHolder.getValue();
 	}
 
 	public void setSelectedItem(Object selectedItem) {
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 4318fc6963..8d0256b4da 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
@@ -81,7 +81,7 @@ public class DateSpinnerModelAdapter
 	 * Constructor - the date holder is required.
 	 */
 	public DateSpinnerModelAdapter(WritablePropertyValueModel<Object> dateHolder, Comparable<?> start, Comparable<?> end, int calendarField, Date defaultValue) {
-		super(dateHolder.value() == null ? defaultValue : (Date) dateHolder.value(), start, end, calendarField);
+		super(dateHolder.getValue() == null ? defaultValue : (Date) dateHolder.getValue(), start, end, calendarField);
 		this.dateHolder = dateHolder;
 		this.dateChangeListener = this.buildDateChangeListener();
 		// postpone listening to the underlying date
@@ -99,7 +99,7 @@ public class DateSpinnerModelAdapter
 	protected PropertyChangeListener buildDateChangeListener_() {
 		return new PropertyChangeListener() {
 			public void propertyChanged(PropertyChangeEvent event) {
-				DateSpinnerModelAdapter.this.synchronize(event.newValue());
+				DateSpinnerModelAdapter.this.synchronize(event.getNewValue());
 			}
 			@Override
 			public String toString() {
@@ -122,7 +122,7 @@ public class DateSpinnerModelAdapter
 	public Object getValue() {
 		if (this.getChangeListeners().length == 0) {
 			// sorry about this "lateral" call to super  ~bjv
-			super.setValue(this.spinnerValueOf(this.dateHolder.value()));
+			super.setValue(this.spinnerValueOf(this.dateHolder.getValue()));
 		}
 		return super.getValue();
 	}
@@ -144,7 +144,7 @@ public class DateSpinnerModelAdapter
 	public void addChangeListener(ChangeListener listener) {
 		if (this.getChangeListeners().length == 0) {
 			this.dateHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.dateChangeListener);
-			this.synchronize(this.dateHolder.value());
+			this.synchronize(this.dateHolder.getValue());
 		}
 		super.addChangeListener(listener);
 	}
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 d701eb3489..50f04d9c97 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
@@ -236,7 +236,7 @@ public class DocumentAdapter
 	 * Synchronize the delegate document accordingly.
 	 */
 	protected void stringChanged(PropertyChangeEvent event) {
-		this.synchronizeDelegate((String) event.newValue());
+		this.synchronizeDelegate((String) event.getNewValue());
 	}
 
 	/**
@@ -258,7 +258,7 @@ public class DocumentAdapter
 
 	protected void engageStringHolder() {
 		this.stringHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.stringListener);
-		this.synchronizeDelegate(this.stringHolder.value());
+		this.synchronizeDelegate(this.stringHolder.getValue());
 	}
 
 	protected void disengageStringHolder() {
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 9bae4030f9..e4ad741c12 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
@@ -214,7 +214,7 @@ public class ListModelAdapter
 	 * Notify listeners of the changes.
 	 */
 	protected void itemsAdded(ListChangeEvent event) {
-		int start = event.index();
+		int start = event.getIndex();
 		int end = start + event.itemsSize() - 1;
 		this.fireIntervalAdded(this, start, end);
 		this.listSize += event.itemsSize();
@@ -225,7 +225,7 @@ public class ListModelAdapter
 	 * Notify listeners of the changes.
 	 */
 	protected void itemsRemoved(ListChangeEvent event) {
-		int start = event.index();
+		int start = event.getIndex();
 		int end = start + event.itemsSize() - 1;
 		this.fireIntervalRemoved(this, start, end);
 		this.listSize -= event.itemsSize();
@@ -236,7 +236,7 @@ public class ListModelAdapter
 	 * Notify listeners of the changes.
 	 */
 	protected void itemsReplaced(ListChangeEvent event) {
-		int start = event.index();
+		int start = event.getIndex();
 		int end = start + event.itemsSize() - 1;
 		this.fireContentsChanged(this, start, end);
 	}
@@ -246,8 +246,8 @@ public class ListModelAdapter
 	 * Notify listeners of the changes.
 	 */
 	protected void itemsMoved(ListChangeEvent event) {
-		int start = Math.min(event.sourceIndex(), event.targetIndex());
-		int end = Math.max(event.sourceIndex(), event.targetIndex()) + event.moveLength() - 1;
+		int start = Math.min(event.getSourceIndex(), event.getTargetIndex());
+		int end = Math.max(event.getSourceIndex(), event.getTargetIndex()) + event.getMoveLength() - 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 edad3a7c36..d8ee7b4220 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
@@ -64,7 +64,7 @@ public class ListSpinnerModelAdapter
 	 * Use the model value itself as the default spinner value.
 	 */
 	public ListSpinnerModelAdapter(WritablePropertyValueModel<Object> valueHolder) {
-		this(valueHolder, valueHolder.value());
+		this(valueHolder, valueHolder.getValue());
 	}
 
 	/**
@@ -119,7 +119,7 @@ public class ListSpinnerModelAdapter
 	protected PropertyChangeListener buildValueChangeListener_() {
 		return new PropertyChangeListener() {
 			public void propertyChanged(PropertyChangeEvent event) {
-				ListSpinnerModelAdapter.this.synchronize(event.newValue());
+				ListSpinnerModelAdapter.this.synchronize(event.getNewValue());
 			}
 			@Override
 			public String toString() {
@@ -142,7 +142,7 @@ public class ListSpinnerModelAdapter
 	public Object getValue() {
 		if (this.getChangeListeners().length == 0) {
 			// sorry about this "lateral" call to super  ~bjv
-			super.setValue(this.spinnerValueOf(this.valueHolder.value()));
+			super.setValue(this.spinnerValueOf(this.valueHolder.getValue()));
 		}
 		return super.getValue();
 	}
@@ -164,7 +164,7 @@ public class ListSpinnerModelAdapter
 	public void addChangeListener(ChangeListener listener) {
 		if (this.getChangeListeners().length == 0) {
 			this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.valueChangeListener);
-			this.synchronize(this.valueHolder.value());
+			this.synchronize(this.valueHolder.getValue());
 		}
 		super.addChangeListener(listener);
 	}
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 79dbc4baa0..3188aa4bfc 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
@@ -105,7 +105,7 @@ public class NumberSpinnerModelAdapter
 	 * Constructor - the number holder is required.
 	 */
 	public NumberSpinnerModelAdapter(WritablePropertyValueModel<Number> numberHolder, Comparable<?> minimum, Comparable<?> maximum, Number stepSize, Number defaultValue) {
-		super(numberHolder.value() == null ? defaultValue : (Number) numberHolder.value(), minimum, maximum, stepSize);
+		super(numberHolder.getValue() == null ? defaultValue : (Number) numberHolder.getValue(), minimum, maximum, stepSize);
 		this.numberHolder = numberHolder;
 		this.numberChangeListener = this.buildNumberChangeListener();
 		// postpone listening to the underlying number
@@ -123,7 +123,7 @@ public class NumberSpinnerModelAdapter
 	protected PropertyChangeListener buildNumberChangeListener_() {
 		return new PropertyChangeListener() {
 			public void propertyChanged(PropertyChangeEvent event) {
-				NumberSpinnerModelAdapter.this.synchronize(event.newValue());
+				NumberSpinnerModelAdapter.this.synchronize(event.getNewValue());
 			}
 			@Override
 			public String toString() {
@@ -146,7 +146,7 @@ public class NumberSpinnerModelAdapter
 	public Object getValue() {
 		if (this.getChangeListeners().length == 0) {
 			// sorry about this "lateral" call to super  ~bjv
-			super.setValue(this.spinnerValueOf(this.numberHolder.value()));
+			super.setValue(this.spinnerValueOf(this.numberHolder.getValue()));
 		}
 		return super.getValue();
 	}
@@ -168,7 +168,7 @@ public class NumberSpinnerModelAdapter
 	public void addChangeListener(ChangeListener listener) {
 		if (this.getChangeListeners().length == 0) {
 			this.numberHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.numberChangeListener);
-			this.synchronize(this.numberHolder.value());
+			this.synchronize(this.numberHolder.getValue());
 		}
 		super.addChangeListener(listener);
 	}
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 e40a6a1c15..c4c3ae173a 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
@@ -111,7 +111,7 @@ public class ObjectListSelectionModel
 	/**
 	 * Return the list model referenced by the list selection model.
 	 */
-	public ListModel listModel() {
+	public ListModel getListModel() {
 		return this.listModel;
 	}
 
@@ -124,7 +124,7 @@ public class ObjectListSelectionModel
 		}
 
 		int n = 0;
-		int count = this.listModel().getSize();
+		int count = this.getListModel().getSize();
 		for (int i = min; i <= max; i++) {
 			if (this.isSelectedIndex(i) && (i < count)) {
 				n++;
@@ -142,10 +142,10 @@ public class ObjectListSelectionModel
 		if (index == -1) {
 			return null;
 		}
-		if (this.listModel().getSize() <= index) {
+		if (this.getListModel().getSize() <= index) {
 			return null;
 		}
-		return this.listModel().getElementAt(index);
+		return this.getListModel().getElementAt(index);
 	}
 
 	/**
@@ -162,10 +162,10 @@ public class ObjectListSelectionModel
 		int maxSize = (max - min) + 1;
 		Object[] temp = new Object[maxSize];
 		int n = 0;
-		int count = this.listModel().getSize();
+		int count = this.getListModel().getSize();
 		for (int i = min; i <= max; i++) {
 			if (this.isSelectedIndex(i) && (i < count)) {
-				temp[n++] = this.listModel().getElementAt(i);
+				temp[n++] = this.getListModel().getElementAt(i);
 			}
 		}
 		if (n == maxSize) {
@@ -192,7 +192,7 @@ public class ObjectListSelectionModel
 		int maxSize = (max - min) + 1;
 		int[] temp = new int[maxSize];
 		int n = 0;
-		int count = this.listModel().getSize();
+		int count = this.getListModel().getSize();
 		for (int i = min; i <= max; i++) {
 			if (this.isSelectedIndex(i) && (i < count)) {
 				temp[n++] = i;
@@ -292,7 +292,7 @@ public class ObjectListSelectionModel
 	 */
 	public void removeSelectedValues(Iterator<?> objects) {
 		this.setValueIsAdjusting(true);
-		ListModel lm = this.listModel();
+		ListModel lm = this.getListModel();
 		int lmSize = lm.getSize();
 		while (objects.hasNext()) {
 			int index = this.indexOf(objects.next(), lm, lmSize);
@@ -326,7 +326,7 @@ public class ObjectListSelectionModel
 		if (index == -1) {
 			return null;
 		}
-		return this.listModel().getElementAt(index);
+		return this.getListModel().getElementAt(index);
 	}
 
 	/**
@@ -345,7 +345,7 @@ public class ObjectListSelectionModel
 		if (index == -1) {
 			return null;
 		}
-		return this.listModel().getElementAt(index);
+		return this.getListModel().getElementAt(index);
 	}
 
 	/**
@@ -364,7 +364,7 @@ public class ObjectListSelectionModel
 		if (index == -1) {
 			return null;
 		}
-		return this.listModel().getElementAt(index);
+		return this.getListModel().getElementAt(index);
 	}
 
 	/**
@@ -376,7 +376,7 @@ public class ObjectListSelectionModel
 		if (index == -1) {
 			return null;
 		}
-		return this.listModel().getElementAt(index);
+		return this.getListModel().getElementAt(index);
 	}
 
 	/**
@@ -391,7 +391,7 @@ public class ObjectListSelectionModel
 	 * without wrapping the actions in "adjusting" events.
 	 */
 	private void addSelectedValuesInternal(Iterator<?> objects) {
-		ListModel lm = this.listModel();
+		ListModel lm = this.getListModel();
 		int listModelSize = lm.getSize();
 		while (objects.hasNext()) {
 			int index = this.indexOf(objects.next(), lm, listModelSize);
@@ -404,7 +404,7 @@ public class ObjectListSelectionModel
 	 * Return -1 if the object is not in the list model.
 	 */
 	private int indexOf(Object object) {
-		ListModel lm = this.listModel();
+		ListModel lm = this.getListModel();
 		return this.indexOf(object, lm, lm.getSize());
 	}
 
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 f72396faef..2eb4b4dd0f 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
@@ -192,7 +192,7 @@ public abstract class PrimitiveListTreeModel
 		}
 
 		public void itemsAdded(ListChangeEvent event) {
-			int i = event.index();
+			int i = event.getIndex();
 			for (ListIterator<?> stream = event.items(); stream.hasNext(); ) {
 				PrimitiveListTreeModel.this.insertPrimitive(i++, stream.next());
 			}
@@ -200,23 +200,23 @@ public abstract class PrimitiveListTreeModel
 
 		public void itemsRemoved(ListChangeEvent event) {
 			for (int i = 0; i < event.itemsSize(); i++) {
-				PrimitiveListTreeModel.this.removeNode(event.index());
+				PrimitiveListTreeModel.this.removeNode(event.getIndex());
 			}
 		}
 
 		public void itemsReplaced(ListChangeEvent event) {
-			int i = event.index();
+			int i = event.getIndex();
 			for (ListIterator<?> stream = event.items(); stream.hasNext(); ) {
 				PrimitiveListTreeModel.this.replacePrimitive(i++, stream.next());
 			}
 		}
 
 		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()));
+			ArrayList<MutableTreeNode> temp = new ArrayList<MutableTreeNode>(event.getMoveLength());
+			for (int i = 0; i < event.getMoveLength(); i++) {
+				temp.add(PrimitiveListTreeModel.this.removeNode(event.getSourceIndex()));
 			}
-			int i = event.targetIndex();
+			int i = event.getTargetIndex();
 			for (MutableTreeNode node : temp) {
 				PrimitiveListTreeModel.this.insertPrimitive(i++, node);
 			}
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 2fc2f7d609..6cd893d878 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
@@ -174,7 +174,7 @@ public class SpinnerModelAdapter
 	 * Synchronize the delegate model accordingly.
 	 */
 	protected void valueChanged(PropertyChangeEvent event) {
-		this.synchronizeDelegate(event.newValue());
+		this.synchronizeDelegate(event.getNewValue());
 	}
 
 	/**
@@ -190,7 +190,7 @@ public class SpinnerModelAdapter
 
 	protected void engageValueHolder() {
 		this.valueHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.valueListener);
-		this.synchronizeDelegate(this.valueHolder.value());
+		this.synchronizeDelegate(this.valueHolder.getValue());
 	}
 
 	protected void disengageValueHolder() {
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 580d627730..8196118331 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
@@ -124,16 +124,16 @@ public class TableModelAdapter<E>
 	protected ListChangeListener buildListChangeListener_() {
 		return new ListChangeListener() {
 			public void itemsAdded(ListChangeEvent event) {
-				TableModelAdapter.this.addRows(event.index(), event.itemsSize(), this.items(event));
+				TableModelAdapter.this.addRows(event.getIndex(), event.itemsSize(), this.items(event));
 			}
 			public void itemsRemoved(ListChangeEvent event) {
-				TableModelAdapter.this.removeRows(event.index(), event.itemsSize());
+				TableModelAdapter.this.removeRows(event.getIndex(), event.itemsSize());
 			}
 			public void itemsReplaced(ListChangeEvent event) {
-				TableModelAdapter.this.replaceRows(event.index(), this.items(event));
+				TableModelAdapter.this.replaceRows(event.getIndex(), this.items(event));
 			}
 			public void itemsMoved(ListChangeEvent event) {
-				TableModelAdapter.this.moveRows(event.targetIndex(), event.sourceIndex(), event.moveLength());
+				TableModelAdapter.this.moveRows(event.getTargetIndex(), event.getSourceIndex(), event.getMoveLength());
 			}
 			public void listCleared(ListChangeEvent event) {
 				TableModelAdapter.this.clearTable();
@@ -201,7 +201,7 @@ public class TableModelAdapter<E>
 
 	public Object getValueAt(int rowIndex, int columnIndex) {
 		WritablePropertyValueModel<Object>[] row = this.rows.get(rowIndex);
-		return row[columnIndex].value();
+		return row[columnIndex].getValue();
 	}
 
 	@Override
@@ -238,7 +238,7 @@ public class TableModelAdapter<E>
 	/**
 	 * Return the underlying list model.
 	 */
-	public ListValueModel<? extends E> model() {
+	public ListValueModel<? extends E> getModel() {
 		return this.listHolder;
 	}
 
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 750e52fc92..4673babc36 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
@@ -180,7 +180,7 @@ public class ToggleButtonModelAdapter
 		return this.listenerList.getListenerCount() == 0;
 	}
 
-	protected boolean defaultValue() {
+	protected boolean getDefaultValue() {
 		return this.defaultValue;
 	}
 
@@ -193,7 +193,7 @@ public class ToggleButtonModelAdapter
 	 */
 	protected void setSelected(Boolean value) {
 		if (value == null) {
-			this.setSelected(this.defaultValue());
+			this.setSelected(this.getDefaultValue());
 		} else {
 			this.setSelected(value.booleanValue());
 		}
@@ -203,12 +203,12 @@ public class ToggleButtonModelAdapter
 	 * The underlying model has changed - synchronize accordingly.
 	 */
 	protected void booleanChanged(PropertyChangeEvent event) {
-		this.setSelected((Boolean) event.newValue());
+		this.setSelected((Boolean) event.getNewValue());
 	}
 
 	protected void engageModel() {
 		this.booleanHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.booleanChangeListener);
-		this.setSelected(this.booleanHolder.value());
+		this.setSelected(this.booleanHolder.getValue());
 	}
 
 	protected void disengageModel() {
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 219035f195..0d3ea8a683 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
@@ -278,7 +278,7 @@ public class TreeModelAdapter<T>
 	 */
 	private void engageModel() {
 		this.rootHolder.addPropertyChangeListener(PropertyValueModel.VALUE, this.rootListener);
-		this.root = this.rootHolder.value();
+		this.root = this.rootHolder.getValue();
 		if (this.root == null) {
 			throw new NullPointerException();	// the root cannot be null while we have listeners
 		}
@@ -318,7 +318,7 @@ public class TreeModelAdapter<T>
 	 * non-root nodes.
 	 */
 	void rootChanged() {
-		TreeNodeValueModel<T> newRoot = this.rootHolder.value();
+		TreeNodeValueModel<T> newRoot = this.rootHolder.getValue();
 		if (newRoot == null) {
 			throw new NullPointerException();	// the root cannot be null while we have listeners
 		}
@@ -596,7 +596,7 @@ public class TreeModelAdapter<T>
 		 */
 		@Override
 		int childrenStartIndex() {
-			return this.event.index();
+			return this.event.getIndex();
 		}
 
 		/**
@@ -630,7 +630,7 @@ public class TreeModelAdapter<T>
 		 * Remove the old nodes and add the new ones.
 		 */
 		void moveChildren() {
-			TreeModelAdapter.this.moveChildren(this.parent(), this.event.targetIndex(), this.event.sourceIndex(), this.event.moveLength());
+			TreeModelAdapter.this.moveChildren(this.parent(), this.event.getTargetIndex(), this.event.getSourceIndex(), this.event.getMoveLength());
 		}
 
 		/**
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ChangeEvent.java
index 10606dc959..a794045b7a 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ChangeEvent.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ChangeEvent.java
@@ -49,7 +49,7 @@ public abstract class ChangeEvent extends EventObject {
 	 * Return the name of the aspect of the source that changed.
 	 * May be null if inappropriate.
 	 */
-	public abstract String aspectName();
+	public abstract String getAspectName();
 
 	/**
 	 * Return a copy of the event with the specified source
@@ -59,7 +59,7 @@ public abstract class ChangeEvent extends EventObject {
 
 	@Override
 	public String toString() {
-		return StringTools.buildToStringFor(this, this.aspectName());
+		return StringTools.buildToStringFor(this, this.getAspectName());
 	}
 
 }
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/CollectionChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/CollectionChangeEvent.java
index 68ff828cc0..fbbad13412 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/CollectionChangeEvent.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/CollectionChangeEvent.java
@@ -88,12 +88,12 @@ public class CollectionChangeEvent extends ChangeEvent {
 	/**
 	 * Return the programmatic name of the collection that was changed.
 	 */
-	public String collectionName() {
+	public String getCollectionName() {
 		return this.collectionName;
 	}
 
 	@Override
-	public String aspectName() {
+	public String getAspectName() {
 		return this.collectionName;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ListChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ListChangeEvent.java
index 629c637a34..c1eff08e04 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ListChangeEvent.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/ListChangeEvent.java
@@ -155,12 +155,12 @@ public class ListChangeEvent extends ChangeEvent {
 	/**
 	 * Return the programmatic name of the list that was changed.
 	 */
-	public String listName() {
+	public String getListName() {
 		return this.listName;
 	}
 
 	@Override
-	public String aspectName() {
+	public String getAspectName() {
 		return this.listName;
 	}
 
@@ -170,7 +170,7 @@ public class ListChangeEvent extends ChangeEvent {
 	 * In the case of "moved" items, this will be the "target" index.
 	 * May be -1 if inappropriate or unknown.
 	 */
-	public int index() {
+	public int getIndex() {
 		return this.index;
 	}
 
@@ -211,7 +211,7 @@ public class ListChangeEvent extends ChangeEvent {
 	 * In the case of "moved" items, this will be the "target" index.
 	 * May be -1 if inappropriate or unknown.
 	 */
-	public int targetIndex() {
+	public int getTargetIndex() {
 		return this.index;
 	}
 
@@ -219,7 +219,7 @@ public class ListChangeEvent extends ChangeEvent {
 	 * In the case of "moved" items, this will be the "source" index.
 	 * May be -1 if inappropriate or unknown.
 	 */
-	public int sourceIndex() {
+	public int getSourceIndex() {
 		return this.sourceIndex;
 	}
 
@@ -227,7 +227,7 @@ public class ListChangeEvent extends ChangeEvent {
 	 * In the case of "moved" items, this will be the number of items moved.
 	 * May be -1 if inappropriate or unknown.
 	 */
-	public int moveLength() {
+	public int getMoveLength() {
 		return this.moveLength;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/PropertyChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/PropertyChangeEvent.java
index 9e301e4637..ee2fa2f8b2 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/PropertyChangeEvent.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/PropertyChangeEvent.java
@@ -62,26 +62,26 @@ public class PropertyChangeEvent extends ChangeEvent {
 	/**
 	 * Return the programmatic name of the property that was changed.
 	 */
-	public String propertyName() {
+	public String getPropertyName() {
 		return this.propertyName;
 	}
 
 	@Override
-	public String aspectName() {
+	public String getAspectName() {
 		return this.propertyName;
 	}
 
 	/**
 	 * Return the old value of the property.
 	 */
-	public Object oldValue() {
+	public Object getOldValue() {
 		return this.oldValue;
 	}
 
 	/**
 	 * Return the new value of the property.
 	 */
-	public Object newValue() {
+	public Object getNewValue() {
 		return this.newValue;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/StateChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/StateChangeEvent.java
index b6b9b4ba0f..52e3690e69 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/StateChangeEvent.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/StateChangeEvent.java
@@ -42,7 +42,7 @@ public class StateChangeEvent extends ChangeEvent {
 	// ********** standard state **********
 
 	@Override
-	public String aspectName() {
+	public String getAspectName() {
 		return null;  // the point of the event is that the name is unknown...
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/TreeChangeEvent.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/TreeChangeEvent.java
index 6719523a0b..2272020490 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/TreeChangeEvent.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/event/TreeChangeEvent.java
@@ -75,12 +75,12 @@ public class TreeChangeEvent extends ChangeEvent {
 	/**
 	 * Return the programmatic name of the tree that was changed.
 	 */
-	public String treeName() {
+	public String getTreeName() {
 		return this.treeName;
 	}
 
 	@Override
-	public String aspectName() {
+	public String getAspectName() {
 		return this.treeName;
 	}
 
@@ -88,7 +88,7 @@ public class TreeChangeEvent extends ChangeEvent {
 	 * Return the path to the part of the tree that was changed.
 	 * May be empty, if not known.
 	 */
-	public Object[] path() {
+	public Object[] getPath() {
 		return this.path;
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/PropertyValueModel.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/PropertyValueModel.java
index 39579083b0..82ee3c0096 100644
--- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/PropertyValueModel.java
+++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/model/value/PropertyValueModel.java
@@ -28,7 +28,7 @@ public interface PropertyValueModel<T>
 	/**
 	 * Return the property's value.
 	 */
-	T value();
+	T getValue();
 		String VALUE = "value";
 
 }