Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-07-15 21:41:48 +0000
committerBrian Vosburgh2017-05-18 22:38:07 +0000
commit9f7381368b8b5df01ae18db6d6d7dbb1870298e8 (patch)
tree15923bf87d748dfa68bf9015bfd3430d02051579 /common/tests
parente1e4c493ef0591c32eac76d28490b3178c556d07 (diff)
downloadwebtools.dali-9f7381368b8b5df01ae18db6d6d7dbb1870298e8.tar.gz
webtools.dali-9f7381368b8b5df01ae18db6d6d7dbb1870298e8.tar.xz
webtools.dali-9f7381368b8b5df01ae18db6d6d7dbb1870298e8.zip
rename PropertyAspectAdapter in preparation to replace it
Diffstat (limited to 'common/tests')
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java6
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java8
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java8
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java8
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java6
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java6
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java8
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java12
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java8
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java8
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java16
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java16
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java4
19 files changed, 69 insertions, 69 deletions
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java
index 9ddaa04d95..0f46ade82f 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java
@@ -36,7 +36,7 @@ import org.eclipse.jpt.common.ui.jface.ItemStructuredContentProvider;
import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider;
import org.eclipse.jpt.common.ui.jface.TreeStateProvider;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
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.model.event.PropertyChangeEvent;
@@ -346,7 +346,7 @@ public class TreeLabelProviderUiTest
}
/* CU private */ static PropertyValueModel<ImageDescriptor> buildImageDescriptorModel(Vehicle vehicle) {
- return new PropertyAspectAdapter<Vehicle, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(vehicle), IMAGE_ASPECT_NAMES) {
+ return new PropertyAspectAdapterXXXX<Vehicle, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(vehicle), IMAGE_ASPECT_NAMES) {
@Override
protected ImageDescriptor buildValue_() {
return this.subject.getImageDescriptor();
@@ -361,7 +361,7 @@ public class TreeLabelProviderUiTest
};
/* CU private */ static PropertyValueModel<String> buildTextModel(Vehicle vehicle) {
- return new PropertyAspectAdapter<Vehicle, String>(PropertyValueModelTools.staticPropertyValueModel(vehicle), TEXT_ASPECT_NAMES) {
+ return new PropertyAspectAdapterXXXX<Vehicle, String>(PropertyValueModelTools.staticPropertyValueModel(vehicle), TEXT_ASPECT_NAMES) {
@Override
protected String buildValue_() {
return this.subject.getColor().getDescription() + ' ' + this.subject.getVehicleType().getDescription();
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java
index d46ec61229..df36529c36 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.common.ui.internal.swt.AbstractComboModelAdapter.Selectio
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter;
@@ -82,7 +82,7 @@ public abstract class AbstractComboModelAdapterTest {
}
private ModifiablePropertyValueModel<SimpleDisplayable> buildSelectedItemHolder() {
- return new PropertyAspectAdapter<Model, SimpleDisplayable>(subjectHolder, Model.ITEM_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Model, SimpleDisplayable>(subjectHolder, Model.ITEM_PROPERTY) {
@Override
protected SimpleDisplayable buildValue_() {
return subject.getItem();
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java
index 205d5bb425..abf926ab60 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import org.eclipse.jpt.common.ui.internal.swt.SpinnerModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
@@ -37,7 +37,7 @@ public class SpinnerModelAdapterTest {
}
private ModifiablePropertyValueModel<Integer> buildValueHolder() {
- return new PropertyAspectAdapter<Model, Integer>(subjectHolder, Model.VALUE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Model, Integer>(subjectHolder, Model.VALUE_PROPERTY) {
@Override
protected Integer buildValue_() {
return subject.getValue();
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java
index 84f6690a1d..afc35366cf 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java
@@ -23,7 +23,7 @@ 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.model.AbstractModel;
import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyCollectionValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
@@ -1074,7 +1074,7 @@ public class TableModelAdapterTest {
static final int TITLE_COLUMN = 1;
private ModifiablePropertyValueModel<String> buildManagerHolder(Employee subject) {
- return new PropertyAspectAdapter<Employee, String>(Employee.MANAGER_PROPERTY, subject) {
+ return new PropertyAspectAdapterXXXX<Employee, String>(Employee.MANAGER_PROPERTY, subject) {
@Override
protected String buildValue_() {
return subject.getManager();
@@ -1088,7 +1088,7 @@ public class TableModelAdapterTest {
}
private ModifiablePropertyValueModel<String> buildNameHolder(Employee subject) {
- return new PropertyAspectAdapter<Employee, String>(Employee.NAME_PROPERTY, subject) {
+ return new PropertyAspectAdapterXXXX<Employee, String>(Employee.NAME_PROPERTY, subject) {
@Override
protected String buildValue_() {
return subject.getName();
@@ -1102,7 +1102,7 @@ public class TableModelAdapterTest {
}
private ModifiablePropertyValueModel<String> buildTitleHolder(Employee subject) {
- return new PropertyAspectAdapter<Employee, String>(Employee.TITLE_PROPERTY, subject) {
+ return new PropertyAspectAdapterXXXX<Employee, String>(Employee.TITLE_PROPERTY, subject) {
@Override
protected String buildValue_() {
return subject.getTitle();
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java
index da655feafa..53f7fb2936 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.common.ui.internal.swt.TriStateCheckBoxModelAdapter;
import org.eclipse.jpt.common.ui.internal.widgets.DefaultWidgetFactory;
import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -65,7 +65,7 @@ public class TriStateCheckBoxModelAdapterUITest
}
private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) {
- return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG1_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectHolder, TestModel.FLAG1_PROPERTY) {
@Override
protected Boolean buildValue_() {
return this.subject.isFlag1();
@@ -78,7 +78,7 @@ public class TriStateCheckBoxModelAdapterUITest
}
private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
- return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG2_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectHolder, TestModel.FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
return this.subject.isFlag2();
@@ -91,7 +91,7 @@ public class TriStateCheckBoxModelAdapterUITest
}
private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
- return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.NOT_FLAG2_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectHolder, TestModel.NOT_FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
return this.subject.isNotFlag2();
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 ac89c82025..2252a5ee92 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
@@ -16,7 +16,7 @@ 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.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -64,7 +64,7 @@ public class CheckBoxModelBindingUITest
}
private ModifiablePropertyValueModel<Boolean> buildFlag1Model(PropertyValueModel<TestModel> subjectModel) {
- return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.FLAG1_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectModel, TestModel.FLAG1_PROPERTY) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isFlag1());
@@ -77,7 +77,7 @@ public class CheckBoxModelBindingUITest
}
private ModifiablePropertyValueModel<Boolean> buildFlag2Model(PropertyValueModel<TestModel> subjectModel) {
- return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.FLAG2_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectModel, TestModel.FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isFlag2());
@@ -90,7 +90,7 @@ public class CheckBoxModelBindingUITest
}
private ModifiablePropertyValueModel<Boolean> buildNotFlag2Model(PropertyValueModel<TestModel> subjectModel) {
- return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.NOT_FLAG2_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectModel, TestModel.NOT_FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isNotFlag2());
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
index ca11d5a0fa..a4c94e47ec 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools;
import org.eclipse.jpt.common.utility.internal.ArrayTools;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
@@ -103,7 +103,7 @@ public class ComboBoxModelBindingUITest
}
private static class NameModel
- extends PropertyAspectAdapter<TestModel, String>
+ extends PropertyAspectAdapterXXXX<TestModel, String>
{
NameModel(PropertyValueModel<TestModel> vm) {
super(vm, TestModel.NAME_PROPERTY);
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
index 130203923c..734211c9d1 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools;
import org.eclipse.jpt.common.utility.internal.comparator.ComparatorAdapter;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelWrapper;
import org.eclipse.jpt.common.utility.model.Model;
@@ -270,7 +270,7 @@ public class DropDownListBoxModelBindingUITest
}
static class PriorityTaskAdapter
- extends PropertyAspectAdapter<TaskList, Task>
+ extends PropertyAspectAdapterXXXX<TaskList, Task>
{
PriorityTaskAdapter(ModifiablePropertyValueModel<TaskList> taskListModel) {
super(taskListModel, TaskList.PRIORITY_TASK_PROPERTY);
@@ -290,7 +290,7 @@ public class DropDownListBoxModelBindingUITest
}
static class PriorityTaskNameAdapter
- extends PropertyAspectAdapter<TaskList, String>
+ extends PropertyAspectAdapterXXXX<TaskList, String>
{
PriorityTaskNameAdapter(ModifiablePropertyValueModel<TaskList> taskListModel) {
super(taskListModel, TaskList.PRIORITY_TASK_NAME_PROPERTY);
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
index 4746f00b1f..8efaa3b90c 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java
@@ -16,7 +16,7 @@ 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.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -62,7 +62,7 @@ public class TextFieldModelBindingUITest
}
private ModifiablePropertyValueModel<String> buildNameModel(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.name();
@@ -75,7 +75,7 @@ public class TextFieldModelBindingUITest
}
private ModifiablePropertyValueModel<String> buildAllCapsNameModel(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.name().toUpperCase();
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java
index bf831c5293..2b35efe9fc 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.common.utility.Association;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
import org.eclipse.jpt.common.utility.internal.model.value.BufferedPropertyValueModelAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
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.model.event.PropertyChangeEvent;
@@ -78,7 +78,7 @@ public class BufferedPropertyValueModelTests
}
private ModifiablePropertyValueModel<Integer> buildIDModel(PropertyValueModel<Employee> eHolder) {
- return new PropertyAspectAdapter<Employee, Integer>(eHolder, Employee.ID_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Employee, Integer>(eHolder, Employee.ID_PROPERTY) {
@Override
protected Integer buildValue_() {
return new Integer(this.subject.getID());
@@ -91,7 +91,7 @@ public class BufferedPropertyValueModelTests
}
private ModifiablePropertyValueModel<String> buildNameModel(PropertyValueModel<Employee> eHolder) {
- return new PropertyAspectAdapter<Employee, String>(eHolder, Employee.NAME_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Employee, String>(eHolder, Employee.NAME_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getName();
@@ -104,7 +104,7 @@ public class BufferedPropertyValueModelTests
}
private ModifiablePropertyValueModel<Date> buildHireDateModel(PropertyValueModel<Employee> eHolder) {
- return new PropertyAspectAdapter<Employee, Date>(eHolder, Employee.HIRE_DATE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Employee, Date>(eHolder, Employee.HIRE_DATE_PROPERTY) {
@Override
protected Date buildValue_() {
return this.subject.getHireDate();
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
index 6f5eaca4ba..252e6ed62c 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.common.utility.tests.internal.model.value;
import junit.framework.TestCase;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
import org.eclipse.jpt.common.utility.model.listener.ChangeAdapter;
@@ -26,7 +26,7 @@ import org.eclipse.jpt.common.utility.tests.internal.TestTools;
public class PropertyAspectAdapterTests extends TestCase {
private TestSubject subject1;
private ModifiablePropertyValueModel<TestSubject> subjectHolder1;
- private PropertyAspectAdapter<TestSubject, String> aa1;
+ private PropertyAspectAdapterXXXX<TestSubject, String> aa1;
private PropertyChangeEvent event1;
private PropertyChangeListener listener1;
@@ -54,8 +54,8 @@ public class PropertyAspectAdapterTests extends TestCase {
this.subject2 = new TestSubject("bar", "test subject 2");
}
- private PropertyAspectAdapter<TestSubject, String> buildAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) {
- return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) {
+ private PropertyAspectAdapterXXXX<TestSubject, String> buildAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) {
+ return new PropertyAspectAdapterXXXX<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) {
// this is not a aspect adapter - the value is determined by the aspect name
@Override
protected String buildValue_() {
@@ -228,7 +228,7 @@ public class PropertyAspectAdapterTests extends TestCase {
}
private ModifiablePropertyValueModel<String> buildMultipleAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) {
- return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY, TestSubject.DESCRIPTION_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY, TestSubject.DESCRIPTION_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getName() + ":" + this.subject.getDescription();
@@ -290,7 +290,7 @@ public class PropertyAspectAdapterTests extends TestCase {
}
private ModifiablePropertyValueModel<String> buildCustomAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) {
- return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) {
@Override
protected String buildValue() {
return (this.subject == null) ? "<unnamed>" : this.subject.getName();
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 91faa42d64..4f26f980ed 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
@@ -27,7 +27,7 @@ import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.WindowConstants;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
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.model.value.PropertyValueModel;
@@ -69,7 +69,7 @@ public class CheckBoxModelAdapterUITest {
}
private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, Boolean>(vm, TestModel.FLAG1_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(vm, TestModel.FLAG1_PROPERTY) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isFlag1());
@@ -82,7 +82,7 @@ public class CheckBoxModelAdapterUITest {
}
private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, Boolean>(vm, TestModel.FLAG2_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(vm, TestModel.FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isFlag2());
@@ -95,7 +95,7 @@ public class CheckBoxModelAdapterUITest {
}
private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, Boolean>(vm, TestModel.NOT_FLAG2_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Boolean>(vm, TestModel.NOT_FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isNotFlag2());
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java
index c337c168ab..f0165f92a9 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java
@@ -32,7 +32,7 @@ import javax.swing.WindowConstants;
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.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.swing.ComboBoxModelAdapter;
@@ -84,7 +84,7 @@ public class ComboBoxModelAdapterUITest {
}
private ModifiablePropertyValueModel<Object> buildColorHolder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, Object>(vm, TestModel.COLOR_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Object>(vm, TestModel.COLOR_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getColor();
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java
index 5347191b57..20e55ab305 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java
@@ -29,7 +29,7 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.PlainDocument;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.swing.DocumentAdapter;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -66,7 +66,7 @@ public class DocumentAdapterUITest {
}
private ModifiablePropertyValueModel<String> buildNameHolder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getName();
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java
index 9af086f626..f9637a609f 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java
@@ -28,7 +28,7 @@ import javax.swing.WindowConstants;
import org.eclipse.jpt.common.utility.internal.ArrayTools;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.swing.RadioButtonModelAdapter;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -67,7 +67,7 @@ public class RadioButtonModelAdapterUITest {
}
private ModifiablePropertyValueModel<String> buildColorModel(PropertyValueModel<ColoredThing> ctm) {
- return new PropertyAspectAdapter<ColoredThing, String>(ctm, ColoredThing.COLOR_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<ColoredThing, String>(ctm, ColoredThing.COLOR_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getColor();
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java
index 0d18f92b6d..af0e389cea 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java
@@ -30,7 +30,7 @@ import javax.swing.WindowConstants;
import org.eclipse.jpt.common.utility.internal.ArrayTools;
import org.eclipse.jpt.common.utility.internal.model.AbstractModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.swing.DateSpinnerModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.swing.ListSpinnerModelAdapter;
@@ -82,7 +82,7 @@ public class SpinnerModelAdapterUITest {
}
private ModifiablePropertyValueModel<Object> buildBirthDateHolder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, Object>(vm, TestModel.BIRTH_DATE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Object>(vm, TestModel.BIRTH_DATE_PROPERTY) {
@Override
protected Object buildValue_() {
return this.subject.getBirthDate();
@@ -99,7 +99,7 @@ public class SpinnerModelAdapterUITest {
}
private ModifiablePropertyValueModel<Number> buildAgeHolder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, Number>(vm, TestModel.AGE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Number>(vm, TestModel.AGE_PROPERTY) {
@Override
protected Number buildValue_() {
return new Integer(this.subject.getAge());
@@ -116,7 +116,7 @@ public class SpinnerModelAdapterUITest {
}
private ModifiablePropertyValueModel<Object> buildEyeColorHolder(PropertyValueModel<TestModel> vm) {
- return new PropertyAspectAdapter<TestModel, Object>(vm, TestModel.EYE_COLOR_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<TestModel, Object>(vm, TestModel.EYE_COLOR_PROPERTY) {
@Override
protected Object buildValue_() {
return this.subject.getEyeColor();
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 00f0b39ca9..82f21202a9 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,7 +26,7 @@ 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.value.CollectionAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
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.transformer.TransformerAdapter;
@@ -316,7 +316,7 @@ public class TableModelAdapterTests
}
private ModifiablePropertyValueModel<Object> buildNameAdapter(Person person) {
- return new PropertyAspectAdapter<Person, Object>(Person.NAME_PROPERTY, person) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(Person.NAME_PROPERTY, person) {
@Override
protected String buildValue_() {
return this.subject.getName();
@@ -329,7 +329,7 @@ public class TableModelAdapterTests
}
private ModifiablePropertyValueModel<Object> buildBirthDateAdapter(Person person) {
- return new PropertyAspectAdapter<Person, Object>(Person.BIRTH_DATE_PROPERTY, person) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(Person.BIRTH_DATE_PROPERTY, person) {
@Override
protected Date buildValue_() {
return this.subject.getBirthDate();
@@ -342,7 +342,7 @@ public class TableModelAdapterTests
}
private ModifiablePropertyValueModel<Object> buildGoneWestDateAdapter(Person person) {
- return new PropertyAspectAdapter<Person, Object>(Person.GONE_WEST_DATE_PROPERTY, person) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(Person.GONE_WEST_DATE_PROPERTY, person) {
@Override
protected Date buildValue_() {
return this.subject.getGoneWestDate();
@@ -355,7 +355,7 @@ public class TableModelAdapterTests
}
private ModifiablePropertyValueModel<Object> buildEyeColorAdapter(Person person) {
- return new PropertyAspectAdapter<Person, Object>(Person.EYE_COLOR_PROPERTY, person) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(Person.EYE_COLOR_PROPERTY, person) {
@Override
protected String buildValue_() {
return this.subject.getEyeColor();
@@ -368,7 +368,7 @@ public class TableModelAdapterTests
}
private ModifiablePropertyValueModel<Object> buildEvilAdapter(Person person) {
- return new PropertyAspectAdapter<Person, Object>(Person.EVIL_PROPERTY, person) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(Person.EVIL_PROPERTY, person) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isEvil());
@@ -381,7 +381,7 @@ public class TableModelAdapterTests
}
private ModifiablePropertyValueModel<Object> buildRankAdapter(Person person) {
- return new PropertyAspectAdapter<Person, Object>(Person.RANK_PROPERTY, person) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(Person.RANK_PROPERTY, person) {
@Override
protected Integer buildValue_() {
return new Integer(this.subject.getRank());
@@ -394,7 +394,7 @@ public class TableModelAdapterTests
}
private ModifiablePropertyValueModel<Object> buildAdventureCountAdapter(Person person) {
- return new PropertyAspectAdapter<Person, Object>(Person.ADVENTURE_COUNT_PROPERTY, person) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(Person.ADVENTURE_COUNT_PROPERTY, person) {
@Override
protected Integer buildValue_() {
return new Integer(this.subject.getAdventureCount());
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 36695cc343..5038bcd530 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
@@ -48,7 +48,7 @@ import javax.swing.text.Document;
import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools;
import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelWrapper;
@@ -531,7 +531,7 @@ public class TableModelAdapterUITest {
}
private ModifiablePropertyValueModel<String> buildNameAdapter() {
- return new PropertyAspectAdapter<Person, String>(this.selectedPersonHolder, Person.NAME_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Person, String>(this.selectedPersonHolder, Person.NAME_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getName();
@@ -555,7 +555,7 @@ public class TableModelAdapterUITest {
}
private ModifiablePropertyValueModel<Object> buildBirthDateAdapter() {
- return new PropertyAspectAdapter<Person, Object>(this.selectedPersonHolder, Person.BIRTH_DATE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(this.selectedPersonHolder, Person.BIRTH_DATE_PROPERTY) {
@Override
protected Date buildValue_() {
return this.subject.getBirthDate();
@@ -579,7 +579,7 @@ public class TableModelAdapterUITest {
}
private ModifiablePropertyValueModel<Object> buildGoneWestDateAdapter() {
- return new PropertyAspectAdapter<Person, Object>(this.selectedPersonHolder, Person.GONE_WEST_DATE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(this.selectedPersonHolder, Person.GONE_WEST_DATE_PROPERTY) {
@Override
protected Date buildValue_() {
return this.subject.getGoneWestDate();
@@ -603,7 +603,7 @@ public class TableModelAdapterUITest {
}
private ModifiablePropertyValueModel<Object> buildEyeColorAdapter() {
- return new PropertyAspectAdapter<Person, Object>(this.selectedPersonHolder, Person.EYE_COLOR_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Person, Object>(this.selectedPersonHolder, Person.EYE_COLOR_PROPERTY) {
@Override
protected Object buildValue_() {
return this.subject.getEyeColor();
@@ -630,7 +630,7 @@ public class TableModelAdapterUITest {
}
private ModifiablePropertyValueModel<Boolean> buildEvilAdapter() {
- return new PropertyAspectAdapter<Person, Boolean>(this.selectedPersonHolder, Person.EVIL_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Person, Boolean>(this.selectedPersonHolder, Person.EVIL_PROPERTY) {
@Override
protected Boolean buildValue_() {
return Boolean.valueOf(this.subject.isEvil());
@@ -654,7 +654,7 @@ public class TableModelAdapterUITest {
}
private ModifiablePropertyValueModel<Number> buildRankAdapter() {
- return new PropertyAspectAdapter<Person, Number>(this.selectedPersonHolder, Person.RANK_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Person, Number>(this.selectedPersonHolder, Person.RANK_PROPERTY) {
@Override
protected Number buildValue_() {
return new Integer(this.subject.getRank());
@@ -678,7 +678,7 @@ public class TableModelAdapterUITest {
}
private ModifiablePropertyValueModel<Number> buildAdventureCountAdapter() {
- return new PropertyAspectAdapter<Person, Number>(this.selectedPersonHolder, Person.ADVENTURE_COUNT_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Person, Number>(this.selectedPersonHolder, Person.ADVENTURE_COUNT_PROPERTY) {
@Override
protected Number buildValue_() {
return new Integer(this.subject.getAdventureCount());
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java
index 2724f9c2e3..a53ecf8dd7 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.AbstractTreeNodeValue
import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.NullListValueModel;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
@@ -714,7 +714,7 @@ public class TreeModelAdapterTests extends TestCase {
};
}
protected ModifiablePropertyValueModel<String> buildNameAdapter() {
- return new PropertyAspectAdapter<TestModel, String>(TestModel.NAME_PROPERTY, this.getTestModel()) {
+ return new PropertyAspectAdapterXXXX<TestModel, String>(TestModel.NAME_PROPERTY, this.getTestModel()) {
@Override
protected String buildValue_() {
return this.subject.getName();

Back to the top