convert BooleanSetClosures to lambdas

6 files changed, 10 insertions, 82 deletions

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 03d5e5cd8f..700a38ac5f 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
@@ -74,7 +74,7 @@ public class CheckBoxModelBindingUITest
 				subjectModel,
 				TestModel.FLAG1_PROPERTY,
 				TestModel.FLAG1_PREDICATE,
-				TestModel.SET_FLAG1_CLOSURE
+				(model, value) -> model.setFlag1(value)
 			);
 	}
 
@@ -83,7 +83,7 @@ public class CheckBoxModelBindingUITest
 				subjectModel,
 				TestModel.FLAG2_PROPERTY,
 				TestModel.FLAG2_PREDICATE,
-				TestModel.SET_FLAG2_CLOSURE
+				(model, value) -> model.setFlag2(value)
 			);
 	}
 
@@ -92,7 +92,7 @@ public class CheckBoxModelBindingUITest
 				subjectModel,
 				TestModel.NOT_FLAG2_PROPERTY,
 				TestModel.NOT_FLAG2_PREDICATE,
-				TestModel.SET_NOT_FLAG2_CLOSURE
+				(model, value) -> model.setNotFlag2(value)
 			);
 	}
 
@@ -278,15 +278,6 @@ public class CheckBoxModelBindingUITest
 					return model.isFlag1();
 				}
 			}
-			public static final BooleanSetClosure<TestModel> SET_FLAG1_CLOSURE = new SetFlag1Closure();
-			public static final class SetFlag1Closure
-				extends BooleanSetClosureAdapter<TestModel>
-			{
-				@Override
-				public void execute(TestModel model, boolean value) {
-					model.setFlag1(value);
-				}
-			}
 		private boolean flag2;
 			public static final String FLAG2_PROPERTY = "flag2";
 			public static final Predicate<TestModel> FLAG2_PREDICATE = new Flag2Predicate();
@@ -298,15 +289,6 @@ public class CheckBoxModelBindingUITest
 					return model.isFlag2();
 				}
 			}
-			public static final BooleanSetClosure<TestModel> SET_FLAG2_CLOSURE = new SetFlag2Closure();
-			public static final class SetFlag2Closure
-				extends BooleanSetClosureAdapter<TestModel>
-			{
-				@Override
-				public void execute(TestModel model, boolean value) {
-					model.setFlag2(value);
-				}
-			}
 		private boolean notFlag2;
 			public static final String NOT_FLAG2_PROPERTY = "notFlag2";
 			public static final Predicate<TestModel> NOT_FLAG2_PREDICATE = new NotFlag2Predicate();
@@ -318,15 +300,6 @@ public class CheckBoxModelBindingUITest
 					return model.isNotFlag2();
 				}
 			}
-			public static final BooleanSetClosure<TestModel> SET_NOT_FLAG2_CLOSURE = new SetNotFlag2Closure();
-			public static final class SetNotFlag2Closure
-				extends BooleanSetClosureAdapter<TestModel>
-			{
-				@Override
-				public void execute(TestModel model, boolean value) {
-					model.setNotFlag2(value);
-				}
-			}
 	
 		public TestModel(boolean flag1, boolean flag2) {
 			this.flag1 = flag1;
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 f742260837..d59bb1b579 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
@@ -62,7 +62,7 @@ public class CheckBoxModelAdapterUITest {
 
 	private void exec() throws Exception {
 		this.testModel = new TestModel(true, true);
-		this.testModelHolder = new SimplePropertyValueModel<TestModel>(this.testModel);
+		this.testModelHolder = new SimplePropertyValueModel<>(this.testModel);
 		this.flag1Holder = this.buildFlag1Holder(this.testModelHolder);
 		this.flag1ButtonModel = this.buildCheckBoxModelAdapter(this.flag1Holder);
 		this.flag2Holder = this.buildFlag2Holder(this.testModelHolder);
@@ -77,7 +77,7 @@ public class CheckBoxModelAdapterUITest {
 				vm,
 				TestModel.FLAG1_PROPERTY,
 				TestModel.FLAG1_PREDICATE,
-				TestModel.SET_FLAG1_CLOSURE
+				(model, value) -> model.setFlag1(value)
 			);
 	}
 
@@ -86,7 +86,7 @@ public class CheckBoxModelAdapterUITest {
 				vm,
 				TestModel.FLAG2_PROPERTY,
 				TestModel.FLAG2_PREDICATE,
-				TestModel.SET_FLAG2_CLOSURE
+				(model, value) -> model.setFlag2(value)
 			);
 	}
 
@@ -95,7 +95,7 @@ public class CheckBoxModelAdapterUITest {
 				vm,
 				TestModel.NOT_FLAG2_PROPERTY,
 				TestModel.NOT_FLAG2_PREDICATE,
-				TestModel.SET_NOT_FLAG2_CLOSURE
+				(model, value) -> model.setNotFlag2(value)
 			);
 	}
 
@@ -272,15 +272,6 @@ public class CheckBoxModelAdapterUITest {
 					return model.isFlag1();
 				}
 			}
