improve support for boolean attributes

48 files changed, 488 insertions, 218 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryType.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryType.java
index d3d1a16029..d3d8c9c19f 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryType.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/binary/BinaryType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -242,7 +242,7 @@ final class BinaryType
 	}
 	
 	protected Iterable<JavaResourceMethod> getConstructors() {
-		return IterableTools.filter(this.getMethods(), JavaResourceMethod.IS_CONSTRUCTOR);
+		return IterableTools.filter(this.getMethods(), JavaResourceMethod.CONSTRUCTOR_PREDICATE);
 	}
 	
 	
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java
index 48606a83c5..8798764af1 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/internal/resource/java/source/SourceType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -325,7 +325,7 @@ final class SourceType
 	}
 
 	protected Iterable<JavaResourceMethod> getConstructors() {
-		return IterableTools.filter(this.getMethods(), JavaResourceMethod.IS_CONSTRUCTOR);
+		return IterableTools.filter(this.getMethods(), JavaResourceMethod.CONSTRUCTOR_PREDICATE);
 	}
 	
 
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceAnnotatedElement.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceAnnotatedElement.java
index c6e6d5270b..fd7cd9254a 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceAnnotatedElement.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceAnnotatedElement.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -180,8 +180,8 @@ public interface JavaResourceAnnotatedElement
 	 * annotations.
 	 */
 	boolean isAnnotated();
-	Predicate<JavaResourceAnnotatedElement> IS_ANNOTATED = new IsAnnotated();
-	class IsAnnotated
+	Predicate<JavaResourceAnnotatedElement> ANNOTATED_PREDICATE = new AnnotatedPredicate();
+	class AnnotatedPredicate
 		extends PredicateAdapter<JavaResourceAnnotatedElement>
 	{
 		@Override
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceField.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceField.java
index 64af7e8d0a..85981acb80 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceField.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceField.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -49,27 +49,25 @@ public interface JavaResourceField
 	/**
 	 * Field is (annotated) or (non-static and non-transient);
 	 */
-	@SuppressWarnings("unchecked")
 	Predicate<JavaResourceField> IS_RELEVANT_FOR_FIELD_ACCESS = 
 			PredicateTools.or(
-				IS_ANNOTATED,
+				ANNOTATED_PREDICATE,
 				PredicateTools.and(
-						PredicateTools.not(IS_TRANSIENT),
-						PredicateTools.not(IS_STATIC)
+						PredicateTools.not(TRANSIENT_PREDICATE),
+						PredicateTools.not(STATIC_PREDICATE)
 				)
 			);
 
 	/**
 	 * Field is (annotated) or (public and non-static and non-transient);
 	 */
-	@SuppressWarnings("unchecked")
 	Predicate<JavaResourceField> IS_RELEVANT_FOR_PUBLIC_MEMBER_ACCESS = 
 			PredicateTools.or(
-				IS_ANNOTATED,
+				ANNOTATED_PREDICATE,
 				PredicateTools.and(
-						IS_PUBLIC,
-						PredicateTools.not(IS_TRANSIENT),
-						PredicateTools.not(IS_STATIC)
+						PUBLIC_PREDICATE,
+						PredicateTools.not(TRANSIENT_PREDICATE),
+						PredicateTools.not(STATIC_PREDICATE)
 				)
 			);
 }
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMember.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMember.java
index 80836cdede..422ddd4b04 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMember.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMember.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -58,8 +58,8 @@ public interface JavaResourceMember
 	 */
 	boolean isFinal();
 		String FINAL_PROPERTY = "final"; //$NON-NLS-1$
