summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorPekka Hyvönen <pekka@vaadin.com>2016-10-25 15:28:11 +0300
committerPekka Hyvönen <pekka@vaadin.com>2016-10-26 14:20:09 +0300
commit54e1edcfe045604729c2f16cece87ae754c0036c (patch)
tree33ecbdd7e0e9ed1c38e9cee6438801f6315c7590 /uitest
parentf981521a52d4ee386b6d2ba5133fd1c1cd0c5450 (diff)
downloadvaadin-framework-54e1edcfe045604729c2f16cece87ae754c0036c.tar.gz
vaadin-framework-54e1edcfe045604729c2f16cece87ae754c0036c.zip
Rename Binder methods
save -> writeBean, saveIfValid -> writeBeanIfValid, load -> readBean, bind -> setBean, unbind -> removeBean. Now setBean accepts null to reset the bean instead of throwing NPE. Closes vaadin/framework8-issues#91 Change-Id: I42cbad5856cac11a03bfcefd0fa91a02c41b7234
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java6
3 files changed, 7 insertions, 7 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
index 8393cc4d94..86510f5879 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
@@ -1030,7 +1030,7 @@ public class CalendarTest extends UI {
initFormFields(scheduleEventFieldLayout, event.getClass());
scheduleEventFieldGroup.setBuffered(true);
scheduleEventFieldGroup.setItemDataSource(item);
- scheduledEventBinder.load(event);
+ scheduledEventBinder.readBean(event);
}
private void setFormDateResolution(Resolution resolution) {
@@ -1064,7 +1064,7 @@ public class CalendarTest extends UI {
throws CommitException, ValidationException {
scheduleEventFieldGroup.commit();
BasicEvent event = getFormCalendarEvent();
- scheduledEventBinder.save(event);
+ scheduledEventBinder.writeBean(event);
if (event.getEnd() == null) {
event.setEnd(event.getStart());
}
@@ -1077,7 +1077,7 @@ public class CalendarTest extends UI {
private void discardCalendarEvent() {
scheduleEventFieldGroup.discard();
- scheduledEventBinder.load(getFormCalendarEvent());
+ scheduledEventBinder.readBean(getFormCalendarEvent());
removeWindow(scheduleEventPopup);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
index e732b173fa..9d147eb3b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
@@ -34,7 +34,7 @@ public class SliderValueFromDataSource extends AbstractReindeerTestUI {
b -> Double.valueOf(b.getFloatValue() * 10.0),
(b, doubleValue) -> item.getItemProperty("floatValue")
.setValue((float) (doubleValue / 10.0)));
- binder.bind(bean);
+ binder.setBean(bean);
ProgressBar progressBar = new ProgressBar();
progressBar.setWidth("200px");
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
index d1e8fb9acc..1d3a363e6b 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
@@ -971,7 +971,7 @@ public class CalendarTest extends GridLayout implements View {
initFormFields(scheduleEventFieldLayout, event.getClass());
scheduleEventFieldGroup.setBuffered(true);
scheduleEventFieldGroup.setItemDataSource(item);
- scheduledEventBinder.load(event);
+ scheduledEventBinder.readBean(event);
}
private void setFormDateResolution(Resolution resolution) {
@@ -1004,7 +1004,7 @@ public class CalendarTest extends GridLayout implements View {
throws ValidationException, CommitException {
scheduleEventFieldGroup.commit();
BasicEvent event = getFormCalendarEvent();
- scheduledEventBinder.save(event);
+ scheduledEventBinder.writeBean(event);
if (event.getEnd() == null) {
event.setEnd(event.getStart());
}
@@ -1017,7 +1017,7 @@ public class CalendarTest extends GridLayout implements View {
private void discardCalendarEvent() {
scheduleEventFieldGroup.discard();
- scheduledEventBinder.load(getFormCalendarEvent());
+ scheduledEventBinder.readBean(getFormCalendarEvent());
getUI().removeWindow(scheduleEventPopup);
}