From d614335d0770a41b6bd2dc84885efc175cdcfe3b Mon Sep 17 00:00:00 2001
From: Guille <alvarezguille@users.noreply.github.com>
Date: Mon, 25 Mar 2019 11:19:32 +0200
Subject: [PATCH] Update vaadin to latest 8.x (#572)

* Update vaadin to latest 8.x
---
 .../addon/charts/declarative/ChartDesignFormatter.java   | 9 +--------
 chart-export-demo/pom.xml                                | 2 +-
 chart-plugin-demo/pom.xml                                | 2 +-
 pom.xml                                                  | 2 +-
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/addon/src/main/java/com/vaadin/addon/charts/declarative/ChartDesignFormatter.java b/addon/src/main/java/com/vaadin/addon/charts/declarative/ChartDesignFormatter.java
index 814bd37a4..c2ee1d76f 100644
--- a/addon/src/main/java/com/vaadin/addon/charts/declarative/ChartDesignFormatter.java
+++ b/addon/src/main/java/com/vaadin/addon/charts/declarative/ChartDesignFormatter.java
@@ -17,8 +17,6 @@
  * #L%
  */
 
-import java.util.Locale;
-
 import com.vaadin.addon.charts.model.style.Color;
 import com.vaadin.addon.charts.model.style.SolidColor;
 import com.vaadin.data.Converter;
@@ -36,7 +34,7 @@ public ChartDesignFormatter() {
             @Override
             public Result<Number> convertToModel(String value,
                     ValueContext context) {
-                return convertToNumber(value, getLocaleFromContext(context));
+                return convertToNumber(value, context);
             }
         });
 
@@ -58,11 +56,6 @@ public String convertToPresentation(Color value, ValueContext context) {
         });
     }
 
-    private static Locale getLocaleFromContext(ValueContext context) {
-        return context.getLocale().isPresent() ? context.getLocale().get()
-                : Locale.getDefault();
-    }
-
     @Override
     public boolean canConvert(Class<?> type) {
         return super.canConvert(type);
diff --git a/chart-export-demo/pom.xml b/chart-export-demo/pom.xml
index 6f1830d63..9371540b5 100644
--- a/chart-export-demo/pom.xml
+++ b/chart-export-demo/pom.xml
@@ -10,7 +10,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>8.3.1</vaadin.version>
+		<vaadin.version>8.7.1</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<vaadin.charts.version>4.1-SNAPSHOT</vaadin.charts.version>
 		<batik.version>1.7</batik.version>
diff --git a/chart-plugin-demo/pom.xml b/chart-plugin-demo/pom.xml
index 72449c1c5..e4ea4cf72 100644
--- a/chart-plugin-demo/pom.xml
+++ b/chart-plugin-demo/pom.xml
@@ -10,7 +10,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<vaadin.version>8.3.1</vaadin.version>
+		<vaadin.version>8.7.1</vaadin.version>
 		<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
 		<vaadin.charts.version>4.1-SNAPSHOT</vaadin.charts.version>
 	</properties>
diff --git a/pom.xml b/pom.xml
index af45c4d79..8cf5e8f65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.organization>Vaadin Ltd</project.organization>
-        <vaadin.version>8.3.1</vaadin.version>
+        <vaadin.version>8.7.1</vaadin.version>
         <jetty.version>9.4.8.v20171121</jetty.version>
         <bundle.plugin.version>3.5.0</bundle.plugin.version>
     </properties>