-	Predicate<JavaResourceMember> IS_FINAL = new IsFinal();
-	class IsFinal
+	Predicate<JavaResourceMember> FINAL_PREDICATE = new FinalPredicate();
+	class FinalPredicate
 		extends PredicateAdapter<JavaResourceMember>
 	{
 		@Override
@@ -70,8 +70,8 @@ public interface JavaResourceMember
 
 	boolean isTransient();
 		String TRANSIENT_PROPERTY = "transient"; //$NON-NLS-1$
-	Predicate<JavaResourceMember> IS_TRANSIENT = new IsTransient();
-	class IsTransient
+	Predicate<JavaResourceMember> TRANSIENT_PREDICATE = new TransientPredicate();
+	class TransientPredicate
 		extends PredicateAdapter<JavaResourceMember>
 	{
 		@Override
@@ -82,8 +82,8 @@ public interface JavaResourceMember
 
 	boolean isPublic();
 		String PUBLIC_PROPERTY = "public"; //$NON-NLS-1$
-	Predicate<JavaResourceMember> IS_PUBLIC = new IsPublic();
-	class IsPublic
+	Predicate<JavaResourceMember> PUBLIC_PREDICATE = new PublicPredicate();
+	class PublicPredicate
 		extends PredicateAdapter<JavaResourceMember>
 	{
 		@Override
@@ -94,8 +94,8 @@ public interface JavaResourceMember
 
 	boolean isStatic();
 		String STATIC_PROPERTY = "static"; //$NON-NLS-1$
-	Predicate<JavaResourceMember> IS_STATIC = new IsStatic();
-	class IsStatic
+	Predicate<JavaResourceMember> STATIC_PREDICATE = new StaticPredicate();
+	class StaticPredicate
 		extends PredicateAdapter<JavaResourceMember>
 	{
 		@Override
@@ -106,8 +106,8 @@ public interface JavaResourceMember
 
 	boolean isProtected();
 		String PROTECTED_PROPERTY = "protected"; //$NON-NLS-1$
-	Predicate<JavaResourceMember> IS_PROTECTED = new IsProtected();
-	class IsProtected
+	Predicate<JavaResourceMember> PROTECTED_PREDICATE = new ProtectedPredicate();
+	class ProtectedPredicate
 		extends PredicateAdapter<JavaResourceMember>
 	{
 		@Override
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMethod.java b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMethod.java
index 39fb357850..7891a93c1c 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMethod.java
+++ b/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/java/JavaResourceMethod.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -58,8 +58,8 @@ public interface JavaResourceMethod
 	String CONSTRUCTOR_PROPERTY = "constructor"; //$NON-NLS-1$
 	
 	boolean isConstructor();
-	Predicate<JavaResourceMethod> IS_CONSTRUCTOR = new IsConstructor();
-	class IsConstructor
+	Predicate<JavaResourceMethod> CONSTRUCTOR_PREDICATE = new ConstructorPredicate();
+	class ConstructorPredicate
 		extends PredicateAdapter<JavaResourceMethod>
 	{
 		@Override
@@ -84,9 +84,9 @@ public interface JavaResourceMethod
 	/**
 	 * Return whether the method is a standard property "getter" method.
 	 */
-	Predicate<JavaResourceMethod> IS_PROPERTY_GETTER = new IsPropertyGetter();
+	Predicate<JavaResourceMethod> PROPERTY_GETTER_PREDICATE = new PropertyGetterPredicate();
 	@SuppressWarnings("nls")
-	class IsPropertyGetter
+	class PropertyGetterPredicate
 		extends PredicateAdapter<JavaResourceMethod>
 	{
 		@Override
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/closure/BiClosureTools.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/closure/BiClosureTools.java
index b0d2e342c2..4cae54a1bd 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/closure/BiClosureTools.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/closure/BiClosureTools.java
@@ -28,7 +28,7 @@ public final class BiClosureTools {
 
 	/**
 	 * Adapt the specified {@link Command} to the {@link BiClosure} interface.
-	 * The closure's argument is ignored.
+	 * The closure's arguments are ignored.
 	 * 
 	 * @param <A1> the type of the first object passed to the closure
 	 * @param <A2> the type of the second object passed to the closure
@@ -39,7 +39,7 @@ public final class BiClosureTools {
 
 	/**
 	 * Adapt the specified {@link InterruptibleCommand} to the {@link InterruptibleBiClosure} interface.
-	 * The closure's argument is ignored.
+	 * The closure's arguments are ignored.
 	 * 
 	 * @param <A1> the type of the first object passed to the closure
 	 * @param <A2> the type of the second object passed to the closure
@@ -50,7 +50,7 @@ public final class BiClosureTools {
 
 	/**
 	 * Adapt the specified {@link Factory} to the {@link BiClosure} interface.
-	 * The closure's argument and the factory's output are ignored. This really
+	 * The closure's arguments and the factory's output are ignored. This really
 	 * only useful for a factory that has side-effects.
 	 * 
 	 * @param <A1> the type of the first object passed to the closure
@@ -62,7 +62,7 @@ public final class BiClosureTools {
 
 	/**
 	 * Adapt the specified {@link InterruptibleFactory} to the {@link InterruptibleBiClosure} interface.
-	 * The closure's argument and the factory's output are ignored. This really
+	 * The closure's arguments and the factory's output are ignored. This really
 	 * only useful for a factory that has side-effects.
 	 * 
 	 * @param <A1> the type of the first object passed to the closure
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/BooleanSetClosureAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/BooleanSetClosureAdapter.java
new file mode 100644
index 0000000000..d1c2156d38
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/BooleanSetClosureAdapter.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.internal.model;
+
+import org.eclipse.jpt.common.utility.internal.ObjectTools;
+import org.eclipse.jpt.common.utility.model.BooleanSetClosure;
+
+/**
+ * Convenience boolean "set" closure that does nothing.
+ * 
+ * @param <M> the type of the model (i.e. first object) passed to the closure
+ */
+public class BooleanSetClosureAdapter<M>
+	implements BooleanSetClosure<M>
+{
+	public void execute(M model, boolean value) {
+		// NOP
+	}
+
+	@Override
+	public String toString() {
+		return ObjectTools.toString(this);
+	}
+}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
index 262396e033..a0510365b0 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
@@ -19,6 +19,7 @@ import org.eclipse.jpt.common.utility.internal.closure.ClosureTools;
 import org.eclipse.jpt.common.utility.internal.predicate.PredicateTools;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
+import org.eclipse.jpt.common.utility.model.BooleanSetClosure;
 import org.eclipse.jpt.common.utility.model.Model;
 import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -887,6 +888,47 @@ public final class PropertyValueModelTools {
 	}
 
 	/**
+	 * Construct a "set" bi-closure that wraps a boolean "set" closure and
+	 * forwards its arguments to it, converting the {@link Boolean} to
+	 * a <code>boolean</code>.
+	 * 
+	 * @param <S> the type of the "set" closure's "target" object
+	 */
+	public static <S> BiClosure<S, Boolean> booleanSetBiClosureAdapter(BooleanSetClosure<? super S> closure) {
+		return new BooleanSetBiClosureAdapter<>(closure);
+	}
+
+	/**
+	 * "Set" bi-closure that wraps a boolean "set" closure and
+	 * forwards its arguments to it, converting the {@link Boolean} to
+	 * a <code>boolean</code>.
+	 * 
+	 * @param <S> the type of the "set" closure's "target" object
+	 */
+	public static final class BooleanSetBiClosureAdapter<S>
+		implements BiClosure<S, Boolean>
+	{
+		private final BooleanSetClosure<? super S> closure;
+		
+		public BooleanSetBiClosureAdapter(BooleanSetClosure<? super S> closure) {
+			super();
+			if (closure == null) {
+				throw new NullPointerException();
+			}
+			this.closure = closure;
+		}
+
+		public void execute(S subject, Boolean value) {
+			this.closure.execute(subject, value.booleanValue());
+		}
+
+		@Override
+		public String toString() {
+			return ObjectTools.toString(this, this.closure);
+		}
+	}
+
+	/**
 	 * Wrap a "set" closure that takes an argument of type <code>X</code>
 	 * and allow it to be used as a "set" closure that takes an argument of
 	 * type <code>A2</code>, a super type of <code>X</code>;
@@ -1081,6 +1123,42 @@ public final class PropertyValueModelTools {
 	// ********** aspect adapters **********
 
 	/**
+	 * Construct a boolean model property aspect adapter for the
+	 * specified subject, aspect name, and predicate.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate will <em>never</em> be passed a <code>null</code> subject.
+	 * Instead, a <code>null</code> subject will be transformed into a <code>null</code>
+	 * <code>Boolean</code> value.
+	 * 
+	 * @param <S> the type of the subject
+	 */
+	public static <S extends Model> PropertyValueModel<Boolean> modelAspectAdapter(
+			S subject,
+			String aspectName,
+			Predicate<? super S> predicate
+	) {
+		return modelAspectAdapter(subject, aspectName, TransformerTools.adapt(predicate));
+	}
+
+	/**
+	 * Construct a boolean model property aspect adapter for the
+	 * specified subject, aspect name, and predicate.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate must be able to handle a <code>null</code> subject.
+	 * 
+	 * @param <S> the type of the subject
+	 */
+	public static <S extends Model> PropertyValueModel<Boolean> modelAspectAdapter_(
+			S subject,
+			String aspectName,
+			Predicate<? super S> predicate
+	) {
+		return modelAspectAdapter_(subject, aspectName, TransformerTools.adapt(predicate));
+	}
+
+	/**
 	 * Construct a model property aspect adapter for the
 	 * specified subject, aspect name, and transformer.
 	 * <p>
@@ -1118,6 +1196,44 @@ public final class PropertyValueModelTools {
 	}
 
 	/**
+	 * Construct a boolean model property aspect adapter for the
+	 * specified subject model, aspect name, and predicate.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate will <em>never</em> be passed a <code>null</code> subject.
+	 * Instead, a <code>null</code> subject will be transformed into a <code>null</code>
+	 * <code>Boolean</code> value.
+	 * 
+	 * @param <S> the type of the subject
+	 * @param <SM> the type of the subject model
+	 */
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> modelAspectAdapter(
+			SM subjectModel,
+			String aspectName,
+			Predicate<? super S> predicate
+	) {
+		return modelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(predicate));
+	}
+
+	/**
+	 * Construct a boolean model property aspect adapter for the
+	 * specified subject model, aspect name, and predicate.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate must be able to handle a <code>null</code> subject.
+	 * 
+	 * @param <S> the type of the subject
+	 * @param <SM> the type of the subject model
+	 */
+	public static <S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<Boolean> modelAspectAdapter_(
+			SM subjectModel,
+			String aspectName,
+			Predicate<? super S> predicate
+	) {
+		return modelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(predicate));
+	}
+
+	/**
 	 * Construct a model property aspect adapter for the
 	 * specified subject model, aspect name, and transformer.
 	 * <p>
@@ -1229,6 +1345,48 @@ public final class PropertyValueModelTools {
 	// ********** modifiable aspect adapters **********
 
 	/**
+	 * Construct a boolean modifiable property aspect adapter for the
+	 * specified subject, aspect name, predicate, and closure.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate will <em>never</em> be passed a <code>null</code> subject.
+	 * Instead, a <code>null</code> subject will be transformed into a <code>null</code>
+	 * <code>Boolean</code> value.
+	 * Likewise, if the subject is <code>null</code>, the specified closure will
+	 * not be executed.
+	 * 
+	 * @param <S> the type of the subject
+	 */
+	public static <S extends Model> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter(
+			S subject,
+			String aspectName,
+			Predicate<? super S> getPredicate,
+			BooleanSetClosure<? super S> setClosure
+	) {
+		return modifiableModelAspectAdapter(subject, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+	}
+
+	/**
+	 * Construct a boolean modifiable property aspect adapter for the
+	 * specified subject, aspect name, predicate, and closure.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate must be able to handle a <code>null</code> subject.
+	 * Likewise, the specified closure must be able to handle a <code>null</code>
+	 * subject (i.e. first argument).
+	 * 
+	 * @param <S> the type of the subject
+	 */
+	public static <S extends Model> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter_(
+			S subject,
+			String aspectName,
+			Predicate<? super S> getPredicate,
+			BooleanSetClosure<? super S> setClosure
+	) {
+		return modifiableModelAspectAdapter_(subject, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+	}
+
+	/**
 	 * Construct a modifiable property aspect adapter for the
 	 * specified subject, aspect name, transformer, and closure.
 	 * <p>
@@ -1272,6 +1430,50 @@ public final class PropertyValueModelTools {
 	}
 
 	/**
+	 * Construct a boolean modifiable property aspect adapter for the
+	 * specified subject model, aspect name, predicate, and closure.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate will <em>never</em> be passed a <code>null</code> subject.
+	 * Instead, a <code>null</code> subject will be transformed into a <code>null</code>
+	 * <code>Boolean</code> value.
+	 * Likewise, if the subject is <code>null</code>, the specified closure will
+	 * not be executed.
+	 * 
+	 * @param <S> the type of the subject
+	 * @param <SM> the type of the subject model
+	 */
+	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter(
+			SM subjectModel,
+			String aspectName,
+			Predicate<? super S> getPredicate,
+			BooleanSetClosure<? super S> setClosure
+	) {
+		return modifiableModelAspectAdapter(subjectModel, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+	}
+
+	/**
+	 * Construct a boolean modifiable property aspect adapter for the
+	 * specified subject model, aspect name, predicate, and closure.
+	 * <p>
+	 * <strong>NB:</strong>
+	 * The specified predicate must be able to handle a <code>null</code> subject.
+	 * Likewise, the specified closure must be able to handle a <code>null</code>
+	 * subject (i.e. first argument).
+	 * 
+	 * @param <S> the type of the subject
+	 * @param <SM> the type of the subject model
+	 */
+	public static <S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<Boolean> modifiableModelAspectAdapter_(
+			SM subjectModel,
+			String aspectName,
+			Predicate<? super S> getPredicate,
+			BooleanSetClosure<? super S> setClosure
+	) {
+		return modifiableModelAspectAdapter_(subjectModel, aspectName, TransformerTools.adapt(getPredicate), booleanSetBiClosureAdapter(setClosure));
+	}
+
+	/**
 	 * Construct a modifiable property aspect adapter for the
 	 * specified subject model, aspect name, transformer, and closure.
 	 * <p>
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/node/AbstractNode.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/node/AbstractNode.java
index a308608a04..ea7ede5d12 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/node/AbstractNode.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/node/AbstractNode.java
@@ -642,11 +642,11 @@ public abstract class AbstractNode
 	 * Only really used for testing and debugging.
 	 */
 	public final Iterator<Node> allDirtyNodes() {
-		return IteratorTools.filter(this.allNodes(), IS_DIRTY);
+		return IteratorTools.filter(this.allNodes(), DIRTY_PREDICATE);
 	}
 
-	public static final Predicate<Node> IS_DIRTY = new IsDirty();
-	public static class IsDirty
+	public static final Predicate<Node> DIRTY_PREDICATE = new DirtyPredicate();
+	public static class DirtyPredicate
 		extends PredicateAdapter<Node>
 	{
 		@Override
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/model/BooleanSetClosure.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/model/BooleanSetClosure.java
new file mode 100644
index 0000000000..4a16ff275c
--- /dev/null
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/model/BooleanSetClosure.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
+ * 
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.common.utility.model;
+
+/**
+ * Simple interface for implementing a boolean "set" command that takes two
+ * arguments, the model and the new value of the model's boolean attribute.
+ * The expectation is the closure will have side effects.
+ * <p>
+ * Provisional API: This interface is part of an interim API that is still
+ * under development and expected to change significantly before reaching
+ * stability. It is available at this early stage to solicit feedback from
+ * pioneering adopters on the understanding that any code that uses this API
+ * will almost certainly be broken (repeatedly) as the API evolves.
+ * 
+ * @param <M> the type of the first object passed to the command
+ */
+public interface BooleanSetClosure<M> {
+
+	/**
+	 * The intent of this method is to set the value of the specified
+	 * model's attribute to the specified boolean value.
+	 */
+	void execute(M model, boolean value);
+}
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
index bc954891d9..60bc464796 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
@@ -18,12 +18,14 @@ import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools;
 import org.eclipse.jpt.common.utility.closure.BiClosure;
 import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
 import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
+import org.eclipse.jpt.common.utility.internal.model.BooleanSetClosureAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
+import org.eclipse.jpt.common.utility.model.BooleanSetClosure;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
+import org.eclipse.jpt.common.utility.predicate.Predicate;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -71,7 +73,7 @@ public class CheckBoxModelBindingUITest
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				subjectModel,
 				TestModel.FLAG1_PROPERTY,
-				TestModel.FLAG1_TRANSFORMER,
+				TestModel.FLAG1_PREDICATE,
 				TestModel.SET_FLAG1_CLOSURE
 			);
 	}
@@ -80,7 +82,7 @@ public class CheckBoxModelBindingUITest
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				subjectModel,
 				TestModel.FLAG2_PROPERTY,
-				TestModel.FLAG2_TRANSFORMER,
+				TestModel.FLAG2_PREDICATE,
 				TestModel.SET_FLAG2_CLOSURE
 			);
 	}
@@ -89,7 +91,7 @@ public class CheckBoxModelBindingUITest
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				subjectModel,
 				TestModel.NOT_FLAG2_PROPERTY,
-				TestModel.NOT_FLAG2_TRANSFORMER,
+				TestModel.NOT_FLAG2_PREDICATE,
 				TestModel.SET_NOT_FLAG2_CLOSURE
 			);
 	}
@@ -267,62 +269,62 @@ public class CheckBoxModelBindingUITest
 	{
 		private boolean flag1;
 			public static final String FLAG1_PROPERTY = "flag1";
-			public static final Transformer<TestModel, Boolean> FLAG1_TRANSFORMER = new Flag1Transformer();
-			public static final class Flag1Transformer
-				extends TransformerAdapter<TestModel, Boolean>
+			public static final Predicate<TestModel> FLAG1_PREDICATE = new Flag1Predicate();
+			public static final class Flag1Predicate
+				extends PredicateAdapter<TestModel>
 			{
 				@Override
-				public Boolean transform(TestModel model) {
-					return Boolean.valueOf(model.isFlag1());
+				public boolean evaluate(TestModel model) {
+					return model.isFlag1();
 				}
 			}
-			public static final BiClosure<TestModel, Boolean> SET_FLAG1_CLOSURE = new SetFlag1Closure();
+			public static final BooleanSetClosure<TestModel> SET_FLAG1_CLOSURE = new SetFlag1Closure();
 			public static final class SetFlag1Closure
-				extends BiClosureAdapter<TestModel, Boolean>
+				extends BooleanSetClosureAdapter<TestModel>
 			{
 				@Override
-				public void execute(TestModel model, Boolean flag1) {
-					model.setFlag1(flag1.booleanValue());
+				public void execute(TestModel model, boolean value) {
+					model.setFlag1(value);
 				}
 			}
 		private boolean flag2;
 			public static final String FLAG2_PROPERTY = "flag2";
-			public static final Transformer<TestModel, Boolean> FLAG2_TRANSFORMER = new Flag2Transformer();
-			public static final class Flag2Transformer
-				extends TransformerAdapter<TestModel, Boolean>
+			public static final Predicate<TestModel> FLAG2_PREDICATE = new Flag2Predicate();
+			public static final class Flag2Predicate
+				extends PredicateAdapter<TestModel>
 			{
 				@Override
-				public Boolean transform(TestModel model) {
-					return Boolean.valueOf(model.isFlag2());
+				public boolean evaluate(TestModel model) {
+					return model.isFlag2();
 				}
 			}
-			public static final BiClosure<TestModel, Boolean> SET_FLAG2_CLOSURE = new SetFlag2Closure();
+			public static final BooleanSetClosure<TestModel> SET_FLAG2_CLOSURE = new SetFlag2Closure();
 			public static final class SetFlag2Closure
-				extends BiClosureAdapter<TestModel, Boolean>
+				extends BooleanSetClosureAdapter<TestModel>
 			{
 				@Override
-				public void execute(TestModel model, Boolean flag2) {
-					model.setFlag2(flag2.booleanValue());
+				public void execute(TestModel model, boolean value) {
+					model.setFlag2(value);
 				}
 			}
 		private boolean notFlag2;
 			public static final String NOT_FLAG2_PROPERTY = "notFlag2";
-			public static final Transformer<TestModel, Boolean> NOT_FLAG2_TRANSFORMER = new NotFlag2Transformer();
-			public static final class NotFlag2Transformer
-				extends TransformerAdapter<TestModel, Boolean>
+			public static final Predicate<TestModel> NOT_FLAG2_PREDICATE = new NotFlag2Predicate();
+			public static final class NotFlag2Predicate
+				extends PredicateAdapter<TestModel>
 			{
 				@Override
-				public Boolean transform(TestModel model) {
-					return Boolean.valueOf(model.isNotFlag2());
+				public boolean evaluate(TestModel model) {
+					return model.isNotFlag2();
 				}
 			}
-			public static final BiClosure<TestModel, Boolean> SET_NOT_FLAG2_CLOSURE = new SetNotFlag2Closure();
+			public static final BooleanSetClosure<TestModel> SET_NOT_FLAG2_CLOSURE = new SetNotFlag2Closure();
 			public static final class SetNotFlag2Closure
-				extends BiClosureAdapter<TestModel, Boolean>
+				extends BooleanSetClosureAdapter<TestModel>
 			{
 				@Override
-				public void execute(TestModel model, Boolean flag2) {
-					model.setNotFlag2(flag2.booleanValue());
+				public void execute(TestModel model, boolean value) {
+					model.setNotFlag2(value);
 				}
 			}
 	
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java
index 196a05b233..fc3f0f3afd 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java
@@ -26,16 +26,16 @@ import javax.swing.JCheckBox;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
-import org.eclipse.jpt.common.utility.closure.BiClosure;
-import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
 import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
+import org.eclipse.jpt.common.utility.internal.model.BooleanSetClosureAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.swing.CheckBoxModelAdapter;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
+import org.eclipse.jpt.common.utility.model.BooleanSetClosure;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
+import org.eclipse.jpt.common.utility.predicate.Predicate;
 
 /**
  * Play around with a set of check boxes.
@@ -76,7 +76,7 @@ public class CheckBoxModelAdapterUITest {
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				vm,
 				TestModel.FLAG1_PROPERTY,
-				TestModel.FLAG1_TRANSFORMER,
+				TestModel.FLAG1_PREDICATE,
 				TestModel.SET_FLAG1_CLOSURE
 			);
 	}
@@ -85,7 +85,7 @@ public class CheckBoxModelAdapterUITest {
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				vm,
 				TestModel.FLAG2_PROPERTY,
-				TestModel.FLAG2_TRANSFORMER,
+				TestModel.FLAG2_PREDICATE,
 				TestModel.SET_FLAG2_CLOSURE
 			);
 	}
@@ -94,7 +94,7 @@ public class CheckBoxModelAdapterUITest {
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				vm,
 				TestModel.NOT_FLAG2_PROPERTY,
-				TestModel.NOT_FLAG2_TRANSFORMER,
+				TestModel.NOT_FLAG2_PREDICATE,
 				TestModel.SET_NOT_FLAG2_CLOSURE
 			);
 	}
@@ -263,62 +263,62 @@ public class CheckBoxModelAdapterUITest {
 	{
 		private boolean flag1;
 			public static final String FLAG1_PROPERTY = "flag1";
-			public static final Transformer<TestModel, Boolean> FLAG1_TRANSFORMER = new Flag1Transformer();
-			public static final class Flag1Transformer
-				extends TransformerAdapter<TestModel, Boolean>
+			public static final Predicate<TestModel> FLAG1_PREDICATE = new Flag1Predicate();
+			public static final class Flag1Predicate
+				extends PredicateAdapter<TestModel>
 			{
 				@Override
-				public Boolean transform(TestModel model) {
-					return Boolean.valueOf(model.isFlag1());
+				public boolean evaluate(TestModel model) {
+					return model.isFlag1();
 				}
 			}
-			public static final BiClosure<TestModel, Boolean> SET_FLAG1_CLOSURE = new SetFlag1Closure();
+			public static final BooleanSetClosure<TestModel> SET_FLAG1_CLOSURE = new SetFlag1Closure();
 			public static final class SetFlag1Closure
-				extends BiClosureAdapter<TestModel, Boolean>
+				extends BooleanSetClosureAdapter<TestModel>
 			{
 				@Override
-				public void execute(TestModel model, Boolean flag1) {
-					model.setFlag1(flag1.booleanValue());
+				public void execute(TestModel model, boolean value) {
+					model.setFlag1(value);
 				}
 			}
 		private boolean flag2;
 			public static final String FLAG2_PROPERTY = "flag2";
-			public static final Transformer<TestModel, Boolean> FLAG2_TRANSFORMER = new Flag2Transformer();
-			public static final class Flag2Transformer
-				extends TransformerAdapter<TestModel, Boolean>
+			public static final Predicate<TestModel> FLAG2_PREDICATE = new Flag2Predicate();
+			public static final class Flag2Predicate
+				extends PredicateAdapter<TestModel>
 			{
 				@Override
-				public Boolean transform(TestModel model) {
-					return Boolean.valueOf(model.isFlag2());
+				public boolean evaluate(TestModel model) {
+					return model.isFlag2();
 				}
 			}
-			public static final BiClosure<TestModel, Boolean> SET_FLAG2_CLOSURE = new SetFlag2Closure();
+			public static final BooleanSetClosure<TestModel> SET_FLAG2_CLOSURE = new SetFlag2Closure();
 			public static final class SetFlag2Closure
-				extends BiClosureAdapter<TestModel, Boolean>
+				extends BooleanSetClosureAdapter<TestModel>
 			{
 				@Override
-				public void execute(TestModel model, Boolean flag2) {
-					model.setFlag2(flag2.booleanValue());
+				public void execute(TestModel model, boolean value) {
+					model.setFlag2(value);
 				}
 			}
 		private boolean notFlag2;
 			public static final String NOT_FLAG2_PROPERTY = "notFlag2";
-			public static final Transformer<TestModel, Boolean> NOT_FLAG2_TRANSFORMER = new NotFlag2Transformer();
-			public static final class NotFlag2Transformer
-				extends TransformerAdapter<TestModel, Boolean>
+			public static final Predicate<TestModel> NOT_FLAG2_PREDICATE = new NotFlag2Predicate();
+			public static final class NotFlag2Predicate
+				extends PredicateAdapter<TestModel>
 			{
 				@Override
-				public Boolean transform(TestModel model) {
-					return Boolean.valueOf(model.isNotFlag2());
+				public boolean evaluate(TestModel model) {
+					return model.isNotFlag2();
 				}
 			}
-			public static final BiClosure<TestModel, Boolean> SET_NOT_FLAG2_CLOSURE = new SetNotFlag2Closure();
+			public static final BooleanSetClosure<TestModel> SET_NOT_FLAG2_CLOSURE = new SetNotFlag2Closure();
 			public static final class SetNotFlag2Closure
-				extends BiClosureAdapter<TestModel, Boolean>
+				extends BooleanSetClosureAdapter<TestModel>
 			{
 				@Override
-				public void execute(TestModel model, Boolean flag2) {
-					model.setNotFlag2(flag2.booleanValue());
+				public void execute(TestModel model, boolean value) {
+					model.setNotFlag2(value);
 				}
 			}
 	
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java
index 60587e27ff..2b86ef9d7f 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java
@@ -26,16 +26,21 @@ import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
 import org.eclipse.jpt.common.utility.internal.iterator.TransformationIterator;
 import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
+import org.eclipse.jpt.common.utility.internal.model.BooleanSetClosureAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
 import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.swing.TableModelAdapter;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
+import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
+import org.eclipse.jpt.common.utility.model.BooleanSetClosure;
 import org.eclipse.jpt.common.utility.model.listener.ListChangeListener;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
 import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
+import org.eclipse.jpt.common.utility.predicate.Predicate;
 import org.eclipse.jpt.common.utility.tests.internal.TestTools;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import junit.framework.TestCase;
@@ -357,8 +362,8 @@ public class TableModelAdapterTests
 			return PropertyValueModelTools.modifiableModelAspectAdapter(
 					person,
 					Person.EVIL_PROPERTY,
-					Person.EVIL_TRANSFORMER,
-					PropertyValueModelTools.downcast(Person.SET_EVIL_CLOSURE)
+					TransformerTools.adapt(Person.EVIL_PREDICATE),
+					PropertyValueModelTools.downcast(PropertyValueModelTools.booleanSetBiClosureAdapter(Person.SET_EVIL_CLOSURE))
 				);
 		}
 	
@@ -552,22 +557,22 @@ public class TableModelAdapterTests
 			public static final String DEFAULT_EYE_COLOR = EYE_COLOR_BLUE;
 		private boolean evil;
 			public static final String EVIL_PROPERTY= "evil";
-			public static final Transformer<Person, Boolean> EVIL_TRANSFORMER = new EvilTransformer();
-			public static final class EvilTransformer
-				extends TransformerAdapter<Person, Boolean>
+			public static final Predicate<Person> EVIL_PREDICATE = new EvilPredicate();
+			public static final class EvilPredicate
+				extends PredicateAdapter<Person>
 			{
 				@Override
-				public Boolean transform(Person person) {
-					return Boolean.valueOf(person.isEvil());
+				public boolean evaluate(Person model) {
+					return model.isEvil();
 				}
 			}
-			public static final BiClosure<Person, Boolean> SET_EVIL_CLOSURE = new SetEvilClosure();
+			public static final BooleanSetClosure<Person> SET_EVIL_CLOSURE = new SetEvilClosure();
 			public static final class SetEvilClosure
-				extends BiClosureAdapter<Person, Boolean>
+				extends BooleanSetClosureAdapter<Person>
 			{
 				@Override
-				public void execute(Person person, Boolean evil) {
-					person.setEvil(evil.booleanValue());
+				public void execute(Person model, boolean value) {
+					model.setEvil(value);
 				}
 			}
 		private int rank;
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java
index 2fc32d6d19..93a248d793 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java
@@ -63,6 +63,7 @@ import org.eclipse.jpt.common.utility.internal.swing.CheckBoxTableCellRenderer;
 import org.eclipse.jpt.common.utility.internal.swing.ComboBoxTableCellRenderer;
 import org.eclipse.jpt.common.utility.internal.swing.SpinnerTableCellRenderer;
 import org.eclipse.jpt.common.utility.internal.swing.TableCellEditorAdapter;
+import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
 import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -616,8 +617,8 @@ public class TableModelAdapterUITest {
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				this.selectedPersonHolder,
 				Person.EVIL_PROPERTY,
-				Person.EVIL_TRANSFORMER,
-				PropertyValueModelTools.downcast(Person.SET_EVIL_CLOSURE)
+				TransformerTools.adapt(Person.EVIL_PREDICATE),
+				PropertyValueModelTools.downcast(PropertyValueModelTools.booleanSetBiClosureAdapter(Person.SET_EVIL_CLOSURE))
 			);
 	}
 
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
index 874e7d9592..324f06c978 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/AbstractJaxbProject.java
@@ -672,7 +672,7 @@ public abstract class AbstractJaxbProject
 	}
 	
 	public Iterable<JavaResourceAbstractType> getAnnotatedJavaSourceResourceTypes() {
-		return IterableTools.filter(getJavaSourceResourceTypes(), JavaResourceAnnotatedElement.IS_ANNOTATED);
+		return IterableTools.filter(getJavaSourceResourceTypes(), JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 	}
 	
 //	public Iterable<String> getAnnotatedJavaSourceClassNames() {
@@ -721,7 +721,7 @@ public abstract class AbstractJaxbProject
 	}
 	
 	public Iterable<JavaResourcePackage> getAnnotatedJavaResourcePackages() {
-		return IterableTools.filter(this.getJavaResourcePackages(), JavaResourceAnnotatedElement.IS_ANNOTATED);
+		return IterableTools.filter(this.getJavaResourcePackages(), JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 	}
 	
 	public JavaResourcePackage getAnnotatedJavaResourcePackage(String packageName) {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java
index 7becc89143..f32bd9eccb 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/context/java/GenericJavaAttributesContainer.java
@@ -167,7 +167,7 @@ public class GenericJavaAttributesContainer
 	 * 3. all annotated methods getters/setters that don't have a matching pair
 	 */
 	private void intializePropertyAccessAttributes() {
-		this.initializeFieldAttributes(JavaResourceAnnotatedElement.IS_ANNOTATED);
+		this.initializeFieldAttributes(JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 		
 		Collection<JavaResourceMethod> resourceMethods = CollectionTools.hashBag(this.getResourceMethods());
 		//iterate through all resource methods searching for persistable getters
@@ -188,7 +188,7 @@ public class GenericJavaAttributesContainer
 	 * 2. all annotated methods getters/setters (some will have a matching getter/setter, some will be standalone)
 	 */
 	private void intializeNoneAccessAttributes() {
-		this.initializeFieldAttributes(JavaResourceAnnotatedElement.IS_ANNOTATED);
+		this.initializeFieldAttributes(JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 		this.initializeAnnotatedPropertyAttributes();
 	}
 	
@@ -275,7 +275,7 @@ public class GenericJavaAttributesContainer
 	}
 
 	protected Iterable<JavaResourceMethod> getResourcePropertyGetters() {
-		return this.filterResourceMethods(JavaResourceMethod.IS_PROPERTY_GETTER);
+		return this.filterResourceMethods(JavaResourceMethod.PROPERTY_GETTER_PREDICATE);
 	}
 	
 	/**
@@ -362,7 +362,7 @@ public class GenericJavaAttributesContainer
 	private void syncPropertyAccessAttributes() {
 		HashSet<JavaPersistentAttribute> contextAttributes = CollectionTools.hashSet(this.getAttributes());
 		
-		this.syncFieldAttributes(contextAttributes, JavaResourceAnnotatedElement.IS_ANNOTATED);
+		this.syncFieldAttributes(contextAttributes, JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 		
 		Collection<JavaResourceMethod> resourceMethods = CollectionTools.hashBag(this.getResourceMethods());
 		//iterate through all resource methods searching for persistable getters
@@ -397,7 +397,7 @@ public class GenericJavaAttributesContainer
 	private void syncNoneAccessAttributes() {
 		HashSet<JavaPersistentAttribute> contextAttributes = CollectionTools.hashSet(this.getAttributes());
 		
-		this.syncFieldAttributes(contextAttributes, JavaResourceAnnotatedElement.IS_ANNOTATED);
+		this.syncFieldAttributes(contextAttributes, JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 		this.syncAnnotatedPropertyAttributes(contextAttributes);
 	}
 	
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/InternalJaxbPlatformManager.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/InternalJaxbPlatformManager.java
index 8002cbc8d1..4c5e0cc6df 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/InternalJaxbPlatformManager.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/internal/platform/InternalJaxbPlatformManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2006, 2013 Oracle. All rights reserved.

+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.

  * This program and the accompanying materials are made available under the

  * terms of the Eclipse Public License v1.0, which accompanies this distribution

  * and is available at http://www.eclipse.org/legal/epl-v10.html.

@@ -338,7 +338,7 @@ public class InternalJaxbPlatformManager
 	 * "Default" platforms (i.e. third-party platforms flagged as "default").

 	 */

 	private Iterable<JaxbPlatformConfig> getDefaultJaxbPlatformConfigs() {

-		return IterableTools.filter(this.getJaxbPlatformConfigs(), JaxbPlatformConfig.IS_DEFAULT);

+		return IterableTools.filter(this.getJaxbPlatformConfigs(), JaxbPlatformConfig.DEFAULT_PREDICATE);

 	}

 

 	/**

diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java
index 72cca6799e..18b04d1466 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.core/src/org/eclipse/jpt/jaxb/core/platform/JaxbPlatformConfig.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -97,8 +97,8 @@ public interface JaxbPlatformConfig {
 	 */
 	boolean isDefault();
 
-	Predicate<JaxbPlatformConfig> IS_DEFAULT = new IsDefault();
-	class IsDefault
+	Predicate<JaxbPlatformConfig> DEFAULT_PREDICATE = new DefaultPredicate();
+	class DefaultPredicate
 		extends PredicateAdapter<JaxbPlatformConfig>
 	{
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java
index 9328cbc9cc..fb820eaca3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -288,8 +288,8 @@ public interface JpaPlatform
 		 * supported JPA facet versions}.
 		 */
 		boolean isDefault();
-		Predicate<Config> IS_DEFAULT = new IsDefault();
-		class IsDefault
+		Predicate<Config> DEFAULT_PREDICATE = new DefaultPredicate();
+		class DefaultPredicate
 			extends PredicateAdapter<Config>
 		{
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
index 023b5c994a..df855308ca 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProject.java
@@ -26,8 +26,12 @@ import org.eclipse.jpt.common.core.utility.command.JobCommand;
 import org.eclipse.jpt.common.utility.closure.BiClosure;
 import org.eclipse.jpt.common.utility.command.ExtendedCommandContext;
 import org.eclipse.jpt.common.utility.internal.closure.BiClosureAdapter;
+import org.eclipse.jpt.common.utility.internal.model.BooleanSetClosureAdapter;
 import org.eclipse.jpt.common.utility.internal.predicate.CriterionPredicate;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
+import org.eclipse.jpt.common.utility.model.BooleanSetClosure;
+import org.eclipse.jpt.common.utility.predicate.Predicate;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
 import org.eclipse.jpt.jpa.core.context.JpaContextRoot;
 import org.eclipse.jpt.jpa.core.context.java.JavaManagedTypeDefinition;
@@ -557,13 +561,13 @@ public interface JpaProject
 	 * by the JPA implementation.
 	 */
 	boolean discoversAnnotatedClasses();
-		Transformer<JpaProject, Boolean> DISCOVERS_ANNOTATED_CLASSES_TRANSFORMER = new DiscoversAnnotatedClassesTransformer();
-	class DiscoversAnnotatedClassesTransformer
-		extends TransformerAdapter<JpaProject, Boolean>
+		Predicate<JpaProject> DISCOVERS_ANNOTATED_CLASSES_PREDICATE = new DiscoversAnnotatedClassesPredicate();
+	class DiscoversAnnotatedClassesPredicate
+		extends PredicateAdapter<JpaProject>
 	{
 		@Override
-		public Boolean transform(JpaProject jpaProject) {
-			return Boolean.valueOf(jpaProject.discoversAnnotatedClasses());
+		public boolean evaluate(JpaProject jpaProject) {
+			return jpaProject.discoversAnnotatedClasses();
 		}
 	}
 
@@ -574,13 +578,13 @@ public interface JpaProject
 	 * @see #discoversAnnotatedClasses()
 	 */
 	void setDiscoversAnnotatedClasses(boolean discoversAnnotatedClasses);
-		BiClosure<JpaProject, Boolean> SET_DISCOVERS_ANNOTATED_CLASSES_CLOSURE = new SetDiscoversAnnotatedClassesClosure();
+		BooleanSetClosure<JpaProject> SET_DISCOVERS_ANNOTATED_CLASSES_CLOSURE = new SetDiscoversAnnotatedClassesClosure();
 	class SetDiscoversAnnotatedClassesClosure
-		extends BiClosureAdapter<JpaProject, Boolean>
+		extends BooleanSetClosureAdapter<JpaProject>
 	{
 		@Override
-		public void execute(JpaProject jpaProject, Boolean discoversAnnotatedClasses) {
-			jpaProject.setDiscoversAnnotatedClasses(discoversAnnotatedClasses.booleanValue());
+		public void execute(JpaProject jpaProject, boolean discoversAnnotatedClasses) {
+			jpaProject.setDiscoversAnnotatedClasses(discoversAnnotatedClasses);
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java
index e940919726..064b153175 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeMapping.java
@@ -15,7 +15,6 @@ import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
 import org.eclipse.jpt.common.utility.predicate.Predicate;
 import org.eclipse.jpt.common.utility.transformer.Transformer;
-import org.eclipse.jpt.jpa.core.MappingKeys;
 
 /**
  * JPA attribute mapping.
@@ -86,16 +85,6 @@ public interface AttributeMapping
 		}
 	}
 
-	Predicate<AttributeMapping> IS_NOT_TRANSIENT = new IsNotTransient();
-	public static class IsNotTransient
-		extends PredicateAdapter<AttributeMapping>
-	{
-		@Override
-		public boolean evaluate(AttributeMapping mapping) {
-			return mapping.getKey() != MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY;
-		}
-	}
-
 	/**
 	 * Return whether the "attribute" mapping can be overridden.
 	 * The mapping must be a {@link ColumnMapping}.
@@ -108,8 +97,8 @@ public interface AttributeMapping
 	 */
 	boolean isOverridableAssociationMapping();
 
-	Predicate<AttributeMapping> IS_OVERRIDABLE_ASSOCIATION_MAPPING = new IsOverridableAssociationMapping();
-	public static class IsOverridableAssociationMapping
+	Predicate<AttributeMapping> OVERRIDABLE_ASSOCIATION_MAPPING_PREDICATE = new OverridableAssociationMappingPredicate();
+	public static class OverridableAssociationMappingPredicate
 		extends PredicateAdapter<AttributeMapping>
 	{
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedOrVirtual.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedOrVirtual.java
index 6c8352f639..c60f1e9c57 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedOrVirtual.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SpecifiedOrVirtual.java
@@ -34,8 +34,8 @@ public interface SpecifiedOrVirtual {
 	default boolean isSpecified() {
 		return ! this.isVirtual();
 	}
-		Predicate<SpecifiedOrVirtual> IS_SPECIFIED_PREDICATE = new IsSpecifiedPredicate();
-	class IsSpecifiedPredicate
+		Predicate<SpecifiedOrVirtual> SPECIFIED_PREDICATE = new SpecifiedPredicate();
+	class SpecifiedPredicate
 		extends PredicateAdapter<SpecifiedOrVirtual>
 	{
 		@Override
@@ -51,5 +51,5 @@ public interface SpecifiedOrVirtual {
 	 * @see #isSpecified()
 	 */
 	boolean isVirtual();
-		Predicate<SpecifiedOrVirtual> IS_VIRTUAL_PREDICATE = PredicateTools.not(IS_SPECIFIED_PREDICATE);
+		Predicate<SpecifiedOrVirtual> VIRTUAL_PREDICATE = PredicateTools.not(SPECIFIED_PREDICATE);
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
index a04e128d06..e96fa7c448 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java
@@ -829,7 +829,7 @@ public abstract class AbstractJpaProject
 	 */
 	public Iterable<JavaResourceAbstractType> getAnnotatedJavaSourceTypes() {
 		// i.e. the type has a valid JPA type annotation
-		return IterableTools.filter(this.getInternalSourceJavaResourceTypes(), JavaResourceAnnotatedElement.IS_ANNOTATED);
+		return IterableTools.filter(this.getInternalSourceJavaResourceTypes(), JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
index c8efe65f94..4d19250f01 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -446,7 +446,7 @@ public abstract class AbstractJavaPersistentType
 	 * 3. all annotated methods getters/setters that don't have a matching pair
 	 */
 	private void intializePropertyAccessAttributes() {
-		this.initializeFieldAttributes(JavaResourceAnnotatedElement.IS_ANNOTATED);
+		this.initializeFieldAttributes(JavaResourceAnnotatedElement.ANNOTATED_PREDICATE);
 
 		Collection<JavaResourceMethod> resourceMethods = CollectionTools.hashBag(this.getResourceMethods());
 		//iterate through all resource methods searching for persistable getters
@@ -521,7 +521,7 @@ public abstract class AbstractJavaPersistentType
 	private void syncPropertyAccessAttributes(IProgressMonitor monitor) {
 		HashSet<JavaSpecifiedPersistentAttribute> contextAttributes = CollectionTools.hashSet(this.getAttributes());
 
-		this.syncFieldAttributes(contextAttributes, JavaResourceAnnotatedElement.IS_ANNOTATED, monitor);
+		this.syncFieldAttributes(contextAttributes, JavaResourceAnnotatedElement.ANNOTATED_PREDICATE, monitor);
 
 		Collection<JavaResourceMethod> resourceMethods = CollectionTools.hashBag(this.getResourceMethods());
 		//iterate through all resource methods searching for persistable getters
@@ -637,7 +637,7 @@ public abstract class AbstractJavaPersistentType
 	}
 
 	protected Iterable<JavaResourceMethod> getResourcePropertyGetters() {
-		return this.filterResourceMethods(JavaResourceMethod.IS_PROPERTY_GETTER);
+		return this.filterResourceMethods(JavaResourceMethod.PROPERTY_GETTER_PREDICATE);
 	}
 
 	protected Iterable<JavaResourceMethod> filterResourceMethods(Predicate<JavaResourceMethod> predicate) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java
index 211e85648e..4627b26c53 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java
@@ -14,9 +14,11 @@ import org.eclipse.jpt.common.core.resource.java.Annotation;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
 import org.eclipse.jpt.common.core.utility.TextRange;
 import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
-import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateTools;
+import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
+import org.eclipse.jpt.jpa.core.context.AttributeMapping.KeyEquals;
 import org.eclipse.jpt.jpa.core.context.Generator;
 import org.eclipse.jpt.jpa.core.context.IdTypeMapping;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
@@ -132,7 +134,7 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation>
 	}
 
 	public Iterable<AttributeMapping> getNonTransientAttributeMappings() {
-		return new FilteringIterable<>(getAllAttributeMappings(), AttributeMapping.IS_NOT_TRANSIENT);
+		return IterableTools.filter(getAllAttributeMappings(), PredicateTools.not(new KeyEquals(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY)));
 	}
 	
 	public Iterable<AttributeMapping> getIdAttributeMappings() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java
index 8824430075..7f70d67f7b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmPersistentAttribute.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -333,7 +333,7 @@ public abstract class AbstractOrmPersistentAttribute
 	}
 
 	protected Iterable<JavaResourceMethod> getJavaResourceGetters(JavaResourceType javaResourceType) {
-		return this.filterJavaResourceMethods(javaResourceType, JavaResourceMethod.IS_PROPERTY_GETTER);
+		return this.filterJavaResourceMethods(javaResourceType, JavaResourceMethod.PROPERTY_GETTER_PREDICATE);
 	}
 
 	protected Iterable<JavaResourceMethod> filterJavaResourceMethods(JavaResourceType javaResourceType, Predicate<JavaResourceMethod> predicate) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
index aa5af022b0..f1abac742b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,9 +16,11 @@ import org.eclipse.jdt.core.IType;
 import org.eclipse.jpt.common.core.internal.utility.JavaProjectTools;
 import org.eclipse.jpt.common.core.resource.java.JavaResourceType;
 import org.eclipse.jpt.common.core.utility.TextRange;
-import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateTools;
+import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
+import org.eclipse.jpt.jpa.core.context.AttributeMapping.KeyEquals;
 import org.eclipse.jpt.jpa.core.context.Generator;
 import org.eclipse.jpt.jpa.core.context.IdTypeMapping;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
@@ -318,7 +320,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping>
 	}
 	
 	public Iterable<AttributeMapping> getNonTransientAttributeMappings() {
-		return new FilteringIterable<AttributeMapping>(getAllAttributeMappings(), AttributeMapping.IS_NOT_TRANSIENT);
+		return IterableTools.filter(getAllAttributeMappings(), PredicateTools.not(new KeyEquals(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY)));
 	}
 	
 	public Iterable<AttributeMapping> getIdAttributeMappings() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
index 565f5196f1..e67c279a65 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2015 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -646,7 +646,7 @@ public abstract class SpecifiedOrmPersistentType
 		HashSet<OrmPersistentAttribute> contextAttributes = CollectionTools.hashSet(this.getDefaultAttributes());
 
 		if ( ! this.mapping.isMetadataComplete()) {
-			this.syncFieldDefaultAttributes(contextAttributes, JavaResourceAnnotatedElement.IS_ANNOTATED, monitor);
+			this.syncFieldDefaultAttributes(contextAttributes, JavaResourceAnnotatedElement.ANNOTATED_PREDICATE, monitor);
 		}
 
 		Collection<JavaResourceMethod> resourceMethods = CollectionTools.hashBag(this.getJavaResourceMethods());
@@ -793,7 +793,7 @@ public abstract class SpecifiedOrmPersistentType
 	}
 
 	protected Iterable<JavaResourceMethod> getJavaResourcePropertyGetters() {
-		return this.filterJavaResourceMethods(JavaResourceMethod.IS_PROPERTY_GETTER);
+		return this.filterJavaResourceMethods(JavaResourceMethod.PROPERTY_GETTER_PREDICATE);
 	}
 
 	protected Iterable<JavaResourceMethod> filterJavaResourceMethods(Predicate<JavaResourceMethod> predicate) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java
index 98c02fcd73..ac47c9928b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -20,6 +20,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.internal.collection.HashBag;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
 import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateTools;
 import org.eclipse.jpt.jpa.core.MappingKeys;
 import org.eclipse.jpt.jpa.core.context.AccessType;
 import org.eclipse.jpt.jpa.core.context.AttributeMapping;
@@ -30,6 +31,7 @@ import org.eclipse.jpt.jpa.core.context.IdMapping;
 import org.eclipse.jpt.jpa.core.context.IdTypeMapping;
 import org.eclipse.jpt.jpa.core.context.PersistentAttribute;
 import org.eclipse.jpt.jpa.core.context.TypeMapping;
+import org.eclipse.jpt.jpa.core.context.AttributeMapping.KeyEquals;
 import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
 import org.eclipse.jpt.jpa.core.context.java.JavaSpecifiedPersistentAttribute;
 import org.eclipse.jpt.jpa.core.internal.context.JpaValidator;
@@ -568,8 +570,8 @@ public abstract class AbstractPrimaryKeyValidator
 	 * Return all the attribute mappings of the given type  
 	 * mapping with transient attribute mappings being excluded
 	 */
-	protected Iterable<AttributeMapping> getAttributeMappings(TypeMapping typeMapping) {
-		return IterableTools.filter(typeMapping.getAllAttributeMappings(), AttributeMapping.IS_NOT_TRANSIENT);
+	protected Iterable<AttributeMapping> getAttributeMappings(TypeMapping mapping) {
+		return IterableTools.filter(mapping.getAllAttributeMappings(), PredicateTools.not(new KeyEquals(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY)));
 	}
 	
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
index 4fb880512b..3dff3bd838 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java
@@ -128,7 +128,7 @@ public abstract class AbstractOrmEmbeddedMapping<X extends XmlEmbedded>
 	}
 
 	protected Iterable<AttributeMapping> getAllOverridableAssociations_() {
-		return IterableTools.filter(this.targetEmbeddable.getAttributeMappings(), AttributeMapping.IS_OVERRIDABLE_ASSOCIATION_MAPPING);
+		return IterableTools.filter(this.targetEmbeddable.getAttributeMappings(), AttributeMapping.OVERRIDABLE_ASSOCIATION_MAPPING_PREDICATE);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java
index 4a6afaea6f..83c0f41db2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -348,7 +348,7 @@ public class InternalJpaPlatformManager
 	 * "Default" platforms (i.e. third-party platforms flagged as "default").
 	 */
 	private Iterable<InternalJpaPlatformConfig> getDefaultJpaPlatformConfigs() {
-		return IterableTools.filter(this.getInternalJpaPlatformConfigs(), JpaPlatform.Config.IS_DEFAULT);
+		return IterableTools.filter(this.getInternalJpaPlatformConfigs(), JpaPlatform.Config.DEFAULT_PREDICATE);
 	}
 
 	/**
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/Column.java b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/Column.java
index 8b9e8d36ad..8b51aa89f0 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/Column.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/Column.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -37,8 +37,8 @@ public interface Column
 	 * Return whether the column is part of its table's primary key.
 	 */
 	boolean isPartOfPrimaryKey();
-	Predicate<Column> IS_PART_OF_PRIMARY_KEY = new IsPartOfPrimaryKey();
-	public static class IsPartOfPrimaryKey
+	Predicate<Column> PART_OF_PRIMARY_KEY_PREDICATE = new PartOfPrimaryKeyPredicate();
+	public static class PartOfPrimaryKeyPredicate
 		extends PredicateAdapter<Column>
 	{
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/ConnectionProfile.java b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/ConnectionProfile.java
index 747371b127..6354e5bfce 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/ConnectionProfile.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/ConnectionProfile.java
@@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.db;
 import java.sql.Connection;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.datatools.connectivity.drivers.jdbc.IJDBCDriverDefinitionConstants;
-import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
-import org.eclipse.jpt.common.utility.transformer.Transformer;
+import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
+import org.eclipse.jpt.common.utility.predicate.Predicate;
 
 /**
  * Database connection profile
@@ -136,13 +136,13 @@ public interface ConnectionProfile
 	 * @see #isActive()
 	 */
 	boolean isConnected();
-	Transformer<ConnectionProfile, Boolean> CONNECTED_TRANSFORMER = new DisconnectedTransformer();
-	class ConnectedTransformer
-		extends TransformerAdapter<ConnectionProfile, Boolean>
+	Predicate<ConnectionProfile> CONNECTED_PREDICATE = new ConnectedPredicate();
+	class ConnectedPredicate
+		extends PredicateAdapter<ConnectionProfile>
 	{
 		@Override
-		public Boolean transform(ConnectionProfile connectionProfile) {
-			return Boolean.valueOf(connectionProfile.isConnected());
+		public boolean evaluate(ConnectionProfile connectionProfile) {
+			return connectionProfile.isConnected();
 		}
 	}
 
@@ -153,13 +153,13 @@ public interface ConnectionProfile
 	 * @see #isConnected()
 	 */
 	boolean isDisconnected();
-	Transformer<ConnectionProfile, Boolean> DISCONNECTED_TRANSFORMER = new DisconnectedTransformer();
-	class DisconnectedTransformer
-		extends TransformerAdapter<ConnectionProfile, Boolean>
+	Predicate<ConnectionProfile> DISCONNECTED_PREDICATE = new DisconnectedPredicate();
+	class DisconnectedPredicate
+		extends PredicateAdapter<ConnectionProfile>
 	{
 		@Override
-		public Boolean transform(ConnectionProfile connectionProfile) {
-			return Boolean.valueOf(connectionProfile.isDisconnected());
+		public boolean evaluate(ConnectionProfile connectionProfile) {
+			return connectionProfile.isDisconnected();
 		}
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPForeignKeyWrapper.java b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPForeignKeyWrapper.java
index d4fe9962ae..46aa087151 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPForeignKeyWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.db/src/org/eclipse/jpt/jpa/db/internal/DTPForeignKeyWrapper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2006, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -153,7 +153,7 @@ final class DTPForeignKeyWrapper
 	public Iterable<Column> getNonPrimaryKeyBaseColumns() {
 		return IterableTools.filter(this.getBaseColumns(), IS_NOT_PART_OF_PRIMARY_KEY);
 	}
-	private static final Predicate<Column> IS_NOT_PART_OF_PRIMARY_KEY = PredicateTools.not(Column.IS_PART_OF_PRIMARY_KEY);
+	private static final Predicate<Column> IS_NOT_PART_OF_PRIMARY_KEY = PredicateTools.not(Column.PART_OF_PRIMARY_KEY_PREDICATE);
 
 	public Iterable<Column> getReferencedColumns() {
 		return IterableTools.transform(this.getLocalColumnPairs(), LocalColumnPair.REFERENCED_COLUMN_TRANSFORMER);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java
index b18dcb2fcf..1cf125d57d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/EclipseLinkOrmPersistentType.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2016 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -40,8 +40,8 @@ public interface EclipseLinkOrmPersistentType
 	 */
 	boolean isDynamic();
 		String DYNAMIC_PROPERTY = "dynamic"; //$NON-NLS-1$
-	Predicate<EclipseLinkOrmPersistentType> IS_DYNAMIC = new IsDynamic();
-	class IsDynamic
+	Predicate<EclipseLinkOrmPersistentType> DYNAMIC_PREDICATE = new DynamicPredicate();
+	class DynamicPredicate
 		extends PredicateAdapter<EclipseLinkOrmPersistentType>
 	{
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
index 7a5156eacc..87c16b64b9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java
@@ -679,7 +679,7 @@ public class EclipseLinkPersistenceUnit
 	}
 
 	public Iterable<EclipseLinkOrmPersistentType> getEclipseLinkDynamicPersistentTypes() {
-		return IterableTools.filter(this.getEclipseLinkOrmPersistentTypes(), EclipseLinkOrmPersistentType.IS_DYNAMIC);
+		return IterableTools.filter(this.getEclipseLinkOrmPersistentTypes(), EclipseLinkOrmPersistentType.DYNAMIC_PREDICATE);
 	}
 
 	public Iterable<EclipseLinkOrmPersistentType> getEclipseLinkOrmPersistentTypes() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java
index f0c94a8a80..2cde239855 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java
@@ -103,11 +103,11 @@ public class EclipseLinkConnectionPropertiesComposite<T extends EclipseLinkConne
 	}
 
 	private PropertyValueModel<Boolean> buildJTADataSourceModel() {
-		return PropertyValueModelTools.valueAffirms_(this.buildTransactionTypeModel(), JTA_DATA_SOURCE_PREDICATE);
+		return PropertyValueModelTools.valueAffirms_(this.buildTransactionTypeModel(), TRANSACTION_TYPE_IS_JTA_PREDICATE);
 	}
 
-	private static final Predicate<PersistenceUnitTransactionType> JTA_DATA_SOURCE_PREDICATE = new JTADataSourcePredicate();
-	static class JTADataSourcePredicate
+	private static final Predicate<PersistenceUnitTransactionType> TRANSACTION_TYPE_IS_JTA_PREDICATE = new TransactionTypeIsJTAPredicate();
+	static class TransactionTypeIsJTAPredicate
 		extends PredicateAdapter<PersistenceUnitTransactionType>
 	{
 		@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOverridesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOverridesComposite.java
index 1c679f640a..2123501e3a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOverridesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOverridesComposite.java
@@ -140,7 +140,7 @@ public abstract class AbstractOverridesComposite<T extends JpaContextModel>
 	}
 	
 	private <O extends Override_> PropertyValueModel<Boolean> buildOverrideIsSpecifiedModel(PropertyValueModel<O> overrideModel) {
-		return PropertyValueModelTools.valueAffirms(overrideModel, SpecifiedOrVirtual.IS_SPECIFIED_PREDICATE);
+		return PropertyValueModelTools.valueAffirms(overrideModel, SpecifiedOrVirtual.SPECIFIED_PREDICATE);
 	}
 
 	protected Pane<AssociationOverride> getAssociationOverridePane(PageBook pageBook) {
@@ -205,7 +205,7 @@ public abstract class AbstractOverridesComposite<T extends JpaContextModel>
 	private ModifiablePropertyValueModel<Boolean> buildOverrideVirtualOverrideModel() {
 		return PropertyValueModelTools.transform(
 				this.selectedOverrideModel, 
-				TransformerTools.adapt(SpecifiedOrVirtual.IS_SPECIFIED_PREDICATE),
+				TransformerTools.adapt(SpecifiedOrVirtual.SPECIFIED_PREDICATE),
 				ClosureTools.booleanClosure(new OverrideVirtualOverrideModelSetValueClosure())
 			);
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java
index 59218867c9..c909d93ee2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableComposite.java
@@ -52,7 +52,7 @@ public class JoinTableComposite
 		return TABLE_IS_VIRTUAL_PREDICATE;
 	}
 
-	public static final PredicateAdapter<JoinTable> TABLE_IS_VIRTUAL_PREDICATE = new TableIsVirtualPredicate();
+	public static final Predicate<JoinTable> TABLE_IS_VIRTUAL_PREDICATE = new TableIsVirtualPredicate();
 
 	public static class TableIsVirtualPredicate
 		extends PredicateAdapter<JoinTable>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java
index e7244ac3dc..5e696825c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java
@@ -116,6 +116,6 @@ public class JoinTableJoiningStrategyPane
 	}
 
 	private PropertyValueModel<Boolean> buildJoinTablePaneEnablerModel() {
-		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.IS_SPECIFIED_PREDICATE);
+		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.SPECIFIED_PREDICATE);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java
index fdccccc1e5..d1458b5ccb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoiningStrategyJoinColumnsComposite.java
@@ -174,7 +174,7 @@ public class JoiningStrategyJoinColumnsComposite
 		return STRATEGY_IS_VIRTUAL_PREDICATE;
 	}
 
-	public static final PredicateAdapter<JoinColumnRelationshipStrategy> STRATEGY_IS_VIRTUAL_PREDICATE = new StrategyIsVirtualPredicate();
+	public static final Predicate<JoinColumnRelationshipStrategy> STRATEGY_IS_VIRTUAL_PREDICATE = new StrategyIsVirtualPredicate();
 
 	public static class StrategyIsVirtualPredicate
 		extends PredicateAdapter<JoinColumnRelationshipStrategy>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java
index 34bd79814c..f1885a7a12 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java
@@ -98,6 +98,6 @@ public class MappedByJoiningStrategyPane
 
 
 	private PropertyValueModel<Boolean> buildMappedByRelationshipPaneEnablerModel() {
-		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.IS_SPECIFIED_PREDICATE);
+		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.SPECIFIED_PREDICATE);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java
index 3af23116bd..fc120fdbef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java
@@ -84,7 +84,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite
 	}
 
 	private PropertyValueModel<Boolean> buildControlBooleanModel() {
-		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.IS_SPECIFIED_PREDICATE, false);
+		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.SPECIFIED_PREDICATE, false);
 	}
 
 	private PropertyValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnModel() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java
index 63ce8179d1..f3a091a5e5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsPageManager.java
@@ -70,7 +70,7 @@ public class OrmPersistentAttributeDetailsPageManager
 	}
 	
 	private PropertyValueModel<Boolean> buildVirtualAttributeEnabledModel() {
-		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.IS_SPECIFIED_PREDICATE);
+		return PropertyValueModelTools.valueAffirms(this.getSubjectHolder(), SpecifiedOrVirtual.SPECIFIED_PREDICATE);
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTableComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTableComposite2_0.java
index 1792a66037..7a03ba1be7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTableComposite2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CollectionTableComposite2_0.java
@@ -86,7 +86,7 @@ public class CollectionTableComposite2_0
 		return TABLE_IS_VIRTUAL_PREDICATE;
 	}
 
-	public static final PredicateAdapter<ReferenceTable> TABLE_IS_VIRTUAL_PREDICATE = new TableIsVirtualPredicate();
+	public static final Predicate<ReferenceTable> TABLE_IS_VIRTUAL_PREDICATE = new TableIsVirtualPredicate();
 
 	public static class TableIsVirtualPredicate
 		extends PredicateAdapter<ReferenceTable>
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java
index 2bdf0ba955..4d65712d3e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java
@@ -205,11 +205,11 @@ public class PersistenceUnitConnectionEditorPage2_0
 	}

 

 	private PropertyValueModel<Boolean> buildJTADataSourceModel() {

-		return PropertyValueModelTools.valueAffirms_(this.buildTransactionTypeModel(), JTA_DATA_SOURCE_PREDICATE);

+		return PropertyValueModelTools.valueAffirms_(this.buildTransactionTypeModel(), TRANSACTION_TYPE_IS_JTA);

 	}

 

-	private static final Predicate<PersistenceUnitTransactionType> JTA_DATA_SOURCE_PREDICATE = new JTADataSourcePredicate();

-	static class JTADataSourcePredicate

+	private static final Predicate<PersistenceUnitTransactionType> TRANSACTION_TYPE_IS_JTA = new TransactionTypeIsJTA();

+	static class TransactionTypeIsJTA

 		extends PredicateAdapter<PersistenceUnitTransactionType>

 	{

 		@Override

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
index f267846b88..d49d8f12b2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
@@ -350,7 +350,7 @@ public class JpaProjectPropertiesPage
 	private PropertyValueModel<Boolean> buildDisconnectedModel() {
 		return PropertyValueModelTools.aspectAdapter(
 				this.connectionProfileModel,
-				new ConnectionProfilePropertyAspectAdapter.Factory<>(ConnectionProfile.DISCONNECTED_TRANSFORMER)
+				new ConnectionProfilePropertyAspectAdapter.Factory<>(TransformerTools.adapt(ConnectionProfile.DISCONNECTED_PREDICATE))
 			);
 	}
 
@@ -508,7 +508,7 @@ public class JpaProjectPropertiesPage
 		return PropertyValueModelTools.modifiableModelAspectAdapter(
 				this.jpaProjectModel,
 				JpaProject.DISCOVERS_ANNOTATED_CLASSES_PROPERTY,
-				JpaProject.DISCOVERS_ANNOTATED_CLASSES_TRANSFORMER,
+				JpaProject.DISCOVERS_ANNOTATED_CLASSES_PREDICATE,
 				JpaProject.SET_DISCOVERS_ANNOTATED_CLASSES_CLOSURE
 			);
 	}