-			public static final BooleanSetClosure<TestModel> SET_FLAG1_CLOSURE = new SetFlag1Closure();
-			public static final class SetFlag1Closure
-				extends BooleanSetClosureAdapter<TestModel>
-			{
-				@Override
-				public void execute(TestModel model, boolean value) {
-					model.setFlag1(value);
-				}
-			}
 		private boolean flag2;
 			public static final String FLAG2_PROPERTY = "flag2";
 			public static final Predicate<TestModel> FLAG2_PREDICATE = new Flag2Predicate();
@@ -292,15 +283,6 @@ public class CheckBoxModelAdapterUITest {
 					return model.isFlag2();
 				}
 			}
-			public static final BooleanSetClosure<TestModel> SET_FLAG2_CLOSURE = new SetFlag2Closure();
-			public static final class SetFlag2Closure
-				extends BooleanSetClosureAdapter<TestModel>
-			{
-				@Override
-				public void execute(TestModel model, boolean value) {
-					model.setFlag2(value);
-				}
-			}
 		private boolean notFlag2;
 			public static final String NOT_FLAG2_PROPERTY = "notFlag2";
 			public static final Predicate<TestModel> NOT_FLAG2_PREDICATE = new NotFlag2Predicate();
@@ -312,15 +294,6 @@ public class CheckBoxModelAdapterUITest {
 					return model.isNotFlag2();
 				}
 			}
-			public static final BooleanSetClosure<TestModel> SET_NOT_FLAG2_CLOSURE = new SetNotFlag2Closure();
-			public static final class SetNotFlag2Closure
-				extends BooleanSetClosureAdapter<TestModel>
-			{
-				@Override
-				public void execute(TestModel model, boolean value) {
-					model.setNotFlag2(value);
-				}
-			}
 	
 		public TestModel(boolean flag1, boolean flag2) {
 			this.flag1 = flag1;
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 31ab39e0c8..99d2b81b39 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
@@ -363,7 +363,7 @@ public class TableModelAdapterTests
 					person,
 					Person.EVIL_PROPERTY,
 					TransformerTools.adapt(Person.EVIL_PREDICATE),
-					PropertyValueModelTools.downcast(PropertyValueModelTools.booleanSetBiClosureAdapter(Person.SET_EVIL_CLOSURE))
+					PropertyValueModelTools.downcast(PropertyValueModelTools.booleanSetBiClosureAdapter((p, evil) -> p.setEvil(evil)))
 				);
 		}
 	
@@ -566,15 +566,6 @@ public class TableModelAdapterTests
 					return model.isEvil();
 				}
 			}
-			public static final BooleanSetClosure<Person> SET_EVIL_CLOSURE = new SetEvilClosure();
-			public static final class SetEvilClosure
-				extends BooleanSetClosureAdapter<Person>
-			{
-				@Override
-				public void execute(Person model, boolean value) {
-					model.setEvil(value);
-				}
-			}
 		private int rank;
 			public static final String RANK_PROPERTY= "rank";
 			public static final Transformer<Person, Integer> RANK_TRANSFORMER = new RankTransformer();
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 47c4a31b67..9f10e96a20 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
@@ -618,7 +618,7 @@ public class TableModelAdapterUITest {
 				this.selectedPersonHolder,
 				Person.EVIL_PROPERTY,
 				TransformerTools.adapt(Person.EVIL_PREDICATE),
-				PropertyValueModelTools.downcast(PropertyValueModelTools.booleanSetBiClosureAdapter(Person.SET_EVIL_CLOSURE))
+				PropertyValueModelTools.downcast(PropertyValueModelTools.booleanSetBiClosureAdapter((p, evil) -> p.setEvil(evil)))
 			);
 	}
 
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 df855308ca..11c0df8b2b 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
@@ -578,15 +578,6 @@ public interface JpaProject
 	 * @see #discoversAnnotatedClasses()
 	 */
 	void setDiscoversAnnotatedClasses(boolean discoversAnnotatedClasses);
-		BooleanSetClosure<JpaProject> SET_DISCOVERS_ANNOTATED_CLASSES_CLOSURE = new SetDiscoversAnnotatedClassesClosure();
-	class SetDiscoversAnnotatedClassesClosure
-		extends BooleanSetClosureAdapter<JpaProject>
-	{
-		@Override
-		public void execute(JpaProject jpaProject, boolean discoversAnnotatedClasses) {
-			jpaProject.setDiscoversAnnotatedClasses(discoversAnnotatedClasses);
-		}
-	}
 
 
 	// ********** manager **********
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 85f3b761f9..c63b5e6120 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
@@ -509,7 +509,7 @@ public class JpaProjectPropertiesPage
 				this.jpaProjectModel,
 				JpaProject.DISCOVERS_ANNOTATED_CLASSES_PROPERTY,
 				JpaProject.DISCOVERS_ANNOTATED_CLASSES_PREDICATE,
-				JpaProject.SET_DISCOVERS_ANNOTATED_CLASSES_CLOSURE
+				(jpaProject, value) -> jpaProject.setDiscoversAnnotatedClasses(value)
 			);
 	}