Update i18n addon to flow classes.

peholmst · Apr 28, 2019 · de4c933 · de4c933
1 parent 65ca548
commit de4c933
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/addons/i18n/src/main/java/org/vaadin/spring/i18n/I18N.java b/addons/i18n/src/main/java/org/vaadin/spring/i18n/I18N.java
@@ -23,7 +23,8 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.NoSuchMessageException;
 
-import com.vaadin.ui.UI;
+import com.vaadin.flow.component.UI;
+
 
 /**
  * Helper class for resolving messages in a Vaadin UI. This is effectively a wrapper around

diff --git a/addons/i18n/src/main/java/org/vaadin/spring/i18n/support/TranslatableSupport.java b/addons/i18n/src/main/java/org/vaadin/spring/i18n/support/TranslatableSupport.java
@@ -17,9 +17,8 @@
 
 import java.util.Locale;
 
-import com.vaadin.ui.Component;
-import com.vaadin.ui.HasComponents;
-import com.vaadin.ui.UI;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.UI;
 
 /**
  * Implementation of {@link Translatable} intended to be used as a delegate by an owning {@link UI}.
@@ -50,11 +49,7 @@ private void updateMessageStrings(Locale locale, Component component) {
         if (component instanceof Translatable) {
             ((Translatable) component).updateMessageStrings(locale);
         }
-        if (component instanceof HasComponents) {
-            for (Component child : (HasComponents) component) {
-                updateMessageStrings(locale, child);
-            }
-        }
+        component.getChildren().forEach(child -> updateMessageStrings(locale, child));
     }
 
 }
diff --git a/addons/i18n/src/main/java/org/vaadin/spring/i18n/support/TranslatableUI.java b/addons/i18n/src/main/java/org/vaadin/spring/i18n/support/TranslatableUI.java
@@ -17,8 +17,8 @@
 
 import java.util.Locale;
 
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.UI;
+import com.vaadin.flow.component.UI;
+import com.vaadin.flow.server.VaadinRequest;
 
 /**
  * Base class intended to make it easier to write UIs that needs to support changing the locale on the fly.

diff --git a/addons/i18n/src/test/java/org/vaadin/spring/i18n/I18NTest.java b/addons/i18n/src/test/java/org/vaadin/spring/i18n/I18NTest.java
@@ -15,14 +15,15 @@
  */
 package org.vaadin.spring.i18n;
 
-import com.vaadin.ui.UI;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.NoSuchMessageException;
 
+import com.vaadin.flow.component.UI;
+
 import java.util.Locale;
 
 import static org.junit.Assert.assertEquals;