clean up SWT bindings

9 files changed, 130 insertions, 128 deletions

diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF b/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF
index 5b8abd67fb..13891a66f3 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/META-INF/MANIFEST.MF
@@ -22,5 +22,5 @@ Require-Bundle:
 Export-Package: org.eclipse.jpt.common.ui.tests;x-internal:=true,
  org.eclipse.jpt.common.ui.tests.internal.jface;x-internal:=true,
  org.eclipse.jpt.common.ui.tests.internal.swt;x-internal:=true,
- org.eclipse.jpt.common.ui.tests.internal.util;x-internal:=true,
- org.eclipse.jpt.common.ui.tests.internal.utility.swt;x-internal:=true
+ org.eclipse.jpt.common.ui.tests.internal.swt.bindings;x-internal:=true,
+ org.eclipse.jpt.common.ui.tests.internal.util;x-internal:=true
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/BooleanStateControllerUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/BooleanStateControllerUITest.java
index a4b103d64c..470f03159c 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/BooleanStateControllerUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/BooleanStateControllerUITest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 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.
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.tests.internal.utility.swt;
+package org.eclipse.jpt.common.ui.tests.internal.swt.bindings;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
@@ -32,7 +32,8 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 
 /**
- * Play around with boolean state controllers ('enabled' and 'visible').
+ * Play around with <code>boolean</code> state controllers
+ * (<em>enabled</em> and <em>visible</em>).
  * <p>
  * Note the behavior of composites:<ul>
  * <li>When a composite is disabled, its children are disabled but <em>not</em>
@@ -45,10 +46,10 @@ import org.eclipse.swt.widgets.Shell;
 public class BooleanStateControllerUITest
 	extends ApplicationWindow
 {
-	private final ModifiablePropertyValueModel<Boolean> enabledHolder;
-	private final ModifiablePropertyValueModel<Boolean> visibleHolder;
-	private final SimpleListValueModel<String> listHolder;
-	private final ModifiablePropertyValueModel<String> listSelectionHolder;
+	private final ModifiablePropertyValueModel<Boolean> enabledModel;
+	private final ModifiablePropertyValueModel<Boolean> visibleModel;
+	private final SimpleListValueModel<String> listModel;
+	private final ModifiablePropertyValueModel<String> listSelectionModel;
 
 	public static void main(String[] args) throws Exception {
 		Window window = new BooleanStateControllerUITest(args);
@@ -60,13 +61,13 @@ public class BooleanStateControllerUITest
 
 	private BooleanStateControllerUITest(@SuppressWarnings("unused") String[] args) {
 		super(null);
-		this.enabledHolder = new SimplePropertyValueModel<Boolean>(Boolean.TRUE);
-		this.visibleHolder = new SimplePropertyValueModel<Boolean>(Boolean.TRUE);
-		this.listHolder = this.buildListHolder();
-		this.listSelectionHolder = new SimplePropertyValueModel<String>(null);
+		this.enabledModel = new SimplePropertyValueModel<Boolean>(Boolean.TRUE);
+		this.visibleModel = new SimplePropertyValueModel<Boolean>(Boolean.TRUE);
+		this.listModel = this.buildListModel();
+		this.listSelectionModel = new SimplePropertyValueModel<String>(null);
 	}
 
-	private SimpleListValueModel<String> buildListHolder() {
+	private SimpleListValueModel<String> buildListModel() {
 		SimpleListValueModel<String> result = new SimpleListValueModel<String>();
 		result.add("zero");
 		result.add("one");
@@ -113,16 +114,16 @@ public class BooleanStateControllerUITest
 		panel.setLayout(new FillLayout(SWT.HORIZONTAL));
 
 		Button enabledComboBoxCheckBox = this.buildEnabledComboBoxCheckBox(panel);
-		SWTBindingTools.bind(this.enabledHolder, enabledComboBoxCheckBox);
+		SWTBindingTools.bind(this.enabledModel, enabledComboBoxCheckBox);
 
 		Button visibleComboBoxCheckBox = this.buildVisibleComboBoxCheckBox(panel);
-		SWTBindingTools.bind(this.visibleHolder, visibleComboBoxCheckBox);
+		SWTBindingTools.bind(this.visibleModel, visibleComboBoxCheckBox);
 
 		Label comboBoxLabel = this.buildComboBoxLabel(panel);
 		Combo comboBox = this.buildComboBox(panel);
-		SWTBindingTools.bind(this.listHolder, this.listSelectionHolder, comboBox);
-		SWTBindingTools.controlEnabledState(this.enabledHolder, comboBoxLabel, comboBox);
-		SWTBindingTools.controlVisibleState(this.visibleHolder, comboBoxLabel, comboBox);
+		SWTBindingTools.bind(this.listModel, this.listSelectionModel, comboBox);
+		SWTBindingTools.bindEnabledState(this.enabledModel, comboBoxLabel, comboBox);
+		SWTBindingTools.bindVisibleState(this.visibleModel, comboBoxLabel, comboBox);
 	}
 
 	private Button buildEnabledComboBoxCheckBox(Composite parent) {
@@ -158,8 +159,8 @@ public class BooleanStateControllerUITest
 		this.buildCheckBox(panel, "three");
 		this.buildCheckBox(panel, "four");
 
-		SWTBindingTools.controlEnabledState(this.enabledHolder, panel, checkBox1);
-		SWTBindingTools.controlVisibleState(this.visibleHolder, panel);
+		SWTBindingTools.bindEnabledState(this.enabledModel, panel, checkBox1);
+		SWTBindingTools.bindVisibleState(this.visibleModel, panel);
 	}
 
 	private void buildControlPanel(Composite parent, Control widgetPanel) {
@@ -194,7 +195,7 @@ public class BooleanStateControllerUITest
 	}
 
 	void clearEnabledModel() {
-		this.enabledHolder.setValue(null);
+		this.enabledModel.setValue(null);
 	}
 
 	private void buildClearVisibleModelButton(Composite parent) {
@@ -213,7 +214,7 @@ public class BooleanStateControllerUITest
 	}
 
 	void clearVisibleModel() {
-		this.visibleHolder.setValue(null);
+		this.visibleModel.setValue(null);
 	}
 
 	private void buildNullSelectionModelButton(Composite parent) {
@@ -232,7 +233,7 @@ public class BooleanStateControllerUITest
 	}
 
 	void setSelectionModelNull() {
-		this.listSelectionHolder.setValue(null);
+		this.listSelectionModel.setValue(null);
 	}
 
 	private void buildNextButton(Composite parent) {
@@ -251,11 +252,11 @@ public class BooleanStateControllerUITest
 	}
 
 	void next() {
-		this.listSelectionHolder.setValue(this.getNextListSelection());
+		this.listSelectionModel.setValue(this.getNextListSelection());
 	}
 
 	private String getNextListSelection() {
-		return this.listHolder.get(this.getNextListSelectionIndex());
+		return this.listModel.get(this.getNextListSelectionIndex());
 	}
 
 	private int getNextListSelectionIndex() {
@@ -264,15 +265,14 @@ public class BooleanStateControllerUITest
 			return 0;
 		}
 		index++;
-		return (index == this.listHolder.size()) ? 0 : index;
+		return (index == this.listModel.size()) ? 0 : index;
 	}
 
 	private int getListSelectionIndex() {
-		return this.listHolder.indexOf(this.getListSelection());
+		return this.listModel.indexOf(this.getListSelection());
 	}
 
 	private String getListSelection() {
-		return this.listSelectionHolder.getValue();
+		return this.listSelectionModel.getValue();
 	}
-
 }
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/CheckBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
index 6747faa0b6..ac89c82025 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/CheckBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.tests.internal.utility.swt;
+package org.eclipse.jpt.common.ui.tests.internal.swt.bindings;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
@@ -41,10 +41,10 @@ public class CheckBoxModelBindingUITest
 	extends ApplicationWindow
 {
 	private final TestModel testModel;
-	private final ModifiablePropertyValueModel<TestModel> testModelHolder;
-	private final ModifiablePropertyValueModel<Boolean> flag1Holder;
-	private final ModifiablePropertyValueModel<Boolean> flag2Holder;
-	private final ModifiablePropertyValueModel<Boolean> notFlag2Holder;
+	private final ModifiablePropertyValueModel<TestModel> testModelModel;
+	private final ModifiablePropertyValueModel<Boolean> flag1Model;
+	private final ModifiablePropertyValueModel<Boolean> flag2Model;
+	private final ModifiablePropertyValueModel<Boolean> notFlag2Model;
 
 	public static void main(String[] args) throws Exception {
 		Window window = new CheckBoxModelBindingUITest(args);
@@ -57,14 +57,14 @@ public class CheckBoxModelBindingUITest
 	private CheckBoxModelBindingUITest(@SuppressWarnings("unused") String[] args) {
 		super(null);
 		this.testModel = new TestModel(true, true);
-		this.testModelHolder = new SimplePropertyValueModel<TestModel>(this.testModel);
-		this.flag1Holder = this.buildFlag1Holder(this.testModelHolder);
-		this.flag2Holder = this.buildFlag2Holder(this.testModelHolder);
-		this.notFlag2Holder = this.buildNotFlag2Holder(this.testModelHolder);
+		this.testModelModel = new SimplePropertyValueModel<TestModel>(this.testModel);
+		this.flag1Model = this.buildFlag1Model(this.testModelModel);
+		this.flag2Model = this.buildFlag2Model(this.testModelModel);
+		this.notFlag2Model = this.buildNotFlag2Model(this.testModelModel);
 	}
 
-	private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) {
-		return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG1_PROPERTY) {
+	private ModifiablePropertyValueModel<Boolean> buildFlag1Model(PropertyValueModel<TestModel> subjectModel) {
+		return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.FLAG1_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.isFlag1());
@@ -76,8 +76,8 @@ public class CheckBoxModelBindingUITest
 		};
 	}
 
-	private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
-		return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG2_PROPERTY) {
+	private ModifiablePropertyValueModel<Boolean> buildFlag2Model(PropertyValueModel<TestModel> subjectModel) {
+		return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.FLAG2_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.isFlag2());
@@ -89,8 +89,8 @@ public class CheckBoxModelBindingUITest
 		};
 	}
 
-	private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
-		return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.NOT_FLAG2_PROPERTY) {
+	private ModifiablePropertyValueModel<Boolean> buildNotFlag2Model(PropertyValueModel<TestModel> subjectModel) {
+		return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.NOT_FLAG2_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return Boolean.valueOf(this.subject.isNotFlag2());
@@ -135,19 +135,19 @@ public class CheckBoxModelBindingUITest
 	private void buildFlag1CheckBox(Composite parent) {
 		Button checkBox = new Button(parent, SWT.CHECK);
 		checkBox.setText("flag 1");
-		SWTBindingTools.bind(this.flag1Holder, checkBox);
+		SWTBindingTools.bind(this.flag1Model, checkBox);
 	}
 
 	private void buildFlag2CheckBox(Composite parent) {
 		Button checkBox = new Button(parent, SWT.CHECK);
 		checkBox.setText("flag 2");
-		SWTBindingTools.bind(this.flag2Holder, checkBox);
+		SWTBindingTools.bind(this.flag2Model, checkBox);
 	}
 
 	private void buildNotFlag2CheckBox(Composite parent) {
 		Button checkBox = new Button(parent, SWT.CHECK);
 		checkBox.setText("not flag 2");
-		SWTBindingTools.bind(this.notFlag2Holder, checkBox);
+		SWTBindingTools.bind(this.notFlag2Model, checkBox);
 	}
 
 	private void buildUnattachedCheckBox(Composite parent) {
@@ -206,7 +206,7 @@ public class CheckBoxModelBindingUITest
 	private void buildNotFlag2ToggleButton(Composite parent) {
 		Button checkBox = new Button(parent, SWT.TOGGLE);
 		checkBox.setText("not flag 2");
-		SWTBindingTools.bind(this.notFlag2Holder, checkBox);
+		SWTBindingTools.bind(this.notFlag2Model, checkBox);
 	}
 
 	private void buildClearModelButton(Composite parent) {
@@ -225,7 +225,7 @@ public class CheckBoxModelBindingUITest
 	}
 
 	void clearModel() {
-		this.testModelHolder.setValue(null);
+		this.testModelModel.setValue(null);
 	}
 
 	private void buildRestoreModelButton(Composite parent) {
@@ -244,7 +244,7 @@ public class CheckBoxModelBindingUITest
 	}
 
 	void restoreModel() {
-		this.testModelHolder.setValue(this.testModel);
+		this.testModelModel.setValue(this.testModel);
 	}
 
 	private void buildPrintModelButton(Composite parent) {
@@ -314,5 +314,4 @@ public class CheckBoxModelBindingUITest
 			return "TestModel(" + this.isFlag1() + " - " + this.isFlag2() + ")";
 		}
 	}
-
 }
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/DropDownListBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
index f69621ff78..fe720146bc 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/DropDownListBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2013 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.
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.tests.internal.utility.swt;
+package org.eclipse.jpt.common.ui.tests.internal.swt.bindings;
 
 import java.text.Collator;
 import java.util.ArrayList;
@@ -50,7 +50,7 @@ public class DropDownListBoxModelBindingUITest
 	extends ApplicationWindow
 {
 	final TaskList taskList;
-	private final ModifiablePropertyValueModel<TaskList> taskListHolder;
+	private final ModifiablePropertyValueModel<TaskList> taskListModel;
 	private Text taskTextField;
 
 	public static void main(String[] args) throws Exception {
@@ -64,7 +64,7 @@ public class DropDownListBoxModelBindingUITest
 	private DropDownListBoxModelBindingUITest(@SuppressWarnings("unused") String[] args) {
 		super(null);
 		this.taskList = new TaskList();
-		this.taskListHolder = new SimplePropertyValueModel<TaskList>(this.taskList);
+		this.taskListModel = new SimplePropertyValueModel<TaskList>(this.taskList);
 		this.taskList.addTask("swim");
 		this.taskList.addTask("bike");
 		this.taskList.addTask("run");
@@ -247,7 +247,7 @@ public class DropDownListBoxModelBindingUITest
 	}
 
 	private ListValueModel<String> buildPrimitiveTaskListAdapter() {
-		return new ListAspectAdapter<TaskList, String>(this.taskListHolder, TaskList.TASK_NAMES_LIST) {
+		return new ListAspectAdapter<TaskList, String>(this.taskListModel, TaskList.TASK_NAMES_LIST) {
 			@Override
 			protected ListIterator<String> listIterator_() {
 				return this.subject.taskNames();
@@ -256,7 +256,7 @@ public class DropDownListBoxModelBindingUITest
 	}
 
 	private ListValueModel<Task> buildObjectTaskListAdapter() {
-		return new ListAspectAdapter<TaskList, Task>(this.taskListHolder, TaskList.TASKS_LIST) {
+		return new ListAspectAdapter<TaskList, Task>(this.taskListModel, TaskList.TASKS_LIST) {
 			@Override
 			protected ListIterator<Task> listIterator_() {
 				return this.subject.tasks();
@@ -265,14 +265,14 @@ public class DropDownListBoxModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<Task> buildPriorityTaskAdapter() {
-		return new PriorityTaskAdapter(this.taskListHolder);
+		return new PriorityTaskAdapter(this.taskListModel);
 	}
 
 	static class PriorityTaskAdapter
 		extends PropertyAspectAdapter<TaskList, Task>
 	{
-		PriorityTaskAdapter(ModifiablePropertyValueModel<TaskList> taskListHolder) {
-			super(taskListHolder, TaskList.PRIORITY_TASK_PROPERTY);
+		PriorityTaskAdapter(ModifiablePropertyValueModel<TaskList> taskListModel) {
+			super(taskListModel, TaskList.PRIORITY_TASK_PROPERTY);
 		}
 		@Override
 		protected Task buildValue_() {
@@ -285,14 +285,14 @@ public class DropDownListBoxModelBindingUITest
 	}
 
 	private ModifiablePropertyValueModel<String> buildPriorityTaskNameAdapter() {
-		return new PriorityTaskNameAdapter(this.taskListHolder);
+		return new PriorityTaskNameAdapter(this.taskListModel);
 	}
 
 	static class PriorityTaskNameAdapter
 		extends PropertyAspectAdapter<TaskList, String>
 	{
-		PriorityTaskNameAdapter(ModifiablePropertyValueModel<TaskList> taskListHolder) {
-			super(taskListHolder, TaskList.PRIORITY_TASK_NAME_PROPERTY);
+		PriorityTaskNameAdapter(ModifiablePropertyValueModel<TaskList> taskListModel) {
+			super(taskListModel, TaskList.PRIORITY_TASK_NAME_PROPERTY);
 		}
 		@Override
 		protected String buildValue_() {
@@ -492,11 +492,11 @@ public class DropDownListBoxModelBindingUITest
 	}
 
 	void clearModel() {
-		this.taskListHolder.setValue(null);
+		this.taskListModel.setValue(null);
 	}
 
 	void restoreModel() {
-		this.taskListHolder.setValue(this.taskList);
+		this.taskListModel.setValue(this.taskList);
 	}
 
 	void changePriorityTask() {
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/ListBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ListBoxModelBindingUITest.java
index 19f7458284..aa892212d6 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/ListBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ListBoxModelBindingUITest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2013 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.
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.tests.internal.utility.swt;
+package org.eclipse.jpt.common.ui.tests.internal.swt.bindings;
 
 import java.text.Collator;
 import java.util.ArrayList;
@@ -23,6 +23,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.window.ApplicationWindow;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools;
+import org.eclipse.jpt.common.utility.internal.ComparatorAdapter;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
 import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
 import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter;
@@ -54,7 +55,7 @@ public class ListBoxModelBindingUITest
 	extends ApplicationWindow
 {
 	final TaskList taskList;
-	private final ModifiablePropertyValueModel<TaskList> taskListHolder;
+	private final ModifiablePropertyValueModel<TaskList> taskListModel;
 	private Text taskTextField;
 
 	public static void main(String[] args) throws Exception {
@@ -68,7 +69,7 @@ public class ListBoxModelBindingUITest
 	private ListBoxModelBindingUITest(@SuppressWarnings("unused") String[] args) {
 		super(null);
 		this.taskList = new TaskList();
-		this.taskListHolder = new SimplePropertyValueModel<TaskList>(this.taskList);
+		this.taskListModel = new SimplePropertyValueModel<TaskList>(this.taskList);
 		this.taskList.addTask("swim");
 		this.taskList.addTask("bike");
 		this.taskList.addTask("run");
@@ -227,7 +228,7 @@ public class ListBoxModelBindingUITest
 	}
 
 	private ListValueModel<String> buildPrimitiveTaskListAdapter() {
-		return new ListAspectAdapter<TaskList, String>(this.taskListHolder, TaskList.TASK_NAMES_LIST) {
+		return new ListAspectAdapter<TaskList, String>(this.taskListModel, TaskList.TASK_NAMES_LIST) {
 			@Override
 			protected ListIterator<String> listIterator_() {
 				return this.subject.taskNames();
@@ -236,7 +237,7 @@ public class ListBoxModelBindingUITest
 	}
 
 	private ListValueModel<Task> buildObjectTaskListAdapter() {
-		return new ListAspectAdapter<TaskList, Task>(this.taskListHolder, TaskList.TASKS_LIST) {
+		return new ListAspectAdapter<TaskList, Task>(this.taskListModel, TaskList.TASKS_LIST) {
 			@Override
 			protected ListIterator<Task> listIterator_() {
 				return this.subject.tasks();
@@ -245,15 +246,15 @@ public class ListBoxModelBindingUITest
 	}
 
 	private ModifiableCollectionValueModel<Task> buildPriorityTaskListAdapter() {
-		return new PriorityTaskListAdapter(this.taskListHolder);
+		return new PriorityTaskListAdapter(this.taskListModel);
 	}
 
 	static class PriorityTaskListAdapter
 		extends CollectionAspectAdapter<TaskList, Task>
 		implements ModifiableCollectionValueModel<Task>
 	{
-		PriorityTaskListAdapter(ModifiablePropertyValueModel<TaskList> taskListHolder) {
-			super(taskListHolder, TaskList.PRIORITY_TASKS_COLLECTION);
+		PriorityTaskListAdapter(ModifiablePropertyValueModel<TaskList> taskListModel) {
+			super(taskListModel, TaskList.PRIORITY_TASKS_COLLECTION);
 		}
 		@Override
 		protected Iterator<Task> iterator_() {
@@ -464,11 +465,11 @@ public class ListBoxModelBindingUITest
 	}
 
 	void clearModel() {
-		this.taskListHolder.setValue(null);
+		this.taskListModel.setValue(null);
 	}
 
 	void restoreModel() {
-		this.taskListHolder.setValue(this.taskList);
+		this.taskListModel.setValue(this.taskList);
 	}
 
 	void addPriorityTask() {
@@ -553,7 +554,10 @@ public class ListBoxModelBindingUITest
 
 	// ********** Task **********
 
-	public static class Task extends AbstractModel implements Displayable {
+	public static class Task
+		extends AbstractModel
+		implements Displayable
+	{
 		private String name;
 		private int instanceCount;
 		private static int INSTANCE_COUNT = 1;
@@ -581,8 +585,9 @@ public class ListBoxModelBindingUITest
 		}
 	}
 
-	public interface Displayable extends Model, Comparable<Displayable> {
-	
+	public interface Displayable
+		extends Model, Comparable<Displayable>
+	{
 		String displayString();
 			String DISPLAY_STRING_PROPERTY = "displayString";
 	
@@ -591,36 +596,34 @@ public class ListBoxModelBindingUITest
 	
 		Collator DEFAULT_COLLATOR = Collator.getInstance();
 	
-		Comparator<Displayable> DEFAULT_COMPARATOR =
-			new Comparator<Displayable>() {
-				public int compare(Displayable d1, Displayable d2) {
-					// disallow duplicates based on object identity
-					if (d1 == d2) {
-						return 0;
-					}
-	
-					// first compare display strings using the default collator
-					int result = DEFAULT_COLLATOR.compare(d1.displayString(), d2.displayString());
-					if (result != 0) {
-						return result;
-					}
-	
-					// then compare using object-id
-					result = System.identityHashCode(d1) - System.identityHashCode(d2);
-					if (result != 0) {
-						return result;
-					}
-	
-					// It's unlikely that we get to this point; but, just in case, we will return -1.
-					// Unfortunately, this introduces some mild unpredictability to the sort order
-					// (unless the objects are always passed into this method in the same order).
-					return -1;		// if all else fails, indicate that o1 < o2
+		Comparator<Displayable> DEFAULT_COMPARATOR = new DefaultComparator();
+		class DefaultComparator
+			extends ComparatorAdapter<Displayable>
+		{
+			@Override
+			public int compare(Displayable d1, Displayable d2) {
+				// disallow duplicates based on object identity
+				if (d1 == d2) {
+					return 0;
 				}
-				@Override
-				public String toString() {
-					return "Displayable.DEFAULT_COMPARATOR";
+
+				// first compare display strings using the default collator
+				int result = DEFAULT_COLLATOR.compare(d1.displayString(), d2.displayString());
+				if (result != 0) {
+					return result;
 				}
-			};
-	
+
+				// then compare using object-id
+				result = System.identityHashCode(d1) - System.identityHashCode(d2);
+				if (result != 0) {
+					return result;
+				}
+
+				// It's unlikely that we get to this point; but, just in case, we will return -1.
+				// Unfortunately, this introduces some mild unpredictability to the sort order
+				// (unless the objects are always passed into this method in the same order).
+				return -1;		// if all else fails, indicate that o1 < o2
+			}
+		}
 	}
 }
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/TextFieldModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
index 1056da39a2..ca8080431b 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/TextFieldModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2013 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.
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.tests.internal.utility.swt;
+package org.eclipse.jpt.common.ui.tests.internal.swt.bindings;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
@@ -40,9 +40,9 @@ public class TextFieldModelBindingUITest
 {
 	private final TestModel testModel;
 		private static final String DEFAULT_NAME = "Scooby Doo";
-	private final ModifiablePropertyValueModel<TestModel> testModelHolder;
-	private final ModifiablePropertyValueModel<String> nameHolder;
-	private final ModifiablePropertyValueModel<String> allCapsNameHolder;
+	private final ModifiablePropertyValueModel<TestModel> testModelModel;
+	private final ModifiablePropertyValueModel<String> nameModel;
+	private final ModifiablePropertyValueModel<String> allCapsNameModel;
 
 
 	public static void main(String[] args) throws Exception {
@@ -56,12 +56,12 @@ public class TextFieldModelBindingUITest
 	private TextFieldModelBindingUITest() {
 		super(null);
 		this.testModel = new TestModel(DEFAULT_NAME);
-		this.testModelHolder = new SimplePropertyValueModel<TestModel>(this.testModel);
-		this.nameHolder = this.buildNameHolder(this.testModelHolder);
-		this.allCapsNameHolder = this.buildAllCapsNameHolder(this.testModelHolder);
+		this.testModelModel = new SimplePropertyValueModel<TestModel>(this.testModel);
+		this.nameModel = this.buildNameModel(this.testModelModel);
+		this.allCapsNameModel = this.buildAllCapsNameModel(this.testModelModel);
 	}
 
-	private ModifiablePropertyValueModel<String> buildNameHolder(PropertyValueModel<TestModel> vm) {
+	private ModifiablePropertyValueModel<String> buildNameModel(PropertyValueModel<TestModel> vm) {
 		return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
 			@Override
 			protected String buildValue_() {
@@ -74,7 +74,7 @@ public class TextFieldModelBindingUITest
 		};
 	}
 
-	private ModifiablePropertyValueModel<String> buildAllCapsNameHolder(PropertyValueModel<TestModel> vm) {
+	private ModifiablePropertyValueModel<String> buildAllCapsNameModel(PropertyValueModel<TestModel> vm) {
 		return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
 			@Override
 			protected String buildValue_() {
@@ -118,19 +118,19 @@ public class TextFieldModelBindingUITest
 
 	private void buildNameTextField(Composite parent) {
 		Text textField = new Text(parent, SWT.SINGLE);
-		SWTBindingTools.bind(this.nameHolder, textField);
+		SWTBindingTools.bind(this.nameModel, textField);
 	}
 
 	private void buildReadOnlyNameTextField(Composite parent) {
 		Text textField = new Text(parent, SWT.SINGLE);
 		textField.setEnabled(false);
-		SWTBindingTools.bind(this.nameHolder, textField);
+		SWTBindingTools.bind(this.nameModel, textField);
 	}
 
 	private void buildAllCapsNameTextField(Composite parent) {
 		Text textField = new Text(parent, SWT.SINGLE);
 		textField.setEnabled(false);
-		SWTBindingTools.bind(this.allCapsNameHolder, textField);
+		SWTBindingTools.bind(this.allCapsNameModel, textField);
 	}
 
 	private void buildControlPanel(Composite parent, Control checkBoxPanel) {
@@ -184,7 +184,7 @@ public class TextFieldModelBindingUITest
 	}
 
 	void clearModel() {
-		this.testModelHolder.setValue(null);
+		this.testModelModel.setValue(null);
 	}
 
 	private void buildRestoreModelButton(Composite parent) {
@@ -203,7 +203,7 @@ public class TextFieldModelBindingUITest
 	}
 
 	void restoreModel() {
-		this.testModelHolder.setValue(this.testModel);
+		this.testModelModel.setValue(this.testModel);
 	}
 
 	private void buildPrintModelButton(Composite parent) {
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlEnablerTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlEnablerTest.java
index e995bd284e..3577b1e10a 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlEnablerTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlEnablerTest.java
@@ -47,7 +47,7 @@ public final class ControlEnablerTest {
 
 		Combo combo = new Combo(parent, SWT.BORDER);
 
-		SWTBindingTools.controlEnabledState(booleanHolder, combo);
+		SWTBindingTools.bindEnabledState(booleanHolder, combo);
 
 		assertTrue(
 			"The Combo should be enabled",
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlVisibilityEnablerTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlVisibilityEnablerTest.java
index fe69d50412..ea1a1cdaa7 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlVisibilityEnablerTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/ControlVisibilityEnablerTest.java
@@ -47,7 +47,7 @@ public final class ControlVisibilityEnablerTest {
 
 		Combo combo = new Combo(parent, SWT.BORDER);
 
-		SWTBindingTools.controlVisibleState(booleanHolder, combo);
+		SWTBindingTools.bindVisibleState(booleanHolder, combo);
 
 		assertTrue(
 			"The Combo should be visible",
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/SectionExpanderTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/SectionExpanderTest.java
index e9608e88f8..34f01081e7 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/SectionExpanderTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/SectionExpanderTest.java
@@ -49,7 +49,7 @@ public final class SectionExpanderTest {
 
 		Section section = new Section(this.parent, ExpandableComposite.TWISTIE);
 
-		SWTBindingTools.controlExpandedState(booleanModel, section);
+		SWTBindingTools.bindExpandedState(booleanModel, section);
 
 		assertFalse(
 			"The Section should not be expanded",