summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorZhe Sun <31067185+ZheSun88@users.noreply.github.com>2019-08-05 10:15:11 +0300
committerGitHub <noreply@github.com>2019-08-05 10:15:11 +0300
commit4523d31e6dffc3390366216384f9cfb72443114d (patch)
tree140ffc1c448cbc396e0d0aa809f60956adf4e090 /server
parenta437c10c7a8e70b40248aef52ac9c4b05b6e5d1b (diff)
downloadvaadin-framework-4523d31e6dffc3390366216384f9cfb72443114d.tar.gz
vaadin-framework-4523d31e6dffc3390366216384f9cfb72443114d.zip
Update Chrome version, snapshots and fix tests (#11684)
Diffstat (limited to 'server')
-rw-r--r--server/src/main/java/com/vaadin/ui/AbstractDateField.java5
-rw-r--r--server/src/main/java/com/vaadin/ui/ComboBox.java3
2 files changed, 5 insertions, 3 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractDateField.java b/server/src/main/java/com/vaadin/ui/AbstractDateField.java
index f7a085bc0d..cb39cf607b 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractDateField.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractDateField.java
@@ -93,11 +93,12 @@ public abstract class AbstractDateField<T extends Temporal & TemporalAdjuster &
@Override
public void updateValueWithDelay(String newDateString,
- Map<String, Integer> resolutions) {
+ Map<String, Integer> resolutions) {
valueUpdate(newDateString, resolutions);
}
- private void valueUpdate(String newDateString, Map<String, Integer> resolutions) {
+ private void valueUpdate(String newDateString,
+ Map<String, Integer> resolutions) {
Set<String> resolutionNames = getResolutions().map(Enum::name)
.collect(Collectors.toSet());
resolutionNames.retainAll(resolutions.keySet());
diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/server/src/main/java/com/vaadin/ui/ComboBox.java
index b9511450a5..e04cd64241 100644
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/server/src/main/java/com/vaadin/ui/ComboBox.java
@@ -972,7 +972,8 @@ public class ComboBox<T> extends AbstractSingleSelect<T>
// This workaround is done to fix issue #11642 for unpaged comboboxes.
// Data sources for on the client need to be updated after data provider
- // refreshAll so that serverside selection works even before the dropdown
+ // refreshAll so that serverside selection works even before the
+ // dropdown
// is opened. Only done for in-memory data providers for performance
// reasons.
if (dataProvider instanceof InMemoryDataProvider) {