Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbvosburgh2012-02-17 19:04:33 -0500
committerbvosburgh2012-02-17 19:04:33 -0500
commitd5211463c954c3df2234e0f82ba01a650c1d0242 (patch)
tree0fd2cf90e2a9453a43feff1e66f56acc83b4a0ef /common/tests/org.eclipse.jpt.common.ui.tests
parent6db06e9a47c3fb81d33d4385761a25e382963fc7 (diff)
downloadwebtools.dali-d5211463c954c3df2234e0f82ba01a650c1d0242.tar.gz
webtools.dali-d5211463c954c3df2234e0f82ba01a650c1d0242.tar.xz
webtools.dali-d5211463c954c3df2234e0f82ba01a650c1d0242.zip
rename ValueModels to Modifiable* from Writable*
Diffstat (limited to 'common/tests/org.eclipse.jpt.common.ui.tests')
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java16
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java22
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java42
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java18
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/LabeledControlUpdaterTest.java12
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/BooleanStateControllerUITest.java10
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/CheckBoxModelBindingUITest.java18
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/DropDownListBoxModelBindingUITest.java16
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/ListBoxModelBindingUITest.java16
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/utility/swt/TextFieldModelBindingUITest.java14
12 files changed, 96 insertions, 96 deletions
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
index e390adfc97..74891f3a08 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingLabelProviderUiTest.java
@@ -38,7 +38,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueMo
import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -59,7 +59,7 @@ public class DelegatingLabelProviderUiTest extends ApplicationWindow
{
private TreeViewer tree;
- private WritablePropertyValueModel<Vehicle> selectedVehicle;
+ private ModifiablePropertyValueModel<Vehicle> selectedVehicle;
public static void main(String[] args) {
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
index dae068f2d6..fb8abd7edb 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/DelegatingTreeContentProviderUiTest.java
@@ -45,7 +45,7 @@ import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
@@ -62,7 +62,7 @@ public class DelegatingTreeContentProviderUiTest extends ApplicationWindow
{
private final Root root;
- private WritablePropertyValueModel<TreeNode> selectedNode;
+ private ModifiablePropertyValueModel<TreeNode> selectedNode;
private TreeViewer controlTree;
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 d987d9e3eb..56940203ea 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 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.
@@ -30,7 +30,7 @@ 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.swing.SimpleDisplayable;
import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.junit.After;
@@ -41,9 +41,9 @@ import org.junit.Test;
public abstract class AbstractComboModelAdapterTest {
private Model model;
- private WritablePropertyValueModel<SimpleDisplayable> selectedItemHolder;
+ private ModifiablePropertyValueModel<SimpleDisplayable> selectedItemHolder;
private Shell shell;
- private WritablePropertyValueModel<Model> subjectHolder;
+ private ModifiablePropertyValueModel<Model> subjectHolder;
protected abstract AbstractComboModelAdapter<SimpleDisplayable> buildEditableComboModelAdapter();
@@ -77,7 +77,7 @@ public abstract class AbstractComboModelAdapterTest {
return new SimpleDisplayable("baz");
}
- private WritablePropertyValueModel<SimpleDisplayable> buildSelectedItemHolder() {
+ private ModifiablePropertyValueModel<SimpleDisplayable> buildSelectedItemHolder() {
return new PropertyAspectAdapter<Model, SimpleDisplayable>(subjectHolder, Model.ITEM_PROPERTY) {
@Override
protected SimpleDisplayable buildValue_() {
@@ -99,7 +99,7 @@ public abstract class AbstractComboModelAdapterTest {
};
}
- private WritablePropertyValueModel<Model> buildSubjectHolder() {
+ private ModifiablePropertyValueModel<Model> buildSubjectHolder() {
return new SimplePropertyValueModel<Model>();
}
@@ -120,7 +120,7 @@ public abstract class AbstractComboModelAdapterTest {
c.add(new SimpleDisplayable("jaz"));
}
- protected final WritablePropertyValueModel<SimpleDisplayable> selectedItemHolder() {
+ protected final ModifiablePropertyValueModel<SimpleDisplayable> selectedItemHolder() {
return selectedItemHolder;
}
@@ -137,7 +137,7 @@ public abstract class AbstractComboModelAdapterTest {
return shell;
}
- protected final WritablePropertyValueModel<Model> subjectHolder() {
+ protected final ModifiablePropertyValueModel<Model> subjectHolder() {
return subjectHolder;
}
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 f8792a4e5f..205d5bb425 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -16,7 +16,7 @@ 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.SimplePropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
@@ -30,13 +30,13 @@ public class SpinnerModelAdapterTest {
private Model model;
private Shell shell;
- private WritablePropertyValueModel<Model> subjectHolder;
+ private ModifiablePropertyValueModel<Model> subjectHolder;
- private WritablePropertyValueModel<Model> buildSubjectHolder() {
+ private ModifiablePropertyValueModel<Model> buildSubjectHolder() {
return new SimplePropertyValueModel<Model>();
}
- private WritablePropertyValueModel<Integer> buildValueHolder() {
+ private ModifiablePropertyValueModel<Integer> buildValueHolder() {
return new PropertyAspectAdapter<Model, Integer>(subjectHolder, Model.VALUE_PROPERTY) {
@Override
protected Integer buildValue_() {
@@ -78,7 +78,7 @@ public class SpinnerModelAdapterTest {
subjectHolder.setValue(model);
Spinner spinner = new Spinner(shell, SWT.NULL);
- WritablePropertyValueModel<Integer> numberHolder = buildValueHolder();
+ ModifiablePropertyValueModel<Integer> numberHolder = buildValueHolder();
int defaultValue = 1;
SpinnerModelAdapter.adapt(
@@ -121,7 +121,7 @@ public class SpinnerModelAdapterTest {
public void testInitialization_1() {
Spinner spinner = new Spinner(shell, SWT.NULL);
- WritablePropertyValueModel<Integer> numberHolder = new SimplePropertyValueModel<Integer>();
+ ModifiablePropertyValueModel<Integer> numberHolder = new SimplePropertyValueModel<Integer>();
int defaultValue = 1;
SpinnerModelAdapter.adapt(
@@ -146,7 +146,7 @@ public class SpinnerModelAdapterTest {
public void testInitialization_2() {
Spinner spinner = new Spinner(shell, SWT.NULL);
- WritablePropertyValueModel<Integer> numberHolder = buildValueHolder();
+ ModifiablePropertyValueModel<Integer> numberHolder = buildValueHolder();
int defaultValue = 1;
SpinnerModelAdapter.adapt(
@@ -173,7 +173,7 @@ public class SpinnerModelAdapterTest {
subjectHolder.setValue(model);
Spinner spinner = new Spinner(shell, SWT.NULL);
- WritablePropertyValueModel<Integer> numberHolder = buildValueHolder();
+ ModifiablePropertyValueModel<Integer> numberHolder = buildValueHolder();
int defaultValue = 1;
SpinnerModelAdapter.adapt(
@@ -208,7 +208,7 @@ public class SpinnerModelAdapterTest {
subjectHolder.setValue(model);
Spinner spinner = new Spinner(shell, SWT.NULL);
- WritablePropertyValueModel<Integer> numberHolder = buildValueHolder();
+ ModifiablePropertyValueModel<Integer> numberHolder = buildValueHolder();
int defaultValue = 1;
SpinnerModelAdapter.adapt(
@@ -244,7 +244,7 @@ public class SpinnerModelAdapterTest {
subjectHolder.setValue(model);
Spinner spinner = new Spinner(shell, SWT.NULL);
- WritablePropertyValueModel<Integer> numberHolder = buildValueHolder();
+ ModifiablePropertyValueModel<Integer> numberHolder = buildValueHolder();
int defaultValue = 1;
SpinnerModelAdapter.adapt(
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 f8e6dd04a9..6e102a9948 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2009 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 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.
@@ -29,7 +29,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValue
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Image;
@@ -46,13 +46,13 @@ import org.junit.Test;
public class TableModelAdapterTest {
private Shell shell;
- private WritablePropertyValueModel<Manager> subjectHolder;
+ private ModifiablePropertyValueModel<Manager> subjectHolder;
private ColumnAdapter<Employee> buildColumnAdapter() {
return new TableColumnAdapter();
}
- private WritablePropertyValueModel<Employee> buildEmployeeHolder() {
+ private ModifiablePropertyValueModel<Employee> buildEmployeeHolder() {
return new SimplePropertyValueModel<Employee>();
}
@@ -87,7 +87,7 @@ public class TableModelAdapterTest {
};
}
- private WritablePropertyValueModel<Manager> buildSubjectHolder() {
+ private ModifiablePropertyValueModel<Manager> buildSubjectHolder() {
return new SimplePropertyValueModel<Manager>();
}
@@ -115,7 +115,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -172,7 +172,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -222,7 +222,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -257,7 +257,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -333,7 +333,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -377,7 +377,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -430,7 +430,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -488,7 +488,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -605,7 +605,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -666,7 +666,7 @@ public class TableModelAdapterTest {
Table table = new Table(shell, SWT.V_SCROLL | SWT.H_SCROLL | SWT.FULL_SELECTION | SWT.MULTI);
ListValueModel<Employee> listHolder = buildEmployeeListHolder();
- WritablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
+ ModifiablePropertyValueModel<Employee> selectedItemHolder = buildEmployeeHolder();
Manager manager = new Manager();
subjectHolder.setValue(manager);
@@ -1073,7 +1073,7 @@ public class TableModelAdapterTest {
static final int NAME_COLUMN = 0;
static final int TITLE_COLUMN = 1;
- private WritablePropertyValueModel<String> buildManagerHolder(Employee subject) {
+ private ModifiablePropertyValueModel<String> buildManagerHolder(Employee subject) {
return new PropertyAspectAdapter<Employee, String>(Employee.MANAGER_PROPERTY, subject) {
@Override
protected String buildValue_() {
@@ -1087,7 +1087,7 @@ public class TableModelAdapterTest {
};
}
- private WritablePropertyValueModel<String> buildNameHolder(Employee subject) {
+ private ModifiablePropertyValueModel<String> buildNameHolder(Employee subject) {
return new PropertyAspectAdapter<Employee, String>(Employee.NAME_PROPERTY, subject) {
@Override
protected String buildValue_() {
@@ -1101,7 +1101,7 @@ public class TableModelAdapterTest {
};
}
- private WritablePropertyValueModel<String> buildTitleHolder(Employee subject) {
+ private ModifiablePropertyValueModel<String> buildTitleHolder(Employee subject) {
return new PropertyAspectAdapter<Employee, String>(Employee.TITLE_PROPERTY, subject) {
@Override
protected String buildValue_() {
@@ -1115,8 +1115,8 @@ public class TableModelAdapterTest {
};
}
- public WritablePropertyValueModel<?>[] cellModels(Employee subject) {
- WritablePropertyValueModel<?>[] holders = new WritablePropertyValueModel<?>[3];
+ public ModifiablePropertyValueModel<?>[] cellModels(Employee subject) {
+ ModifiablePropertyValueModel<?>[] holders = new ModifiablePropertyValueModel<?>[3];
holders[NAME_COLUMN] = buildNameHolder(subject);
holders[TITLE_COLUMN] = buildTitleHolder(subject);
holders[MANAGER_COLUMN] = buildManagerHolder(subject);
@@ -1171,7 +1171,7 @@ public class TableModelAdapterTest {
}
TableModel(ListValueModel<Employee> listHolder,
- WritablePropertyValueModel<Employee> selectedItemHolder,
+ ModifiablePropertyValueModel<Employee> selectedItemHolder,
Table table,
ColumnAdapter<Employee> columnAdapter,
ITableLabelProvider labelProvider) {
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 810c151526..afb8078b1c 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 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.
@@ -21,7 +21,7 @@ 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.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -41,10 +41,10 @@ public class TriStateCheckBoxModelAdapterUITest
extends ApplicationWindow
{
private final TestModel testModel;
- private final WritablePropertyValueModel<TestModel> testModelHolder;
- private final WritablePropertyValueModel<Boolean> flag1Holder;
- private final WritablePropertyValueModel<Boolean> flag2Holder;
- private final WritablePropertyValueModel<Boolean> notFlag2Holder;
+ private final ModifiablePropertyValueModel<TestModel> testModelHolder;
+ private final ModifiablePropertyValueModel<Boolean> flag1Holder;
+ private final ModifiablePropertyValueModel<Boolean> flag2Holder;
+ private final ModifiablePropertyValueModel<Boolean> notFlag2Holder;
public static void main(String[] args) throws Exception {
Window window = new TriStateCheckBoxModelAdapterUITest(args);
@@ -63,7 +63,7 @@ public class TriStateCheckBoxModelAdapterUITest
this.notFlag2Holder = this.buildNotFlag2Holder(this.testModelHolder);
}
- private WritablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) {
+ private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) {
return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG1_PROPERTY) {
@Override
protected Boolean buildValue_() {
@@ -76,7 +76,7 @@ public class TriStateCheckBoxModelAdapterUITest
};
}
- private WritablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
+ private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
@@ -89,7 +89,7 @@ public class TriStateCheckBoxModelAdapterUITest
};
}
- private WritablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
+ private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.NOT_FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/LabeledControlUpdaterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/LabeledControlUpdaterTest.java
index 2238dc972f..cc8d6ee13f 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/LabeledControlUpdaterTest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/util/LabeledControlUpdaterTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 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.
@@ -14,7 +14,7 @@ import org.eclipse.jpt.common.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.common.ui.internal.util.LabeledLabel;
import org.eclipse.jpt.common.ui.internal.util.SWTUtil;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridLayout;
@@ -52,7 +52,7 @@ public final class LabeledControlUpdaterTest {
Label label = new Label(parent, SWT.NULL);
LabeledLabel labeledLabel = new LabeledLabel(label);
- WritablePropertyValueModel<Image> imageHolder = new SimplePropertyValueModel<Image>();
+ ModifiablePropertyValueModel<Image> imageHolder = new SimplePropertyValueModel<Image>();
new LabeledControlUpdater(labeledLabel, null, imageHolder);
labeledLabel.setImage(expected);
@@ -77,7 +77,7 @@ public final class LabeledControlUpdaterTest {
Label label = new Label(parent, SWT.NULL);
LabeledLabel labeledLabel = new LabeledLabel(label);
- WritablePropertyValueModel<Image> imageHolder = new SimplePropertyValueModel<Image>();
+ ModifiablePropertyValueModel<Image> imageHolder = new SimplePropertyValueModel<Image>();
new LabeledControlUpdater(labeledLabel, null, imageHolder);
label.dispose();
@@ -94,7 +94,7 @@ public final class LabeledControlUpdaterTest {
Label label = new Label(parent, SWT.NULL);
LabeledLabel labeledLabel = new LabeledLabel(label);
- WritablePropertyValueModel<String> textHolder = new SimplePropertyValueModel<String>();
+ ModifiablePropertyValueModel<String> textHolder = new SimplePropertyValueModel<String>();
new LabeledControlUpdater(labeledLabel, textHolder);
String expected = "This is a test";
@@ -113,7 +113,7 @@ public final class LabeledControlUpdaterTest {
Label label = new Label(parent, SWT.NULL);
LabeledLabel labeledLabel = new LabeledLabel(label);
- WritablePropertyValueModel<String> textHolder = new SimplePropertyValueModel<String>();
+ ModifiablePropertyValueModel<String> textHolder = new SimplePropertyValueModel<String>();
new LabeledControlUpdater(labeledLabel, textHolder);
label.dispose();
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/utility/swt/BooleanStateControllerUITest.java
index f1568bd867..5430977a5c 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/utility/swt/BooleanStateControllerUITest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2012 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.
@@ -17,7 +17,7 @@ import org.eclipse.jface.window.Window;
import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
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.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.FormAttachment;
@@ -45,10 +45,10 @@ import org.eclipse.swt.widgets.Shell;
public class BooleanStateControllerUITest
extends ApplicationWindow
{
- private final WritablePropertyValueModel<Boolean> enabledHolder;
- private final WritablePropertyValueModel<Boolean> visibleHolder;
+ private final ModifiablePropertyValueModel<Boolean> enabledHolder;
+ private final ModifiablePropertyValueModel<Boolean> visibleHolder;
private final SimpleListValueModel<String> listHolder;
- private final WritablePropertyValueModel<String> listSelectionHolder;
+ private final ModifiablePropertyValueModel<String> listSelectionHolder;
public static void main(String[] args) throws Exception {
Window window = new BooleanStateControllerUITest(args);
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/utility/swt/CheckBoxModelBindingUITest.java
index 6d211010a9..2f65e39f1b 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/utility/swt/CheckBoxModelBindingUITest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 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.
@@ -19,7 +19,7 @@ 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.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -41,10 +41,10 @@ public class CheckBoxModelBindingUITest
extends ApplicationWindow
{
private final TestModel testModel;
- private final WritablePropertyValueModel<TestModel> testModelHolder;
- private final WritablePropertyValueModel<Boolean> flag1Holder;
- private final WritablePropertyValueModel<Boolean> flag2Holder;
- private final WritablePropertyValueModel<Boolean> notFlag2Holder;
+ private final ModifiablePropertyValueModel<TestModel> testModelHolder;
+ private final ModifiablePropertyValueModel<Boolean> flag1Holder;
+ private final ModifiablePropertyValueModel<Boolean> flag2Holder;
+ private final ModifiablePropertyValueModel<Boolean> notFlag2Holder;
public static void main(String[] args) throws Exception {
Window window = new CheckBoxModelBindingUITest(args);
@@ -63,7 +63,7 @@ public class CheckBoxModelBindingUITest
this.notFlag2Holder = this.buildNotFlag2Holder(this.testModelHolder);
}
- private WritablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) {
+ private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) {
return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG1_PROPERTY) {
@Override
protected Boolean buildValue_() {
@@ -76,7 +76,7 @@ public class CheckBoxModelBindingUITest
};
}
- private WritablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
+ private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
@@ -89,7 +89,7 @@ public class CheckBoxModelBindingUITest
};
}
- private WritablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
+ private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) {
return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.NOT_FLAG2_PROPERTY) {
@Override
protected Boolean buildValue_() {
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/utility/swt/DropDownListBoxModelBindingUITest.java
index dad37d9521..041b48d31a 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/utility/swt/DropDownListBoxModelBindingUITest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2009, 2012 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.
@@ -28,7 +28,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueMo
import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelWrapper;
import org.eclipse.jpt.common.utility.model.Model;
import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.FormAttachment;
@@ -50,7 +50,7 @@ public class DropDownListBoxModelBindingUITest
extends ApplicationWindow
{
final TaskList taskList;
- private final WritablePropertyValueModel<TaskList> taskListHolder;
+ private final ModifiablePropertyValueModel<TaskList> taskListHolder;
private Text taskTextField;
public static void main(String[] args) throws Exception {
@@ -203,7 +203,7 @@ public class DropDownListBoxModelBindingUITest
return new SortedListValueModelWrapper<Task>(this.buildObjectTaskListAdapter(), this.buildCustomTaskComparator());
}
- private <E> void buildComboBoxPanel(Composite parent, String label, ListValueModel<E> model, WritablePropertyValueModel<E> selectedItemModel) {
+ private <E> void buildComboBoxPanel(Composite parent, String label, ListValueModel<E> model, ModifiablePropertyValueModel<E> selectedItemModel) {
Composite panel = new Composite(parent, SWT.NONE);
panel.setLayout(new FormLayout());
@@ -264,14 +264,14 @@ public class DropDownListBoxModelBindingUITest
};
}
- private WritablePropertyValueModel<Task> buildPriorityTaskAdapter() {
+ private ModifiablePropertyValueModel<Task> buildPriorityTaskAdapter() {
return new PriorityTaskAdapter(this.taskListHolder);
}
static class PriorityTaskAdapter
extends PropertyAspectAdapter<TaskList, Task>
{
- PriorityTaskAdapter(WritablePropertyValueModel<TaskList> taskListHolder) {
+ PriorityTaskAdapter(ModifiablePropertyValueModel<TaskList> taskListHolder) {
super(taskListHolder, TaskList.PRIORITY_TASK_PROPERTY);
}
@Override
@@ -284,14 +284,14 @@ public class DropDownListBoxModelBindingUITest
}
}
- private WritablePropertyValueModel<String> buildPriorityTaskNameAdapter() {
+ private ModifiablePropertyValueModel<String> buildPriorityTaskNameAdapter() {
return new PriorityTaskNameAdapter(this.taskListHolder);
}
static class PriorityTaskNameAdapter
extends PropertyAspectAdapter<TaskList, String>
{
- PriorityTaskNameAdapter(WritablePropertyValueModel<TaskList> taskListHolder) {
+ PriorityTaskNameAdapter(ModifiablePropertyValueModel<TaskList> taskListHolder) {
super(taskListHolder, TaskList.PRIORITY_TASK_NAME_PROPERTY);
}
@Override
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/utility/swt/ListBoxModelBindingUITest.java
index 1cb0d57c62..6ae7c792f6 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/utility/swt/ListBoxModelBindingUITest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2007, 2012 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.
@@ -32,8 +32,8 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueMo
import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelWrapper;
import org.eclipse.jpt.common.utility.model.Model;
import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritableCollectionValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiableCollectionValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.FormAttachment;
@@ -54,7 +54,7 @@ public class ListBoxModelBindingUITest
extends ApplicationWindow
{
final TaskList taskList;
- private final WritablePropertyValueModel<TaskList> taskListHolder;
+ private final ModifiablePropertyValueModel<TaskList> taskListHolder;
private Text taskTextField;
public static void main(String[] args) throws Exception {
@@ -186,7 +186,7 @@ public class ListBoxModelBindingUITest
return new SortedListValueModelWrapper<Task>(this.buildObjectTaskListAdapter(), this.buildCustomTaskComparator());
}
- private <E> org.eclipse.swt.widgets.List buildListPanel(Composite parent, String label, ListValueModel<E> model, WritableCollectionValueModel<E> selectedItemsModel) {
+ private <E> org.eclipse.swt.widgets.List buildListPanel(Composite parent, String label, ListValueModel<E> model, ModifiableCollectionValueModel<E> selectedItemsModel) {
Composite panel = new Composite(parent, SWT.NONE);
panel.setLayout(new FormLayout());
@@ -244,15 +244,15 @@ public class ListBoxModelBindingUITest
};
}
- private WritableCollectionValueModel<Task> buildPriorityTaskListAdapter() {
+ private ModifiableCollectionValueModel<Task> buildPriorityTaskListAdapter() {
return new PriorityTaskListAdapter(this.taskListHolder);
}
static class PriorityTaskListAdapter
extends CollectionAspectAdapter<TaskList, Task>
- implements WritableCollectionValueModel<Task>
+ implements ModifiableCollectionValueModel<Task>
{
- PriorityTaskListAdapter(WritablePropertyValueModel<TaskList> taskListHolder) {
+ PriorityTaskListAdapter(ModifiablePropertyValueModel<TaskList> taskListHolder) {
super(taskListHolder, TaskList.PRIORITY_TASKS_COLLECTION);
}
@Override
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/utility/swt/TextFieldModelBindingUITest.java
index 5bd6f16dd2..efc476ad4a 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/utility/swt/TextFieldModelBindingUITest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2010 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2012 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.
@@ -19,7 +19,7 @@ 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.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.WritablePropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.FormAttachment;
@@ -40,9 +40,9 @@ public class TextFieldModelBindingUITest
{
private final TestModel testModel;
private static final String DEFAULT_NAME = "Scooby Doo";
- private final WritablePropertyValueModel<TestModel> testModelHolder;
- private final WritablePropertyValueModel<String> nameHolder;
- private final WritablePropertyValueModel<String> allCapsNameHolder;
+ private final ModifiablePropertyValueModel<TestModel> testModelHolder;
+ private final ModifiablePropertyValueModel<String> nameHolder;
+ private final ModifiablePropertyValueModel<String> allCapsNameHolder;
public static void main(String[] args) throws Exception {
@@ -61,7 +61,7 @@ public class TextFieldModelBindingUITest
this.allCapsNameHolder = this.buildAllCapsNameHolder(this.testModelHolder);
}
- private WritablePropertyValueModel<String> buildNameHolder(PropertyValueModel<TestModel> vm) {
+ private ModifiablePropertyValueModel<String> buildNameHolder(PropertyValueModel<TestModel> vm) {
return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
@Override
protected String buildValue_() {
@@ -74,7 +74,7 @@ public class TextFieldModelBindingUITest
};
}
- private WritablePropertyValueModel<String> buildAllCapsNameHolder(PropertyValueModel<TestModel> vm) {
+ private ModifiablePropertyValueModel<String> buildAllCapsNameHolder(PropertyValueModel<TestModel> vm) {
return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) {
@Override
protected String buildValue_() {

Back to the top