Organize imports

Change-Id: Iedb6ed985dfc6b69c4a4753a876545d67621898f

client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java

 import com.google.gwt.user.rebind.SourceWriter;
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.communication.JSONSerializer;
+
 import elemental.json.JsonValue;
 
 public abstract class JsonSerializer implements GeneratedSerializer {

client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java

 import com.google.gwt.core.ext.typeinfo.JMethod;
 import com.google.gwt.core.ext.typeinfo.JType;
 import com.vaadin.client.metadata.TypeDataStore.MethodAttribute;
-import com.vaadin.shared.annotations.NoLoadingIndicator;
 import com.vaadin.shared.annotations.Delayed;
+import com.vaadin.shared.annotations.NoLoadingIndicator;
 
 public class ServerRpcVisitor extends TypeVisitor {
     @Override

client/src/main/java/com/vaadin/client/ApplicationConnection.java

 import com.vaadin.client.componentlocator.ComponentLocator;
 import com.vaadin.client.metadata.ConnectorBundleLoader;
 import com.vaadin.client.ui.AbstractComponentConnector;
+import com.vaadin.client.ui.AbstractConnector;
 import com.vaadin.client.ui.FontIcon;
 import com.vaadin.client.ui.Icon;
 import com.vaadin.client.ui.ImageIcon;

client/src/main/java/com/vaadin/client/communication/DiffJSONSerializer.java

 
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.metadata.Type;
+
 import elemental.json.JsonValue;
 
 public interface DiffJSONSerializer<T> extends JSONSerializer<T> {

client/src/main/java/com/vaadin/client/communication/JSONSerializer.java

 
 import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.metadata.Type;
+
 import elemental.json.JsonValue;
 
 /**

client/src/main/java/com/vaadin/client/extensions/FileDownloaderConnector.java

 import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.ServerConnector;
 import com.vaadin.server.FileDownloader;
-import com.vaadin.shared.VBrowserDetails;
 import com.vaadin.shared.ui.Connect;
 
 @Connect(FileDownloader.class)

client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java

 import com.google.gwt.user.client.Event.NativePreviewEvent;
 import com.google.gwt.user.client.Event.NativePreviewHandler;
 import com.vaadin.client.ComponentConnector;
-import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.VConsole;
+import com.vaadin.client.WidgetUtil;
 
 public abstract class AbstractClickEventHandler implements MouseDownHandler,
         MouseUpHandler, DoubleClickHandler, ContextMenuHandler {

client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java

 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.DateTimeService;
-import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.VConsole;
+import com.vaadin.client.WidgetUtil;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.shared.util.SharedUtil;
 

client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java

 import java.util.Map.Entry;
 
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.client.ApplicationConnection;
 import com.vaadin.client.ComponentConnector;
 import com.vaadin.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.client.DirectionalManagedLayout;
-import com.vaadin.client.Paintable;
-import com.vaadin.client.UIDL;
 import com.vaadin.client.VCaption;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentContainerConnector;

client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java

 
 package com.vaadin.client.ui.loginform;
 
+import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.vaadin.shared.ui.loginform.LoginFormConstants;
 import com.vaadin.shared.ui.loginform.LoginFormRpc;
 import com.vaadin.shared.ui.loginform.LoginFormState;
-import com.google.gwt.core.client.Scheduler;
 
 @Connect(com.vaadin.ui.LoginForm.class)
 public class LoginFormConnector

client/src/main/java/com/vaadin/client/widget/escalator/ColumnConfiguration.java

 
 import java.util.Map;
 
+import com.vaadin.client.widgets.Escalator;
+
 /**
  * A representation of the columns in an instance of {@link Escalator}.
  *

client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java

 
 package com.vaadin.client.widget.escalator;
 
+import com.vaadin.client.widgets.Escalator;
+
 /**
  * An interface that allows client code to define how a certain row in Escalator
  * will be displayed. The contents of an escalator's header, body and footer are

client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java

 import java.util.List;
 
 import com.google.gwt.dom.client.TableRowElement;
+import com.vaadin.client.widgets.Escalator;
 
 /**
  * An internal implementation of the {@link Row} interface.

client/src/main/java/com/vaadin/client/widget/escalator/Row.java

 package com.vaadin.client.widget.escalator;
 
 import com.google.gwt.dom.client.TableRowElement;
+import com.vaadin.client.widgets.Escalator;
 
 /**
  * A representation of a row in an {@link Escalator}.

client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java

 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.TableRowElement;
 import com.google.gwt.dom.client.TableSectionElement;
+import com.vaadin.client.widgets.Escalator;
 
 /**
  * A representation of the rows in each of the sections (header, body and

compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java

 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.vaadin.v7.ui.LegacyField;
+
 /**
  * Defines the custom property name to be bound to a {@link LegacyField} using
  * {@link FieldGroup} or {@link BeanFieldGroup}.

compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java

 import com.vaadin.ui.declarative.DesignFormatter;
 import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
 import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
 import com.vaadin.v7.ui.LegacyAbstractField;
 
 /**

compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java

 import com.vaadin.server.JsonCodec;
 import com.vaadin.shared.JavaScriptExtensionState;
 import com.vaadin.shared.communication.ServerRpc;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
 import com.vaadin.ui.JavaScriptFunction;
+import com.vaadin.ui.LegacyGrid.AbstractRenderer;
 
 import elemental.json.Json;
 import elemental.json.JsonValue;

compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java

  */
 package com.vaadin.ui.renderers;
 
-import elemental.json.JsonValue;
-
 /**
  * A Renderer that displays a button with a textual caption. The value of the
  * corresponding property is used as the caption. Click listeners can be added

compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java

 package com.vaadin.ui.renderers;
 
 import com.vaadin.ui.LegacyGrid.AbstractRenderer;
-import elemental.json.JsonValue;
 
 /**
  * A renderer for presenting HTML content.

compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java

 package com.vaadin.ui.renderers;
 
 import com.vaadin.ui.LegacyGrid.AbstractRenderer;
-import elemental.json.JsonValue;
 
 /**
  * A renderer for presenting simple plain-text string values.

compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java

 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory;
 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.ListSelect;

compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java

 package com.vaadin.data.util.filter;
 
-import junit.framework.TestCase;
-
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
+import junit.framework.TestCase;
+
 public abstract class AbstractFilterTestBase<FILTERTYPE extends Filter>
         extends TestCase {
 

compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java

 import java.sql.Statement;
 
 import org.junit.Assert;
-import org.junit.Test;
 
 import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
 import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;

compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java

 
 import java.util.List;
 
-import org.junit.Test;
-
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB;
 import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper;

compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java

 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
 
-import org.junit.Test;
-
 /**
  * Provides a JNDI initial context factory for the MockContext.
  */

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java

 
 import java.util.Iterator;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.FooterCell;
 import com.vaadin.ui.LegacyGrid.HeaderCell;
-import com.vaadin.ui.Label;
 
 public class GridChildrenTest {
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java

 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.LegacyGrid;
 
 public class GridColumnAddingAndRemovingTest {
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java

 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import com.vaadin.ui.LegacyGrid;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
 import org.junit.Before;
 import com.vaadin.shared.ui.grid.GridColumnState;
 import com.vaadin.shared.ui.grid.GridState;
 import com.vaadin.shared.util.SharedUtil;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.LegacyGrid.ColumnResizeEvent;
 import com.vaadin.ui.LegacyGrid.ColumnResizeListener;

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java

 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.data.util.AbstractInMemoryContainer;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 
 public class GridContainerNotSortableTest {

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java

 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.DetailsGenerator;
 import com.vaadin.ui.LegacyGrid.RowReference;
-import com.vaadin.ui.Label;
 
 public class GridContainerTest {
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java

 
 import java.lang.reflect.Method;
 
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
-
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Assert;
 import com.vaadin.server.MockVaadinSession;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
+import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class GridEditorTest {
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java

 
 import static org.junit.Assert.assertTrue;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.AbstractGridExtension;
 
 public class GridExtensionTest {

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java

 
 import java.util.Collection;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.SelectionMode;
 import com.vaadin.ui.LegacyGrid.SelectionModel;
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java

 
 import java.lang.reflect.Method;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Before;
 import org.junit.Test;
 
 import com.vaadin.data.Container.Indexed;
 import com.vaadin.data.util.IndexedContainer;
+import com.vaadin.ui.LegacyGrid;
 
 public class GridStaticSectionTest extends LegacyGrid {
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java

 import java.util.Arrays;
 import java.util.List;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.SelectionEvent;
 import com.vaadin.event.SelectionEvent.SelectionListener;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
 import com.vaadin.ui.LegacyGrid.SelectionMode;
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java

  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
+import com.vaadin.ui.LegacyGrid;
+
 public class GridColumnDeclarativeTest extends GridDeclarativeTestBase {
 
     @Test

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java

 
 import static org.junit.Assert.assertSame;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.grid.HeightMode;
 import com.vaadin.tests.design.DeclarativeTestBase;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
 import com.vaadin.ui.LegacyGrid.NoSelectionModel;
 import com.vaadin.ui.LegacyGrid.SingleSelectionModel;
 
 /**
- * Tests declarative support for {@link Grid} properties.
+ * Tests declarative support for Grid properties.
  *
  * @since
  * @author Vaadin Ltd
  */
-public class GridDeclarativeAttributeTest extends DeclarativeTestBase<LegacyGrid> {
+public class GridDeclarativeAttributeTest
+        extends DeclarativeTestBase<LegacyGrid> {
 
     @Test
     public void testBasicAttributes() {

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java

 
 import java.util.List;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 
 import com.vaadin.tests.design.DeclarativeTestBase;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.LegacyGrid.FooterCell;
 import com.vaadin.ui.LegacyGrid.FooterRow;

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java

  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.jsoup.nodes.Element;
 import org.jsoup.parser.Tag;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.shared.ui.label.ContentMode;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.LegacyGrid.FooterRow;
 import com.vaadin.ui.LegacyGrid.HeaderRow;
-import com.vaadin.ui.Label;
 import com.vaadin.ui.declarative.DesignContext;
 
 public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase {

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java

  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.vaadin.data.Container;
+import com.vaadin.ui.LegacyGrid;
 
 public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase {
 

compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java

  */
 package com.vaadin.tests.server.component.grid.declarative;
 
-import com.vaadin.ui.LegacyGrid;
 import org.junit.Test;
 
+import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.declarative.DesignException;
 
 public class GridStructureDeclarativeTest extends GridDeclarativeTestBase {

compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java

 import com.vaadin.ui.Table.ColumnHeaderMode;
 import com.vaadin.ui.Table.RowHeaderMode;
 import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.declarative.Design;
 
 /**
  * Test declarative support for {@link Table}.

server/src/main/java/com/vaadin/event/FieldEvents.java

 import com.vaadin.ui.Component.Event;
 import com.vaadin.util.ReflectTools;
 import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.v7.ui.LegacyField.ValueChangeEvent;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Interface that serves as a wrapper for {@link LegacyField} related events.

server/src/main/java/com/vaadin/server/VaadinServletService.java

 import java.util.logging.Logger;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import com.vaadin.server.communication.PushRequestHandler;
 import com.vaadin.server.communication.ServletBootstrapHandler;

server/src/main/java/com/vaadin/server/communication/DateSerializer.java

 import java.util.Date;
 
 import com.vaadin.ui.ConnectorTracker;
+
 import elemental.json.Json;
 import elemental.json.JsonValue;
 

server/src/main/java/com/vaadin/server/communication/JSONSerializer.java

 import java.lang.reflect.Type;
 
 import com.vaadin.ui.ConnectorTracker;
+
 import elemental.json.JsonValue;
 
 /**

server/src/main/java/com/vaadin/ui/FormLayout.java

 import com.vaadin.shared.ui.orderedlayout.FormLayoutState;
 
 /**
- * FormLayout is used by {@link Form} to layout fields. It may also be used
- * separately without {@link Form}.
+ * FormLayout is used to layout fields.
  *
  * FormLayout is a close relative of {@link VerticalLayout}, but in FormLayout
  * captions are rendered to the left of their respective components. Required

server/src/main/java/com/vaadin/ui/GridLayout.java

 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.event.LayoutEvents.LayoutClickNotifier;
-import com.vaadin.server.PaintException;
-import com.vaadin.server.PaintTarget;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.MouseEventDetails;

server/src/main/java/com/vaadin/ui/themes/Reindeer.java

  */
 package com.vaadin.ui.themes;
 
+import com.vaadin.ui.CssLayout;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.VerticalLayout;
+
 public class Reindeer extends BaseTheme {
 
     public static final String THEME_NAME = "reindeer";

server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java

 import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
 import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.util.converter.LegacyConverterUtil;
 
 /**
  * <p>

server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java

 import javax.servlet.http.HttpServletRequest;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.vaadin.server.VaadinPortlet.VaadinHttpAndPortletRequest;
-import com.vaadin.server.VaadinPortletService;
 
 public abstract class VaadinHttpAndPortletRequestTestBase<T extends VaadinHttpAndPortletRequest> {
 

server/src/test/java/com/vaadin/server/VaadinPortletRequestTest.java

 package com.vaadin.server;
 
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.portlet.PortletPreferences;
-import javax.portlet.PortletRequest;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import javax.portlet.PortletPreferences;
+import javax.portlet.PortletRequest;
+
+import org.junit.Before;
+import org.junit.Test;
+
 public class VaadinPortletRequestTest {
 
     private PortletRequest request;

server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java

 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.vaadin.server.data.DataSource;
-import com.vaadin.server.data.ListDataSource;
-import com.vaadin.server.data.Query;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.server.data.DataSource;
+import com.vaadin.server.data.ListDataSource;
+import com.vaadin.server.data.Query;
+
 public class ListDataSourceTest {
 
     private ListDataSource<StrBean> dataSource;

server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java

  */
 package com.vaadin.server.data.datasource.bov;
 
-import com.vaadin.server.data.BackEndDataSource;
-import com.vaadin.server.data.DataSource;
-import com.vaadin.server.data.SortOrder;
-import com.vaadin.shared.data.sort.SortDirection;
-import org.junit.Before;
-import org.junit.Test;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.junit.Before;
+import org.junit.Test;
+
+import com.vaadin.server.data.BackEndDataSource;
+import com.vaadin.server.data.DataSource;
+import com.vaadin.server.data.SortOrder;
+import com.vaadin.shared.data.sort.SortDirection;
+
 /**
  * Vaadin 8 Example from Book of Vaadin
  *

server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java

 import org.junit.Test;
 
 import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
 import com.vaadin.v7.data.util.converter.LegacyReverseConverter;
 import com.vaadin.v7.data.util.converter.LegacyStringToByteConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
 
 public class StringToByteConverterTest {
 

server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java

 import org.junit.Test;
 
 import com.vaadin.v7.data.util.converter.LegacyStringToCollectionConverter;
+import com.vaadin.v7.data.util.converter.LegacyStringToCollectionConverter.CollectionFactory;
 import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter;
 import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
-import com.vaadin.v7.data.util.converter.LegacyStringToCollectionConverter.CollectionFactory;
 
 /**
  * Tests for {@link LegacyStringToCollectionConverter}.

server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java

 import org.junit.Test;
 
 import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
 import com.vaadin.v7.data.util.converter.LegacyReverseConverter;
 import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
 
 public class StringToEnumConverterTest {
 

server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java

 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
 import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
 
 public class StringToIntegerConverterTest {
 

server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java

 import org.junit.Test;
 
 import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
 import com.vaadin.v7.data.util.converter.LegacyReverseConverter;
 import com.vaadin.v7.data.util.converter.LegacyStringToShortConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
 
 public class StringToShortConverterTest {
 

server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java

 
 import com.vaadin.v7.data.Validator;
 import com.vaadin.v7.data.validator.LegacyCompositeValidator;
+import com.vaadin.v7.data.validator.LegacyCompositeValidator.CombinationMode;
 import com.vaadin.v7.data.validator.LegacyEmailValidator;
 import com.vaadin.v7.data.validator.LegacyRegexpValidator;
-import com.vaadin.v7.data.validator.LegacyCompositeValidator.CombinationMode;
 
 public class CompositeValidatorTest {
 

server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java

  */
 package com.vaadin.tests.design.nested;
 
-import com.vaadin.tests.design.nested.customlayouts.*;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.declarative.Design;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
+import com.vaadin.tests.design.nested.customlayouts.CustomAbsoluteLayout;
+import com.vaadin.tests.design.nested.customlayouts.CustomAccordion;
+import com.vaadin.tests.design.nested.customlayouts.CustomCssLayout;
+import com.vaadin.tests.design.nested.customlayouts.CustomFormLayout;
+import com.vaadin.tests.design.nested.customlayouts.CustomGridLayout;
+import com.vaadin.tests.design.nested.customlayouts.CustomHorizontalLayout;
+import com.vaadin.tests.design.nested.customlayouts.CustomHorizontalSplitPanel;
+import com.vaadin.tests.design.nested.customlayouts.CustomPanel;
+import com.vaadin.tests.design.nested.customlayouts.CustomTabSheet;
+import com.vaadin.tests.design.nested.customlayouts.CustomVerticalLayout;
+import com.vaadin.tests.design.nested.customlayouts.CustomVerticalSplitPanel;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.declarative.Design;
 
 /**
  * Test case for nested custom layouts. The children of the custom layouts must

server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java

  */
 package com.vaadin.tests.design.nested;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Test case for reading nested templates

server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java

 import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
 import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
 import com.vaadin.v7.ui.LegacyTextField;
 
 public class AbsFieldValueConversionErrorTest {

server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java

 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
 import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
+import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
 import com.vaadin.v7.ui.LegacyTextField;
 
 public class AbsFieldValueConversionsTest {

server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java

  */
 package com.vaadin.ui;
 
-import com.vaadin.server.VaadinRequest;
-import org.junit.Before;
-import org.junit.Test;
-
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import org.junit.Before;
+import org.junit.Test;
+
+import com.vaadin.server.VaadinRequest;
+
 public class UIThemeEscapingTest {
 
     private UI ui;

shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java

  */
 package com.vaadin.shared.ui.ui;
 
-import com.vaadin.shared.annotations.NoLoadingIndicator;
 import com.vaadin.shared.annotations.Delayed;
+import com.vaadin.shared.annotations.NoLoadingIndicator;
 import com.vaadin.shared.communication.ServerRpc;
 import com.vaadin.shared.ui.ClickRpc;
 

uitest/src/main/java/com/vaadin/tests/FocusingComponents.java

 import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.ListSelect;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Simple test helper to test Focusable.focus() method.

uitest/src/main/java/com/vaadin/tests/ModalWindow.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Simple program that demonstrates "modal windows" that block all access other

uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component.Listener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TestCaptionWrapper extends CustomComponent implements Listener {
 

uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java

 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class TestForContainerFilterable extends CustomComponent {
 

uitest/src/main/java/com/vaadin/tests/TestForUpload.java

 import com.vaadin.ui.Upload.FinishedEvent;
 import com.vaadin.ui.Upload.StartedEvent;
 import com.vaadin.ui.Upload.StartedListener;
+import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.ui.LegacyAbstractField;
 import com.vaadin.v7.ui.LegacyTextField;
-import com.vaadin.ui.VerticalLayout;
 
 public class TestForUpload extends CustomComponent
         implements Upload.ProgressListener {

uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java

 import com.vaadin.tests.util.SampleDirectory;
 import com.vaadin.ui.Component.Event;
 import com.vaadin.ui.Component.Listener;
-import com.vaadin.v7.ui.LegacyField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyField;
 
 /**
  * Browsable file explorer using Vaadin Tree component. Demonstrates: how to use

uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java

 import com.vaadin.server.LegacyApplication;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Notification;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class GAESyncTest extends LegacyApplication {
 

uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *

uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java

 import com.vaadin.ui.Label;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.ColumnHeaderMode;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyTextField;
 
 @SuppressWarnings("serial")
 public class Calc extends AbstractTestUI {

uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java

 import com.vaadin.ui.HasComponents.ComponentAttachListener;
 import com.vaadin.ui.HasComponents.ComponentDetachEvent;
 import com.vaadin.ui.HasComponents.ComponentDetachListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalSplitPanel;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public abstract class AbstractComponentContainerTest<T extends AbstractComponentContainer>
         extends AbstractComponentTest<T>

uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java

 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.ui.LegacyField;
 
 public abstract class ComponentTestCase<T extends AbstractComponent>
         extends AbstractComponentTestCase<T> {

uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class DisableEnableCascadeStyles extends TestBase {
 

uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.OptionGroup;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FocusAndBlurListeners extends TestBase {
 

uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java

 import com.vaadin.event.ShortcutAction.ModifierKey;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FocusFromShortcutAction extends TestBase {
 

uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java

 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class PrimaryStyle extends AbstractTestUI {
 

uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Notification;
 import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
 import com.vaadin.v7.ui.LegacyTextField;
-import com.vaadin.ui.Notification;
 
 public class AbstractFieldCommitWithInvalidValues extends TestBase {
 

uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java

 package com.vaadin.tests.components.calendar;
 
+import java.util.Date;
+import java.util.Locale;
+
 import com.vaadin.annotations.Theme;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Calendar;
 import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
 
 @Theme("tests-calendar")
 public class TestHideTimeAndSeparator extends AbstractTestUI {

uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java

 import com.vaadin.ui.CustomField;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  *

uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java

 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class CustomLayoutPrimaryStyleName extends TestBase {
 

uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class CustomLayoutUsingTemplate extends TestBase
         implements ClickListener {

uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.NativeButton;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class CustomLayoutUsingTheme extends TestBase implements ClickListener {
 

uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.CustomLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
 

uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyPopupDateField;
 import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.LegacyPopupDateField;
 
 @SuppressWarnings("serial")
 public class DateFieldEmptyValid extends TestBase {

uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java

 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyInlineDateField;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.LegacyInlineDateField;
 
 public class LegacyDateFieldRanges extends AbstractTestUI {
 

uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Label;
 import com.vaadin.v7.ui.LegacyDateField;
 import com.vaadin.v7.ui.LegacyPopupDateField;
-import com.vaadin.ui.Label;
 
 public class ValueThroughProperty extends TestBase {
     private final Property<Date> dateProperty = new ObjectProperty<Date>(null,

uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java

 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.TextArea;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.LegacyTextField;
 
 /**
  * Test UI for text area inside {@link DragAndDropWrapper}: text area should

uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java

 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.FormLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FormLayoutCaptionStyles extends TestBase {
 

uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java

 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class FormLayoutResizing extends AbstractTestUI {
 

uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java

 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
 import com.vaadin.ui.FormLayout;
+import com.vaadin.v7.ui.LegacyTextField;
 
 public class HtmlCaptionInFormLayout extends AbstractTestUI {
     @Override

uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java

 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.tests.widgetset.TestingWidgetSet;
 import com.vaadin.tests.widgetset.client.SimpleTestBean;
+import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.Label;
 
 @Widgetset(TestingWidgetSet.NAME)
 public class CustomRenderer extends AbstractTestUI {

uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java

 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.CssLayout;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.LegacyGrid;
+import com.vaadin.ui.LegacyGrid.Column;
 import com.vaadin.ui.themes.Reindeer;
 
 @Theme(Reindeer.THEME_NAME)

uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java

 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyGrid;
 import com.vaadin.ui.LegacyGrid.DetailsGenerator;
 import com.vaadin.ui.LegacyGrid.RowReference;
 import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 
 public class GridDetailsDetach extends AbstractTestUI {