diff options
| author | Artur Signell <artur@vaadin.com> | 2016-08-18 22:51:28 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2016-08-20 00:22:03 +0300 |
| commit | be6a0cfd847593985b6f226646c576df1906695b (patch) | |
| tree | fe108158c21ec255957b64ae71abecba44f46f2c | |
| parent | fe3dca081a64af892a7f4c0416ecc643aec3ec5a (diff) | |
| download | vaadin-framework-be6a0cfd847593985b6f226646c576df1906695b.tar.gz vaadin-framework-be6a0cfd847593985b6f226646c576df1906695b.zip | |
Organize imports
Change-Id: Iedb6ed985dfc6b69c4a4753a876545d67621898f
274 files changed, 434 insertions, 457 deletions
diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java index e9875cae71..082fa39014 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/JsonSerializer.java @@ -22,6 +22,7 @@ import com.google.gwt.core.ext.typeinfo.JType; 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 { diff --git a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java index 25877508e8..3e78b57a88 100644 --- a/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java +++ b/client-compiler/src/main/java/com/vaadin/server/widgetsetutils/metadata/ServerRpcVisitor.java @@ -24,8 +24,8 @@ import com.google.gwt.core.ext.typeinfo.JClassType; 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 diff --git a/client/src/main/java/com/vaadin/client/ApplicationConnection.java b/client/src/main/java/com/vaadin/client/ApplicationConnection.java index 470fc7d323..ad049c9549 100644 --- a/client/src/main/java/com/vaadin/client/ApplicationConnection.java +++ b/client/src/main/java/com/vaadin/client/ApplicationConnection.java @@ -53,6 +53,7 @@ import com.vaadin.client.communication.ServerRpcQueue; 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; diff --git a/client/src/main/java/com/vaadin/client/communication/DiffJSONSerializer.java b/client/src/main/java/com/vaadin/client/communication/DiffJSONSerializer.java index 098db50c3f..b0c1cf4772 100644 --- a/client/src/main/java/com/vaadin/client/communication/DiffJSONSerializer.java +++ b/client/src/main/java/com/vaadin/client/communication/DiffJSONSerializer.java @@ -17,6 +17,7 @@ package com.vaadin.client.communication; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.metadata.Type; + import elemental.json.JsonValue; public interface DiffJSONSerializer<T> extends JSONSerializer<T> { diff --git a/client/src/main/java/com/vaadin/client/communication/JSONSerializer.java b/client/src/main/java/com/vaadin/client/communication/JSONSerializer.java index af5689b863..3bd9d085fe 100644 --- a/client/src/main/java/com/vaadin/client/communication/JSONSerializer.java +++ b/client/src/main/java/com/vaadin/client/communication/JSONSerializer.java @@ -18,6 +18,7 @@ package com.vaadin.client.communication; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.metadata.Type; + import elemental.json.JsonValue; /** diff --git a/client/src/main/java/com/vaadin/client/extensions/FileDownloaderConnector.java b/client/src/main/java/com/vaadin/client/extensions/FileDownloaderConnector.java index 7f04c11bab..114cada56c 100644 --- a/client/src/main/java/com/vaadin/client/extensions/FileDownloaderConnector.java +++ b/client/src/main/java/com/vaadin/client/extensions/FileDownloaderConnector.java @@ -30,7 +30,6 @@ import com.vaadin.client.BrowserInfo; 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) diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java b/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java index 220cded849..af6f95b33e 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractClickEventHandler.java @@ -32,8 +32,8 @@ import com.google.gwt.user.client.Event; 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 { diff --git a/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java b/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java index c58bc91f71..918b7f1aa5 100644 --- a/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java +++ b/client/src/main/java/com/vaadin/client/ui/VCalendarPanel.java @@ -54,8 +54,8 @@ import com.google.gwt.user.client.ui.ListBox; 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; diff --git a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java index 8ab01d026d..976fbb11c5 100644 --- a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java @@ -18,12 +18,9 @@ package com.vaadin.client.ui.gridlayout; 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; diff --git a/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java b/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java index a7df46a600..dff2c28707 100644 --- a/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/loginform/LoginFormConnector.java @@ -16,6 +16,7 @@ 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; @@ -38,7 +39,6 @@ import com.vaadin.shared.ui.Connect; 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 diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/ColumnConfiguration.java b/client/src/main/java/com/vaadin/client/widget/escalator/ColumnConfiguration.java index 9260457778..91e9f8d556 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/ColumnConfiguration.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/ColumnConfiguration.java @@ -18,6 +18,8 @@ package com.vaadin.client.widget.escalator; import java.util.Map; +import com.vaadin.client.widgets.Escalator; + /** * A representation of the columns in an instance of {@link Escalator}. * diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java b/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java index 27b6467eb0..aee38b4ce4 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/EscalatorUpdater.java @@ -16,6 +16,8 @@ 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 diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java index 71182a4849..a8bcf4d809 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/FlyweightRow.java @@ -21,6 +21,7 @@ import java.util.Iterator; 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. diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/Row.java b/client/src/main/java/com/vaadin/client/widget/escalator/Row.java index 797e4dee46..85e3c93d05 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/Row.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/Row.java @@ -17,6 +17,7 @@ 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}. diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java index ab8492e661..0105aa687c 100644 --- a/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java +++ b/client/src/main/java/com/vaadin/client/widget/escalator/RowContainer.java @@ -19,6 +19,7 @@ package com.vaadin.client.widget.escalator; 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 diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java index a2a8aa27af..6476635829 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java +++ b/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java @@ -20,6 +20,8 @@ import java.lang.annotation.Retention; 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}. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java index 57c2fc1046..5411a63c15 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java @@ -57,8 +57,8 @@ import com.vaadin.ui.declarative.DesignException; 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; /** diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java index 63c6f5aeaf..ac9ffb0eeb 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java @@ -20,8 +20,8 @@ import com.vaadin.server.JavaScriptCallbackHelper; 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; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java index 7a87f8f4c1..3d7d5ab9d2 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java @@ -15,8 +15,6 @@ */ 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 diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java index c197f7415a..85d7801c41 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java @@ -16,7 +16,6 @@ package com.vaadin.ui.renderers; import com.vaadin.ui.LegacyGrid.AbstractRenderer; -import elemental.json.JsonValue; /** * A renderer for presenting HTML content. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java index ac73615272..799e67b9e7 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java @@ -16,7 +16,6 @@ package com.vaadin.ui.renderers; import com.vaadin.ui.LegacyGrid.AbstractRenderer; -import elemental.json.JsonValue; /** * A renderer for presenting simple plain-text string values. diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java index 93aa1350b0..e5aade1217 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java @@ -22,7 +22,6 @@ import org.junit.Assert; 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; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java index 979f472e20..0c6932c65e 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java @@ -1,13 +1,13 @@ 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java index 8ce298c065..3d12fc78ba 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java +++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java @@ -6,7 +6,6 @@ import java.sql.SQLException; 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; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java index 8688c9ae64..c8b5b5a2b3 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java +++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java @@ -2,8 +2,6 @@ package com.vaadin.data.util.sqlcontainer; 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; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java index 1c70c8dad7..42b02cf874 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java +++ b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java @@ -4,8 +4,6 @@ import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; -import org.junit.Test; - /** * Provides a JNDI initial context factory for the MockContext. */ diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java index f126e636ba..5897a1fc2d 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java @@ -17,14 +17,14 @@ package com.vaadin.tests.server.component.grid; 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java index 1af2577fa3..e5c46e3ba2 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java @@ -19,13 +19,13 @@ import static org.junit.Assert.assertEquals; 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java index 570e9b92fc..769532b03b 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java @@ -34,7 +34,6 @@ import java.util.Iterator; 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; @@ -45,6 +44,7 @@ import com.vaadin.server.KeyMapper; 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; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java index fa6c57df93..6bbac2977c 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java @@ -21,12 +21,12 @@ import java.util.Collection; 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java index 7b07aefcb2..c865bd8494 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java @@ -19,15 +19,15 @@ import java.io.IOException; 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java index 15daa264d9..6fe47b22a0 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java @@ -24,10 +24,6 @@ import static org.junit.Assert.assertTrue; 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; @@ -42,6 +38,9 @@ import com.vaadin.data.util.IndexedContainer; 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java index 452d2713a4..3bba51ab17 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java @@ -17,9 +17,9 @@ package com.vaadin.tests.server.component.grid; 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java index 7e910d2428..1a2011de73 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java @@ -21,13 +21,13 @@ import static org.junit.Assert.assertTrue; 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; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java index 7a8209d50b..95daf47e25 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java @@ -21,12 +21,12 @@ import static org.junit.Assert.assertNull; 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java index 1199486742..54e9b30988 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java @@ -19,7 +19,6 @@ import java.util.ArrayList; 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; @@ -29,6 +28,7 @@ import com.vaadin.data.Container; 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; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java index 71d24a2d8e..5a2afed01c 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java @@ -15,9 +15,10 @@ */ 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 diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java index 8ca99327dc..6d26b40996 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java @@ -17,22 +17,23 @@ package com.vaadin.tests.server.component.grid.declarative; 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() { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java index 3e97910be7..59ab5b8343 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java @@ -17,10 +17,10 @@ package com.vaadin.tests.server.component.grid.declarative; 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; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java index 1207063c16..ef536359be 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java @@ -15,17 +15,17 @@ */ 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java index f5b98824cd..8bf03e9d5e 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java @@ -15,11 +15,11 @@ */ 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java index b55b0815f8..1a0e0a1102 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java @@ -15,9 +15,9 @@ */ 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 { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java index f3b9b1cece..53f3d3acb8 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java @@ -25,7 +25,6 @@ import com.vaadin.ui.Table.Align; 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}. diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java index fca646813a..e96d320a34 100644 --- a/server/src/main/java/com/vaadin/event/FieldEvents.java +++ b/server/src/main/java/com/vaadin/event/FieldEvents.java @@ -25,8 +25,8 @@ import com.vaadin.ui.Component; 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. diff --git a/server/src/main/java/com/vaadin/server/VaadinServletService.java b/server/src/main/java/com/vaadin/server/VaadinServletService.java index 51085e9468..2adea189f7 100644 --- a/server/src/main/java/com/vaadin/server/VaadinServletService.java +++ b/server/src/main/java/com/vaadin/server/VaadinServletService.java @@ -26,7 +26,6 @@ import java.util.logging.Level; 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; diff --git a/server/src/main/java/com/vaadin/server/communication/DateSerializer.java b/server/src/main/java/com/vaadin/server/communication/DateSerializer.java index 200d22b154..dd2c246eda 100644 --- a/server/src/main/java/com/vaadin/server/communication/DateSerializer.java +++ b/server/src/main/java/com/vaadin/server/communication/DateSerializer.java @@ -19,6 +19,7 @@ import java.lang.reflect.Type; import java.util.Date; import com.vaadin.ui.ConnectorTracker; + import elemental.json.Json; import elemental.json.JsonValue; diff --git a/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java b/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java index 19e935a2a8..781563c59e 100644 --- a/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java +++ b/server/src/main/java/com/vaadin/server/communication/JSONSerializer.java @@ -18,6 +18,7 @@ package com.vaadin.server.communication; import java.lang.reflect.Type; import com.vaadin.ui.ConnectorTracker; + import elemental.json.JsonValue; /** diff --git a/server/src/main/java/com/vaadin/ui/FormLayout.java b/server/src/main/java/com/vaadin/ui/FormLayout.java index 4fe5fbb63a..e0cbfe41ff 100644 --- a/server/src/main/java/com/vaadin/ui/FormLayout.java +++ b/server/src/main/java/com/vaadin/ui/FormLayout.java @@ -20,8 +20,7 @@ import com.vaadin.shared.ui.MarginInfo; 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 diff --git a/server/src/main/java/com/vaadin/ui/GridLayout.java b/server/src/main/java/com/vaadin/ui/GridLayout.java index a644c466b6..546a89cdfc 100644 --- a/server/src/main/java/com/vaadin/ui/GridLayout.java +++ b/server/src/main/java/com/vaadin/ui/GridLayout.java @@ -36,8 +36,6 @@ import org.jsoup.select.Elements; 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; diff --git a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java index e33e88a7dc..554bd6a75f 100644 --- a/server/src/main/java/com/vaadin/ui/themes/Reindeer.java +++ b/server/src/main/java/com/vaadin/ui/themes/Reindeer.java @@ -15,6 +15,11 @@ */ 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"; diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java b/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java index 8ebfa53b29..dec8f9fef7 100644 --- a/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java @@ -48,8 +48,8 @@ import com.vaadin.v7.data.Validatable; 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> diff --git a/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java b/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java index c17847bfbb..0ac80ffca6 100644 --- a/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java +++ b/server/src/test/java/com/vaadin/server/VaadinHttpAndPortletRequestTestBase.java @@ -27,11 +27,9 @@ import javax.portlet.PortletRequest; 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> { diff --git a/server/src/test/java/com/vaadin/server/VaadinPortletRequestTest.java b/server/src/test/java/com/vaadin/server/VaadinPortletRequestTest.java index 2d15826cb7..b3094210b9 100644 --- a/server/src/test/java/com/vaadin/server/VaadinPortletRequestTest.java +++ b/server/src/test/java/com/vaadin/server/VaadinPortletRequestTest.java @@ -1,18 +1,20 @@ 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; diff --git a/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java b/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java index 67f078bd34..15ee2d5f2d 100644 --- a/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java +++ b/server/src/test/java/com/vaadin/server/data/datasource/ListDataSourceTest.java @@ -6,13 +6,14 @@ import java.util.Comparator; 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; diff --git a/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java b/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java index 4367734b66..1f96bf83a7 100644 --- a/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java +++ b/server/src/test/java/com/vaadin/server/data/datasource/bov/DataSourceBoVTest.java @@ -15,13 +15,6 @@ */ 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; @@ -29,6 +22,14 @@ import java.util.List; 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 * diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java index 9f0be5cd06..dcbab5de06 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java @@ -4,9 +4,9 @@ import org.junit.Assert; 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 { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java index daa6bdb080..3befeaffdf 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java @@ -30,9 +30,9 @@ import org.junit.Assert; 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}. diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java index 60cd8052e9..270958dd9d 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java @@ -4,9 +4,9 @@ import org.junit.Assert; 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 { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java index 8673bc6cfc..c1955d87f8 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java @@ -3,8 +3,8 @@ package com.vaadin.tests.data.converter; 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 { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java index 34efd94831..5c29c39452 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java @@ -4,9 +4,9 @@ import org.junit.Assert; 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 { diff --git a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java index 126c9c7e8a..2975331e8a 100644 --- a/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java +++ b/server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java @@ -10,9 +10,9 @@ import org.junit.Test; 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 { diff --git a/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java b/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java index 286040f26b..6479e1995a 100644 --- a/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java +++ b/server/src/test/java/com/vaadin/tests/design/nested/NestedCustomLayoutsTest.java @@ -15,20 +15,31 @@ */ 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 diff --git a/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java b/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java index d9a38452bf..f140a4376d 100644 --- a/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java +++ b/server/src/test/java/com/vaadin/tests/design/nested/ReadNestedTemplatesTest.java @@ -15,14 +15,14 @@ */ 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 diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java index 44ab13ef6f..bb4cc33040 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java @@ -11,8 +11,8 @@ import com.vaadin.tests.data.bean.Country; 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 { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java index d10a4ee48e..4193aa9141 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java @@ -17,8 +17,8 @@ import com.vaadin.tests.data.bean.Person; 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 { diff --git a/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java b/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java index f1ccf30c85..7c19694eec 100644 --- a/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java +++ b/server/src/test/java/com/vaadin/ui/UIThemeEscapingTest.java @@ -15,16 +15,17 @@ */ 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; diff --git a/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java b/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java index 99dae727cb..e6c7beb3e7 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java +++ b/shared/src/main/java/com/vaadin/shared/ui/ui/UIServerRpc.java @@ -15,8 +15,8 @@ */ 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; diff --git a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java index cf12ddaa32..fe730262ab 100644 --- a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java @@ -3,7 +3,6 @@ package com.vaadin.tests; 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; @@ -11,6 +10,7 @@ import com.vaadin.ui.GridLayout; 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. diff --git a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java index 52c14a8185..820cd64f19 100644 --- a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java @@ -19,11 +19,11 @@ package com.vaadin.tests; 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 diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java index a043cc0ca4..719a85a22b 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java @@ -25,7 +25,6 @@ import com.vaadin.ui.AbstractComponent; 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; @@ -47,6 +46,7 @@ import com.vaadin.ui.TwinColSelect; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java index 327e0a5459..35f356eb4a 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java @@ -19,13 +19,13 @@ package com.vaadin.tests; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java index 1ecaf51e68..91dd6503ec 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java @@ -46,9 +46,9 @@ import com.vaadin.ui.Upload; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java index de7c38dd97..2ac9b2c0b8 100644 --- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java @@ -24,12 +24,12 @@ import com.vaadin.server.VaadinSession; 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 diff --git a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java index 5ee23dac0e..bd93b6aebd 100644 --- a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java +++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java @@ -8,12 +8,12 @@ import com.vaadin.server.DownloadStream; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java index 50d728a247..602b66e512 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java @@ -25,13 +25,13 @@ import com.vaadin.ui.Alignment; 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; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java index a066379f27..fa3b2057dd 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java +++ b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java @@ -27,9 +27,9 @@ import com.vaadin.ui.HorizontalLayout; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java index 8b103b8ee4..c8b1da8e98 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java @@ -11,7 +11,6 @@ import com.vaadin.ui.HasComponents.ComponentAttachEvent; 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; @@ -21,6 +20,7 @@ import com.vaadin.ui.TabSheet; 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> diff --git a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java index b13d53d2d5..64df5b1f09 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java @@ -11,11 +11,11 @@ import com.vaadin.ui.AbstractComponent; 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> { diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java index c7da377302..bbd3f8c024 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java @@ -5,13 +5,13 @@ import java.util.Iterator; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java index 544d7b1446..8dbff74c69 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java +++ b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java @@ -9,7 +9,6 @@ import com.vaadin.event.FieldEvents.FocusListener; 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; @@ -18,6 +17,7 @@ import com.vaadin.ui.Layout; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java index 8e330c29cd..58c87df0a5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java +++ b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java @@ -6,8 +6,8 @@ import com.vaadin.event.ShortcutAction.KeyCode; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java index eb3ffcc8b7..f0dc432aeb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java @@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java index 5ac36b4275..dbc89baf64 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java @@ -5,9 +5,9 @@ import com.vaadin.tests.components.TestBase; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java index 60e8720d44..5467fc5b15 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java @@ -1,16 +1,13 @@ 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java index b26f00b5a4..f8eb65c121 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customfield/CustomFieldSize.java @@ -21,7 +21,6 @@ import com.vaadin.ui.Component; import com.vaadin.ui.CustomField; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -import com.vaadin.v7.ui.LegacyTextField; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java index e63e87b33d..bd57a857a1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java @@ -7,8 +7,8 @@ import java.io.InputStream; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java index 5c57daa75d..5d7870f504 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java @@ -7,9 +7,9 @@ import com.vaadin.tests.components.TestBase; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java index 5c0adfdece..f915b68f30 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java @@ -5,11 +5,11 @@ import com.vaadin.tests.util.LoremIpsum; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java index f6adf5ea38..c59efc951b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java @@ -23,8 +23,8 @@ import com.vaadin.tests.components.AbstractTestUIWithLog; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java index e96866607d..ae2c17f536 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java @@ -14,8 +14,8 @@ import com.vaadin.tests.util.Log; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java index 55d8e779d0..c4651ac0ff 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java @@ -12,14 +12,14 @@ import com.vaadin.shared.ui.datefield.Resolution; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java index a014f9ef6b..cb52f6a193 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java @@ -11,9 +11,9 @@ import com.vaadin.tests.components.TestBase; 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, diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java index b13f6539bb..77f22d6035 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java @@ -27,11 +27,11 @@ import com.vaadin.server.VaadinRequest; 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 diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java index c66a7d9f32..7b09f5ece1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.formlayout; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java index d86d574647..8c7c03b9f8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java @@ -19,12 +19,12 @@ import com.vaadin.server.VaadinRequest; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java index 6ad4a90c41..14c5524ce8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java @@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest; 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 diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java index c3f97ada3b..35da28944a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java @@ -23,9 +23,9 @@ import com.vaadin.server.VaadinRequest; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java index b9390a3127..62b266cb9d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java @@ -23,10 +23,10 @@ import com.vaadin.ui.Button; 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) diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java index 911335d5d1..338a2f383d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java @@ -23,11 +23,11 @@ import com.vaadin.tests.components.AbstractTestUI; 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 { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java index 64f6d0d406..0bf0afd9f7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java @@ -20,11 +20,11 @@ import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; +import com.vaadin.ui.HorizontalLayout; +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.HorizontalLayout; -import com.vaadin.ui.Label; /** * Tests the layouting of Grid's details row when it contains a HorizontalLayout diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java index bf471dde7e..a8ede14a24 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java @@ -23,12 +23,12 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; +import com.vaadin.ui.Label; +import com.vaadin.ui.Layout; 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.Layout; import com.vaadin.ui.TextField; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java index ade6d66c6f..c4901ba855 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java @@ -20,11 +20,11 @@ import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.LegacyGrid.Column; import com.vaadin.ui.LegacyGrid.DetailsGenerator; import com.vaadin.ui.LegacyGrid.RowReference; -import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java index cb22e6046f..86c868eda7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java @@ -17,9 +17,9 @@ package com.vaadin.tests.components.grid; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.LegacyGrid.SelectionMode; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; +import com.vaadin.ui.LegacyGrid.SelectionMode; import com.vaadin.ui.VerticalLayout; public class GridDragSelectionWhileScrolled extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java index c2d114657f..fe58a15204 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java @@ -16,9 +16,9 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.LegacyGrid.SelectionMode; -import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; @Push diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java index 885e8ae9f9..3d064ebf29 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java @@ -22,11 +22,11 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.LegacyGrid.HeaderRow; import com.vaadin.ui.LegacyGrid.SelectionMode; import com.vaadin.ui.LegacyGrid.SelectionModel; -import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.renderers.NumberRenderer; public class GridHeaderFormatChange extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java index 986d4a3d77..57d5fa9533 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java @@ -28,11 +28,11 @@ import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; +import com.vaadin.ui.HorizontalLayout; +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.HorizontalLayout; -import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java index f9df174cb4..f4186ea32e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java @@ -19,11 +19,11 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Label; import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.LegacyGrid.CellReference; import com.vaadin.ui.LegacyGrid.CellStyleGenerator; import com.vaadin.ui.LegacyGrid.SelectionMode; -import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; public class GridInTabSheet extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java index 68c41e60cb..ff69aa3595 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java @@ -20,11 +20,11 @@ import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; +import com.vaadin.ui.GridLayout; +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.GridLayout; -import com.vaadin.ui.Label; /** * Tests that details row displays GridLayout contents properly. diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java index c8a473bc01..8bf11bcc7b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java @@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.renderers.ButtonRenderer; import com.vaadin.ui.renderers.HtmlRenderer; import com.vaadin.ui.renderers.TextRenderer; diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java index 25fe0c7570..43edaf7aa8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java @@ -1,5 +1,8 @@ package com.vaadin.tests.components.grid; +import java.util.Arrays; +import java.util.List; + import com.vaadin.data.Property; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.grid.HeightMode; @@ -9,9 +12,6 @@ import com.vaadin.ui.NativeSelect; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; -import java.util.Arrays; -import java.util.List; - public class GridRowHeightChange extends AbstractTestUI { private final List<String> themes = Arrays.asList("valo", "reindeer", diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java index 1698acc917..28709d1b76 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java @@ -23,8 +23,8 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java index 2b442981ae..35ea5fef14 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java @@ -19,8 +19,8 @@ import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Alignment; -import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.LegacyGrid; @Theme("valo") public class GridSidebarPosition extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java index dd69a98173..85830f0368 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java @@ -19,11 +19,11 @@ import java.util.Collection; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Label; import com.vaadin.ui.LegacyGrid; import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; import com.vaadin.v7.ui.LegacyField; -import com.vaadin.ui.Label; public class GridWithLabelEditor extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java index 5c4d2497af..9958f28517 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java @@ -16,8 +16,8 @@ package com.vaadin.tests.components.grid; import com.vaadin.tests.widgetset.client.grid.RowAwareRendererConnector.RowAwareRendererRpc; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; import com.vaadin.ui.Label; +import com.vaadin.ui.LegacyGrid.AbstractRenderer; public class RowAwareRenderer extends AbstractRenderer<Void> { public RowAwareRenderer(final Label debugLabel) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java index 807c46e110..837e18f8f5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java @@ -27,10 +27,10 @@ import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.LegacyGrid.SelectionMode; import com.vaadin.ui.NativeButton; import com.vaadin.ui.renderers.ButtonRenderer; -import com.vaadin.ui.renderers.ImageRenderer; -import com.vaadin.ui.renderers.ProgressBarRenderer; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent; import com.vaadin.ui.renderers.ClickableRenderer.RendererClickListener; +import com.vaadin.ui.renderers.ImageRenderer; +import com.vaadin.ui.renderers.ProgressBarRenderer; @SuppressWarnings("all") public class WidgetRenderers extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java index 90e4cb9bfe..6a2c614d22 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java @@ -52,6 +52,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; +import com.vaadin.ui.Label; import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.LegacyGrid.CellDescriptionGenerator; import com.vaadin.ui.LegacyGrid.CellReference; @@ -73,7 +74,6 @@ import com.vaadin.ui.LegacyGrid.RowReference; import com.vaadin.ui.LegacyGrid.RowStyleGenerator; import com.vaadin.ui.LegacyGrid.SelectionMode; import com.vaadin.ui.LegacyGrid.SelectionModel; -import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.ui.Panel; import com.vaadin.ui.renderers.DateRenderer; diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java index 7dd068b8f8..76ce838571 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java +++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java @@ -5,10 +5,10 @@ import com.vaadin.tests.components.TestBase; 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.Notification; import com.vaadin.ui.TextArea; +import com.vaadin.v7.ui.LegacyTextField; public class NotificationsHtmlAllowed extends TestBase implements ClickListener { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java index 5899f1ac0a..945454645a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java @@ -7,8 +7,8 @@ import com.vaadin.ui.Alignment; 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.HorizontalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class HorizontalLayoutFullsizeContentWithErrorMsg extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java index 2f92533f32..ea60c2ca67 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java @@ -3,11 +3,11 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; +import com.vaadin.v7.ui.LegacyTextField; public class VerticalLayoutWidthCalculation extends AbstractTestCase { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java index 283d9b0ff1..f631583fd6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java @@ -10,9 +10,9 @@ import com.vaadin.event.ShortcutAction.ModifierKey; 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.Panel; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class PanelShouldRemoveActionHandler extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java index 8ad32f8ce7..e9659f3457 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java @@ -4,9 +4,9 @@ import com.vaadin.tests.components.TestBase; 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.Notification; import com.vaadin.ui.PopupView; +import com.vaadin.v7.ui.LegacyTextField; public class PopupViewNullValues extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java index 218a94c3ac..e4c91150c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java @@ -4,8 +4,8 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.PopupView; import com.vaadin.ui.PopupView.Content; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; @SuppressWarnings("serial") public class PopupViewShouldCloseOnTabOut extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java index df1d6df463..5af27a2559 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java @@ -1,11 +1,7 @@ package com.vaadin.tests.components.richtextarea; -import com.vaadin.data.Property; -import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc; -import com.vaadin.tests.components.AbstractComponentTest; -import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.RichTextArea; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java index 5d184d66af..33836dd98d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java @@ -13,12 +13,12 @@ import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.LegacyField; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.ui.Label; import com.vaadin.ui.Table; +import com.vaadin.v7.ui.LegacyField; public class EditableTableLeak extends TestBase { private final Table table = new Table("ISO-3166 Country Codes and flags"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java index 05f1d538fd..a5e3a4f472 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java @@ -7,7 +7,6 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Table; -import com.vaadin.ui.VerticalLayout; public class LongMultiselect extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java index aee373d8f0..3b8cfac1b3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java @@ -14,8 +14,8 @@ import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.Table.ColumnGenerator; -import com.vaadin.v7.ui.LegacyField; import com.vaadin.ui.TableFieldFactory; +import com.vaadin.v7.ui.LegacyField; public class PropertyValueChange extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java index 5c39cc5695..873cc24566 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java @@ -10,10 +10,10 @@ import com.vaadin.ui.ComboBox; import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HasChildMeasurementHint.ChildMeasurementHint; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Table; +import com.vaadin.v7.ui.LegacyTextField; public class TableChildMeasurementHint extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java index f0e4b8de7a..33b51398ec 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java @@ -6,11 +6,11 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Table; +import com.vaadin.v7.ui.LegacyTextField; public class TableItemDescriptionGeneratorUI extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java index 2ab23f6b9f..aec3946265 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java @@ -5,9 +5,9 @@ import com.vaadin.tests.components.TestBase; 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.Table; +import com.vaadin.v7.ui.LegacyTextField; public class TablePageLengthUpdate extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java index 4160c6438b..897c9e58b5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java @@ -28,6 +28,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ConnectorTracker; import com.vaadin.ui.Table; + import elemental.json.JsonObject; @Push diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java index 8bcb7e0485..35d1a5ecda 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java @@ -10,11 +10,11 @@ import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.Component; import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.ui.Table; +import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.LegacyTextField; public class TableUnregisterComponent extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java index d13a75c4f4..a1d4f890cc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java @@ -6,9 +6,9 @@ import com.vaadin.server.VaadinRequest; 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.Table; +import com.vaadin.v7.ui.LegacyTextField; public class TextFieldRelativeWidth extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java index 3d32cadb0a..ac56142a4b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheet.java @@ -1,12 +1,11 @@ package com.vaadin.tests.components.tabsheet; -import com.vaadin.annotations.VaadinServletConfiguration; import com.vaadin.server.VaadinRequest; -import com.vaadin.server.VaadinServlet; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.*; - -import javax.servlet.annotation.WebServlet; +import com.vaadin.ui.Button; +import com.vaadin.ui.Label; +import com.vaadin.ui.TabSheet; +import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") public class FirstTabNotVisibleInTabsheet extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java index 969e76691e..8607dfe42e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClipped.java @@ -1,12 +1,17 @@ package com.vaadin.tests.components.tabsheet; -import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.*; - import java.util.HashMap; import java.util.Map; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Layout; +import com.vaadin.ui.TabSheet; +import com.vaadin.ui.VerticalLayout; + public class FirstTabNotVisibleWhenTabsheetNotClipped extends AbstractTestUI { private TabSheet.Tab firstNotClippedTab; diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java index 446c993278..c6ce5418b4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java @@ -17,8 +17,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * Test if the click and key tab selection in a tabsheet generate the correct diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java index f02f5823d2..a1e060fbd6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java @@ -11,8 +11,8 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TabSheet.Tab; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class TabKeyboardNavigationWaiAria extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java index 1ba991d1cb..c79abdb2b2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java @@ -3,11 +3,11 @@ package com.vaadin.tests.components.tabsheet; 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.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; +import com.vaadin.v7.ui.LegacyTextField; public class TabSheetDiscardsMovedComponents extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java index 8f6e9f8c50..a0f65129f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java +++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java @@ -3,10 +3,10 @@ package com.vaadin.tests.components.tabsheet; 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.Component; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class TabsheetShouldUpdateHeight extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java index b5496832ce..44c0aea24e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java @@ -8,8 +8,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TextArea; import com.vaadin.v7.ui.LegacyAbstractField; import com.vaadin.v7.ui.LegacyAbstractTextField; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode; +import com.vaadin.v7.ui.LegacyTextField; public class TextAreaCursorPosition extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java index de4bbd4788..a3d98b2555 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java @@ -22,8 +22,8 @@ import com.vaadin.tests.components.AbstractTestUIWithLog; 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.v7.ui.LegacyTextField; /** * Test to verify fields become implicitly "immediate" when adding value change diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java index cba8058418..080a4f8523 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java @@ -26,9 +26,9 @@ import com.vaadin.tests.components.AbstractTestUIWithLog; 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.FormLayout; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * @since 7.2 diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java index f8d2c9e235..c576f2c924 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java @@ -22,8 +22,8 @@ import com.vaadin.server.VaadinRequest; 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; /** * To verify bug fix: Reproducing of bug Textfield value not updated when diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java index 874a7d9645..7251195ccf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components.textfield; +import java.math.BigDecimal; +import java.util.Locale; + import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.v7.ui.LegacyTextField; -import java.math.BigDecimal; -import java.util.Locale; - public class LocaleChangeOnReadOnlyField extends AbstractTestUI { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java index bfb46ae1d3..90da113cda 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java @@ -11,8 +11,8 @@ import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode; +import com.vaadin.v7.ui.LegacyTextField; public class TextChangeEvents2 extends TestBase { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java index 5af2103be1..bc4f3a6e00 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java @@ -4,8 +4,8 @@ import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode; +import com.vaadin.v7.ui.LegacyTextField; public class TextChangeListenerChangingNonTextProperties extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java index ecbc6f535a..f396590fb4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java @@ -5,9 +5,9 @@ import com.vaadin.event.FieldEvents.TextChangeListener; 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.v7.ui.LegacyAbstractTextField.TextChangeEventMode; import com.vaadin.ui.Label; +import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode; +import com.vaadin.v7.ui.LegacyTextField; public class TextChangeTimeoutAfterDetach extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java index c638bbc1c9..b1ee195dbd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.textfield; import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode; +import com.vaadin.v7.ui.LegacyTextField; public class TextFieldEagerRepaint extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java index 5a043e6303..7ad3900f4a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java +++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java @@ -6,8 +6,8 @@ import com.vaadin.tests.util.Log; 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.v7.ui.LegacyTextField; public class TextFieldInputPromptAndClickShortcut extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java index 0ff5d125f8..44d0943f2d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java @@ -7,9 +7,9 @@ import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.NativeButton; +import com.vaadin.v7.ui.LegacyTextField; public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog { diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java index 4b08f7ac64..0592c60bed 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java @@ -8,9 +8,9 @@ import com.vaadin.server.VaadinRequest; 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.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class BackButtonTest extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java index 67c37ba474..151a92d5af 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java @@ -4,8 +4,8 @@ import com.vaadin.server.VaadinRequest; 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.HorizontalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class ThemeTestUI extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java index 30e6ceee12..cf0f5f9279 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java @@ -9,7 +9,6 @@ import com.vaadin.ui.TextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.themes.ChameleonTheme; import com.vaadin.ui.themes.Reindeer; -import com.vaadin.v7.ui.LegacyTextField; public class TextFieldsCssTest extends GridLayout { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java index 1ddaf288fd..ba27a48efe 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java @@ -5,10 +5,10 @@ import com.vaadin.event.ShortcutAction; 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.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; +import com.vaadin.v7.ui.LegacyTextField; public class SubWindowFocus extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java index 1a36959afb..450e46eba5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java @@ -10,12 +10,12 @@ import com.vaadin.event.ShortcutAction; 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.ComponentContainer; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; +import com.vaadin.v7.ui.LegacyTextField; public class SubWindowFocusAndBlurListeners extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java index 13244317d1..59b497cd8c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java @@ -4,13 +4,13 @@ import com.vaadin.tests.components.TestBase; 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.ComponentContainer; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; +import com.vaadin.v7.ui.LegacyTextField; public class SubWindows extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java index 03ba4b29c5..42c70ed700 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java @@ -12,9 +12,9 @@ import com.vaadin.shared.ui.MarginInfo; 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.ui.Notification; +import com.vaadin.v7.ui.LegacyTextField; public class WindowShouldRemoveActionHandler extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java index 787f917afd..cbd4a622ef 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java @@ -6,11 +6,11 @@ import com.vaadin.server.Sizeable; 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.CheckBox; import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class BeanItemContainerFilteringTest extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java index 032bf422ee..fb60a12619 100644 --- a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java +++ b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java @@ -6,11 +6,11 @@ import com.vaadin.server.Sizeable; 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.CheckBox; import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class IndexedContainerFilteringTest extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java index 0fc6839a70..f4936806e4 100644 --- a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java +++ b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java @@ -20,9 +20,9 @@ import com.vaadin.shared.ui.grid.GridConstants.Section; import com.vaadin.tests.util.PersonContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.LegacyGrid.GridContextClickEvent; -import com.vaadin.ui.HorizontalLayout; public class GridContextClick extends AbstractContextClickUI<LegacyGrid, GridContextClickEvent> { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java index 8825e36dd5..1311e02b42 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOS.java @@ -1,5 +1,8 @@ package com.vaadin.tests.extensions; +import java.io.ByteArrayInputStream; +import java.io.InputStream; + import com.vaadin.server.FileDownloader; import com.vaadin.server.StreamResource; import com.vaadin.server.VaadinRequest; @@ -7,8 +10,6 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; -import java.io.*; - public class IframeIsOpenedInNonIOS extends AbstractTestUI { public static final String FILE_CONTENT = "New text file"; diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index d16a99e131..7e8547cfac 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -28,6 +28,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.JavaScriptFunction; import com.vaadin.ui.Notification; + import elemental.json.JsonArray; public class SimpleJavaScriptExtensionTest extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java index 92b207cefc..c3700fdf9b 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java @@ -14,11 +14,6 @@ import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.data.bean.Sex; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.data.util.converter.LegacyStringToBooleanConverter; -import com.vaadin.v7.data.validator.LegacyEmailValidator; -import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator; -import com.vaadin.v7.data.validator.LegacyStringLengthValidator; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Notification; @@ -26,6 +21,11 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.data.util.converter.LegacyStringToBooleanConverter; +import com.vaadin.v7.data.validator.LegacyEmailValidator; +import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator; +import com.vaadin.v7.data.validator.LegacyStringLengthValidator; +import com.vaadin.v7.ui.LegacyTextField; public class BasicPersonForm extends AbstractTestUIWithLog { diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java index 48c258069a..c632fa9d73 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java @@ -13,11 +13,11 @@ import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.data.bean.Person; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Notification; import com.vaadin.v7.ui.LegacyDateField; import com.vaadin.v7.ui.LegacyInlineDateField; import com.vaadin.v7.ui.LegacyPopupDateField; import com.vaadin.v7.ui.LegacyTextField; -import com.vaadin.ui.Notification; public class DateForm extends AbstractTestUIWithLog { diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java index ea60132e1d..cb657a8d91 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java @@ -12,10 +12,10 @@ import com.vaadin.tests.data.bean.Sex; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.Notification; import com.vaadin.ui.Table; import com.vaadin.ui.TextArea; +import com.vaadin.v7.ui.LegacyTextField; public class FieldBinderWithBeanValidation extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java index 5f81ee248b..97c06a33bd 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/PersonBeanWithValidationAnnotations.java @@ -1,8 +1,9 @@ package com.vaadin.tests.fieldgroup; +import java.io.Serializable; + import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import java.io.Serializable; public class PersonBeanWithValidationAnnotations implements Serializable { @NotNull(message = MultipleValidationErrors.FIRST_NAME_NOT_NULL_VALIDATION_MESSAGE) diff --git a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java index 72aea19ce1..390fc3375d 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java @@ -36,8 +36,8 @@ import com.vaadin.ui.Notification.Type; import com.vaadin.ui.UI; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.Receiver; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * Adapted from old PortletDemo to support integration testing. diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java index ed80acb4c4..817ca63088 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/ProxyTest.java @@ -18,12 +18,12 @@ package com.vaadin.tests.integration; import javax.servlet.http.HttpServletRequest; +import org.eclipse.jetty.proxy.ProxyServlet; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.proxy.ProxyServlet; import com.vaadin.annotations.PreserveOnRefresh; import com.vaadin.server.ExternalResource; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java index dd0aba5897..d99c5751cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java @@ -13,8 +13,6 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.LegacyAbstractField; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; @@ -25,6 +23,8 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.NativeButton; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.ui.LegacyTextField; public class CaptionsInLayouts extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java index 812cc5b965..673caa310b 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java @@ -4,8 +4,8 @@ import com.vaadin.tests.components.TestBase; 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.CssLayout; +import com.vaadin.v7.ui.LegacyTextField; @SuppressWarnings("serial") public class CssLayoutRemoveComponent extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java index 1cc6427451..922b960652 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java @@ -4,8 +4,8 @@ import com.vaadin.tests.components.TestBase; 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.CssLayout; +import com.vaadin.v7.ui.LegacyTextField; public class CssLayoutRemoveComponentWithCaption extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 555843cd97..e6161e77d3 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -4,11 +4,11 @@ import com.vaadin.tests.components.TestBase; 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.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class GridLayoutExpandRatioModification extends TestBase implements ClickListener { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java index e014f2eb34..1f8a477314 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java @@ -10,7 +10,6 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; @@ -19,6 +18,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class LayoutPerformanceTests extends TestBase { private static final String[] widths = { null, "100%", "200px" }; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java index 79e65854fc..184d327834 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java @@ -4,8 +4,8 @@ import com.vaadin.tests.components.TestBase; 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.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; @SuppressWarnings("serial") public class MovingInvisibleField extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java index d0e21cb482..3881223c10 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java @@ -12,7 +12,6 @@ import com.vaadin.ui.Alignment; 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.HorizontalLayout; import com.vaadin.ui.Label; @@ -21,6 +20,7 @@ import com.vaadin.ui.ListSelect; import com.vaadin.ui.Panel; import com.vaadin.ui.TextArea; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class OrderedLayoutBasics extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java index 1b5203deba..dfc72399a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java @@ -5,7 +5,6 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; @@ -14,6 +13,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class TestLayoutPerformance extends TestBase { private NativeSelect ns; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 0eef48a7e8..3b708b1a82 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -4,10 +4,10 @@ import com.vaadin.tests.components.TestBase; 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.v7.ui.LegacyTextField; public class VerticalLayoutExpandRatioModification extends TestBase implements ClickListener { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java index c8bd332eba..28edca3249 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java @@ -2,12 +2,11 @@ package com.vaadin.tests.layouts.gridlayout; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -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.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.v7.ui.LegacyTextField; public class GridLayoutMoveComponent extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java index 7ee5cf85f7..64e5998eca 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java @@ -4,11 +4,11 @@ import com.vaadin.server.VaadinRequest; 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.CustomComponent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.NativeButton; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; public class GridLayoutWidthChange extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java index 83cc7b41ae..a270835e3f 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java @@ -22,10 +22,10 @@ import com.vaadin.ui.AbstractLayout; 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.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Table; +import com.vaadin.v7.ui.LegacyTextField; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java index 91aeee0612..568afd2620 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java @@ -28,13 +28,13 @@ import com.vaadin.ui.Alignment; 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.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java index d3a03ecc95..c549830429 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java @@ -21,10 +21,10 @@ import com.vaadin.ui.AbstractComponent; 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.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Table; +import com.vaadin.v7.ui.LegacyTextField; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java index fc85cb3c2f..f356f5575c 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java index a2105ca7b1..c2492d72fc 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HCaption.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseCaption; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java index f8242181cb..9892531ac5 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java index e5a126aea2..2073ba0604 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseIcon; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java index 950aea8c10..bcfd6f398a 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutExpand.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseLayoutExpand; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java index a3c566c4fa..f5c435bee4 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseLayoutForSpacingMargin; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java index e29b03ae18..d196eee645 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseRegError; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java index 6de5cadb59..edb06023a1 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; import com.vaadin.ui.HorizontalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java index 834271f3f8..42b3c30076 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAddReplaceMove.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java index 2e23005680..4591b31108 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VCaption.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseCaption; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java index f2fa741684..98efc88ab5 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java index 043edf6cee..6f18e9cca9 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseIcon; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java index bba24a9148..17fe065fd4 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutExpand.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseLayoutExpand; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java index 2705a73b1b..c754e211cf 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseLayoutForSpacingMargin; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java index bf4b4fc8f4..45982876da 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseRegError; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java index 1e5247bbcd..458359d4b1 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java index 77e197a01f..25f2ed6544 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java @@ -6,10 +6,10 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinService; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * Tutorial example for diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java index 25181ef6f6..c7bbcbe026 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java @@ -24,11 +24,11 @@ import com.vaadin.tests.minitutorials.v7_4.GridExampleHelper; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; +import com.vaadin.ui.Image; +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.Image; -import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java index 9abcdfd117..918d2f4b71 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java @@ -7,9 +7,9 @@ import com.vaadin.tests.components.AbstractTestUI; 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.Notification; +import com.vaadin.v7.ui.LegacyTextField; public class IntegerTextFieldDataSource extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java index 5d5554cc0b..e1e0601a20 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java @@ -5,11 +5,11 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.ui.LegacyTextField; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; +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 IntegerTextFieldStandalone extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java index 5af5fa4483..9bd379c301 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java @@ -7,10 +7,10 @@ import com.vaadin.tests.components.AbstractTestUI; 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.util.converter.LegacyConverter; import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; import com.vaadin.v7.ui.LegacyTextField; -import com.vaadin.ui.Notification; public class StringMyTypeConverter extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java index a33d806427..5b24247807 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a3/Flot.java @@ -24,6 +24,7 @@ import com.vaadin.annotations.JavaScript; import com.vaadin.ui.AbstractJavaScriptComponent; import com.vaadin.ui.JavaScriptFunction; import com.vaadin.ui.Notification; + import elemental.json.JsonArray; @JavaScript({ diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java index 8cab38cb45..146432789a 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java @@ -20,10 +20,10 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinService; 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.ui.UI; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; //Remove comment to preserve UI value when reloading //@PreserveOnRefresh diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java index d8f31b2acf..d08b2fa8c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java @@ -31,13 +31,13 @@ import com.vaadin.ui.Alignment; 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.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.PushConfiguration; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.ui.LegacyTextField; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java index 264dc9f3d4..0e06854736 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java @@ -28,9 +28,9 @@ import com.vaadin.tests.util.LoremIpsum; 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.UI; +import com.vaadin.v7.ui.LegacyTextField; public abstract class PushLargeData extends AbstractTestUIWithLog { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java index 8e873b0f1a..4d95a9c5f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java @@ -1,9 +1,9 @@ package com.vaadin.tests.themes.valo; -import com.vaadin.annotations.*; -import com.vaadin.server.*; -import com.vaadin.tests.components.*; -import com.vaadin.ui.*; +import com.vaadin.annotations.Theme; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Table; @Theme("valo") public class TableSortIndicator extends AbstractTestUI { diff --git a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java index 0b8fb18449..63f1e4566d 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/ResynchronizeUITest.java @@ -20,12 +20,8 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import org.openqa.selenium.By; import org.openqa.selenium.StaleElementReferenceException; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.Browser; diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java index af14bb6158..a7b8c23c93 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyleTest.java @@ -17,15 +17,14 @@ package com.vaadin.tests.components.abstractcomponent; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsCollectionWithSize.hasSize; -import static org.junit.Assert.assertEquals; import java.util.List; -import com.vaadin.testbench.elements.ButtonElement; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class PrimaryStyleTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java index 960823ed91..c13074b825 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/checkbox/CheckBoxRpcCountTest.java @@ -15,17 +15,15 @@ */ package com.vaadin.tests.components.checkbox; -import static org.junit.Assert.assertEquals; - -import com.vaadin.testbench.elements.CheckBoxElement; -import com.vaadin.testbench.elements.LabelElement; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedCondition; +import com.vaadin.testbench.elements.CheckBoxElement; +import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import org.openqa.selenium.support.ui.ExpectedCondition; public class CheckBoxRpcCountTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java index 76d8dd11f9..2e40d16abe 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java @@ -15,19 +15,20 @@ */ package com.vaadin.tests.components.combobox; -import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.ComboBoxElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import java.util.List; + import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; -import java.util.List; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.tests.tb3.MultiBrowserTest; /** * When pressed down key, while positioned on the last item - should show next diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java index 814e526661..d25eee2ef5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java @@ -15,18 +15,19 @@ */ package com.vaadin.tests.components.combobox; -import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.ComboBoxElement; -import com.vaadin.testbench.elements.VerticalLayoutElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +import java.util.List; + import org.junit.Before; import org.junit.Test; import org.openqa.selenium.WebElement; -import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.testbench.elements.VerticalLayoutElement; +import com.vaadin.tests.tb3.MultiBrowserTest; /** * Tests ComboBox inputs and selections. diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java index ce886331c5..48ba71fe60 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java @@ -15,13 +15,14 @@ */ package com.vaadin.tests.components.combobox; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import org.junit.Test; + import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; @SuppressWarnings("serial") public class ComboSelectedValueBeyondTheFirstDropdownPageTest diff --git a/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java index 9f1fc6b03e..48e681c8c5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/customcomponent/CustomComponentChildVisibilityTest.java @@ -1,12 +1,13 @@ package com.vaadin.tests.components.customcomponent; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; public class CustomComponentChildVisibilityTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java index 29476b9ae6..8132c3b93f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java @@ -1,13 +1,14 @@ package com.vaadin.tests.components.formlayout; -import com.vaadin.testbench.elements.TableElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import java.io.IOException; + import org.junit.Ignore; import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; -import java.io.IOException; +import com.vaadin.testbench.elements.TableElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class TableInFormLayoutCausesScrollingTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java index 965d11b2e9..927910fa48 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java index d63180a9f5..80c3cc7ceb 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java @@ -23,7 +23,6 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java index 66ca4616c6..7b385f0005 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest; public class GridEditorConverterNotFoundTest extends GridBasicFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java index b688970bda..dcd01ebb3e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java index 8c6064ddaa..7e860553b6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java @@ -22,7 +22,6 @@ import org.junit.Test; import org.openqa.selenium.By; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java index acea49bde3..f0e77eb5c3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java @@ -21,7 +21,6 @@ import java.io.IOException; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class GridMultiSelectionScrollBarTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java index d277effec8..5e50b98295 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import org.openqa.selenium.By; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java index 97d94605f1..c5cfc65a5e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java @@ -1,15 +1,16 @@ package com.vaadin.tests.components.grid; +import static org.junit.Assert.assertEquals; + import java.util.Arrays; import java.util.List; +import org.junit.Test; + import com.vaadin.testbench.By; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.NativeSelectElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; public class GridRowHeightChangeTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java index 41a9ae947d..093a7b6d7b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java index 399bbb5533..d0db225816 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java @@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java index fa6b41e55f..8a525b5cdd 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class GridWithLabelEditorTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java index 78b9cc499c..68decedb18 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java @@ -21,7 +21,6 @@ import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java index 4fe49af0df..381c7b8ce6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java @@ -15,15 +15,14 @@ */ package com.vaadin.tests.components.grid; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.LabelElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; - -import java.util.List; - -import static org.junit.Assert.assertEquals; @TestCategory("grid") public class NullRenderersTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java index 8e507339ff..9cf9a122e5 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java @@ -18,7 +18,6 @@ package com.vaadin.tests.components.grid; import org.junit.Assert; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.OptionGroupElement; import com.vaadin.tests.tb3.SingleBrowserTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java index 32807e8f0c..766be62b8c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java @@ -27,7 +27,6 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; import com.vaadin.testbench.parallel.TestCategory; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java index 491c878ed0..cb9b8c1389 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java @@ -1,10 +1,9 @@ package com.vaadin.tests.components.grid.basicfeatures; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; +import com.vaadin.tests.components.grid.LegacyGridElement; import com.vaadin.tests.tb3.MultiBrowserTest; @SuppressWarnings("all") diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java index 5996a5dc61..80f04a051e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java @@ -15,13 +15,13 @@ */ package com.vaadin.tests.components.grid.basicfeatures.server; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; +import com.vaadin.tests.components.grid.LegacyGridElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java index 10bb338ad6..edc59cf5ec 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java @@ -18,10 +18,9 @@ package com.vaadin.tests.components.grid.basicfeatures.server; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Test; -import com.vaadin.testbench.elements.GridElement; +import com.vaadin.tests.components.grid.LegacyGridElement; import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest; public class GridScrollTest extends GridBasicFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java index 7a540abd4b..7865dfebd8 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java @@ -25,7 +25,6 @@ import static org.junit.Assert.fail; import java.util.List; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Test; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; @@ -35,6 +34,7 @@ import com.vaadin.testbench.TestBenchElement; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.NotificationElement; +import com.vaadin.tests.components.grid.LegacyGridElement; import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures; import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest; diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java index 70402c3854..7ff432d5a1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.grid.basicfeatures.server; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; @@ -24,6 +23,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import com.vaadin.testbench.elements.GridElement; +import com.vaadin.tests.components.grid.LegacyGridElement; import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest; public class LoadingIndicatorTest extends GridBasicFeaturesTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java index 2c512b0552..dd76651415 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayoutTest.java @@ -1,13 +1,11 @@ package com.vaadin.tests.components.gridlayout; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.tests.tb3.AbstractTB3Test; -import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; - import java.io.IOException; -import static org.junit.Assert.*; +import org.junit.Test; + +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class MoveComponentsFromGridLayoutToInnerLayoutTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java index 24a7fb21bb..2487aa3863 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuItemStyleRemovedTest.java @@ -1,14 +1,15 @@ package com.vaadin.tests.components.menubar; -import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.MenuBarElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import java.util.List; + import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.WebElement; -import java.util.List; +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.testbench.elements.MenuBarElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class MenuItemStyleRemovedTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java index 613efbb566..b2f7994e9b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java @@ -4,7 +4,6 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.elements.NativeSelectElement; -import com.vaadin.tests.tb3.SingleBrowserTest; import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; public class NativeSelectNullTest extends SingleBrowserTestPhantomJS2 { diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java index f4e942c53e..40bca3d6c3 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationDelayTest.java @@ -15,7 +15,6 @@ */ package com.vaadin.tests.components.notification; -import com.vaadin.tests.tb3.MultiBrowserTest; import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; @@ -23,6 +22,8 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedCondition; +import com.vaadin.tests.tb3.MultiBrowserTest; + /** * Test to check notification delay. * diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java index be9345d588..be33fc3067 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/DisabledPopupViewTest.java @@ -1,11 +1,12 @@ package com.vaadin.tests.components.popupview; +import static org.junit.Assert.assertFalse; + +import org.junit.Test; + import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.PopupViewElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; - -import static org.junit.Assert.assertFalse; public class DisabledPopupViewTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java index d248d22720..f8d1580a47 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java @@ -6,11 +6,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.io.IOException; -import junit.framework.Assert; - -import org.junit.Rule; import org.junit.Test; -import org.junit.rules.ExpectedException; import org.openqa.selenium.NoSuchElementException; import com.vaadin.testbench.By; diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java index 52cdd2d8ec..c0119fadce 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java @@ -1,17 +1,18 @@ package com.vaadin.tests.components.table; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.TableElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + +import java.util.List; + import org.junit.Test; import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.remote.DesiredCapabilities; -import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.testbench.elements.TableElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class LongMultiselectTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java index aa9749f806..052c0be89a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java @@ -17,7 +17,6 @@ package com.vaadin.tests.components.table; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import junit.framework.Assert; import org.junit.Ignore; import org.junit.Test; @@ -28,6 +27,8 @@ import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TableElement; import com.vaadin.tests.tb3.MultiBrowserTest; +import junit.framework.Assert; + /** * * @since diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java index 2104cb73b1..0f2bb1579d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java @@ -17,20 +17,16 @@ package com.vaadin.tests.components.table; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import java.util.List; -import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.tests.tb3.SingleBrowserTest; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.elements.TableElement; -import org.openqa.selenium.interactions.Actions; +import com.vaadin.tests.tb3.MultiBrowserTest; /** * Tests that clicking on active fields doesn't change Table selection, nor does diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java index d914689f63..525660fc4c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java @@ -1,10 +1,11 @@ package com.vaadin.tests.components.table; -import com.vaadin.testbench.elements.TableElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import java.io.IOException; + import org.junit.Test; -import java.io.IOException; +import com.vaadin.testbench.elements.TableElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class TableScrollsOnSelectionTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java index a96806bf37..6603d2474f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleInTabsheetTest.java @@ -1,10 +1,12 @@ package com.vaadin.tests.components.tabsheet; +import org.junit.Test; + import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TabSheetElement; import com.vaadin.tests.tb3.MultiBrowserTest; + import junit.framework.Assert; -import org.junit.Test; public class FirstTabNotVisibleInTabsheetTest extends MultiBrowserTest { @Test diff --git a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java index 139b9e0821..48e47d5619 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/tabsheet/FirstTabNotVisibleWhenTabsheetNotClippedTest.java @@ -1,12 +1,13 @@ package com.vaadin.tests.components.tabsheet; +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.WebElement; + import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.TabSheetElement; import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Assert; -import org.junit.Test; -import org.openqa.selenium.WebElement; public class FirstTabNotVisibleWhenTabsheetNotClippedTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java index b0b09cf303..a421ab721b 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAccessTest.java @@ -15,13 +15,14 @@ */ package com.vaadin.tests.components.ui; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; -import static org.junit.Assert.assertTrue; +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class UIAccessTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java index 5ac8a0a6ac..14975c63f6 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIAutoGeneratedStyleNameTest.java @@ -15,13 +15,14 @@ */ package com.vaadin.tests.components.ui; -import com.vaadin.tests.tb3.MultiBrowserTest; +import java.util.Locale; + import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import java.util.Locale; +import com.vaadin.tests.tb3.MultiBrowserTest; /** * Test to check auto-generated style name for UI div and overlays div. diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java index be00d16549..798feec48f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthChameleonTest.java @@ -18,9 +18,10 @@ package com.vaadin.tests.components.upload; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; -import com.vaadin.ui.themes.*; import org.junit.Test; +import com.vaadin.ui.themes.ChameleonTheme; + public class UploadImmediateButtonWidthChameleonTest extends UploadImmediateButtonWidthTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java index 5e9045b2f3..a4b0a52af7 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthReindeerTest.java @@ -18,9 +18,10 @@ package com.vaadin.tests.components.upload; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; -import com.vaadin.ui.themes.*; import org.junit.Test; +import com.vaadin.ui.themes.Reindeer; + public class UploadImmediateButtonWidthReindeerTest extends UploadImmediateButtonWidthTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java index f9b96ad8dc..71e0dde74e 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthRunoTest.java @@ -18,9 +18,10 @@ package com.vaadin.tests.components.upload; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; -import com.vaadin.ui.themes.*; import org.junit.Test; +import com.vaadin.ui.themes.Runo; + public class UploadImmediateButtonWidthRunoTest extends UploadImmediateButtonWidthTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java index 7f5f579cb7..62e613dc97 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/upload/UploadImmediateButtonWidthValoTest.java @@ -18,9 +18,10 @@ package com.vaadin.tests.components.upload; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; -import com.vaadin.ui.themes.*; import org.junit.Test; +import com.vaadin.ui.themes.ValoTheme; + public class UploadImmediateButtonWidthValoTest extends UploadImmediateButtonWidthTest { diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java index 5063c84658..13e79915fa 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java @@ -1,15 +1,15 @@ package com.vaadin.tests.components.window; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.tests.tb3.AbstractTB3Test; -import com.vaadin.tests.tb3.MultiBrowserTest; -import com.vaadin.tests.tb3.newelements.WindowElement; -import org.junit.Test; - import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; +import org.junit.Test; + +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.tb3.MultiBrowserTest; +import com.vaadin.tests.tb3.newelements.WindowElement; + public class MaximizedWindowOrderTest extends MultiBrowserTest { private WindowElement openAnotherWindow() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java index 713d4e6ca3..9e41137924 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowMoveListenerTest.java @@ -1,6 +1,7 @@ package com.vaadin.tests.components.window; -import com.vaadin.tests.tb3.MultiBrowserTest; +import static org.junit.Assert.assertNotEquals; + import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.Point; @@ -10,7 +11,7 @@ import org.openqa.selenium.interactions.Action; import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedCondition; -import static org.junit.Assert.assertNotEquals; +import com.vaadin.tests.tb3.MultiBrowserTest; public class WindowMoveListenerTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java index d1139a8a10..91ba975ae5 100644 --- a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java +++ b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java @@ -17,12 +17,11 @@ package com.vaadin.tests.contextclick; import static org.junit.Assert.assertEquals; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Test; import org.openqa.selenium.WebElement; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.GridElement; +import com.vaadin.tests.components.grid.LegacyGridElement; public class GridContextClickTest extends AbstractContextClickTest { diff --git a/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java index 046e304506..408dcd28e0 100644 --- a/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java +++ b/uitest/src/test/java/com/vaadin/tests/extensions/IframeIsOpenedInNonIOSTest.java @@ -1,14 +1,15 @@ package com.vaadin.tests.extensions; -import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import java.util.List; + import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.WebElement; import org.openqa.selenium.remote.DesiredCapabilities; -import java.util.List; +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class IframeIsOpenedInNonIOSTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java index 20734455c1..db05e8b725 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java @@ -17,7 +17,6 @@ package com.vaadin.tests.fieldgroup; import static org.junit.Assert.assertFalse; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -31,6 +30,7 @@ import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.GridElement.GridCellElement; import com.vaadin.testbench.elements.GridElement.GridEditorElement; import com.vaadin.testbench.parallel.TestCategory; +import com.vaadin.tests.components.grid.LegacyGridElement; import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.v7.tests.elements.LegacyDateFieldElement; diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java index 39264d3ea0..6954c2cf4f 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java @@ -17,14 +17,13 @@ package com.vaadin.tests.fieldgroup; import java.util.List; -import com.vaadin.tests.components.grid.LegacyGridElement; import org.junit.Assert; import org.junit.Test; import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor; import com.vaadin.testbench.elements.AbstractComponentElement; -import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.elements.TextFieldElement; +import com.vaadin.tests.components.grid.LegacyGridElement; import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 { diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java index 0fab64989a..e43cfbf0fa 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponentTest.java @@ -1,10 +1,11 @@ package com.vaadin.tests.layouts.gridlayout; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.tests.tb3.MultiBrowserTest; +import java.io.IOException; + import org.junit.Test; -import java.io.IOException; +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class GridLayoutMoveComponentTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java index 6f09923dff..db206aa191 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChangeTest.java @@ -1,13 +1,11 @@ package com.vaadin.tests.layouts.gridlayout; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.tests.tb3.AbstractTB3Test; -import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; - import java.io.IOException; -import static org.junit.Assert.*; +import org.junit.Test; + +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class GridLayoutWidthChangeTest extends MultiBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java index 0fc713cbbf..fd82a6b548 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketTest.java @@ -19,8 +19,6 @@ import java.util.List; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.tests.tb3.WebsocketTest; - public class BasicPushWebsocketTest extends BasicPushTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { diff --git a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java index 9a6f0827c4..4c5340ba0d 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/BasicPushWebsocketXhrTest.java @@ -19,8 +19,6 @@ import java.util.List; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.tests.tb3.WebsocketTest; - public class BasicPushWebsocketXhrTest extends BasicPushTest { @Override public List<DesiredCapabilities> getBrowsersToTest() { diff --git a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java index 760f275a45..3f348e0411 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ExtremelyLongPushTimeWebsocketTest.java @@ -19,8 +19,6 @@ import java.util.List; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.tests.tb3.WebsocketTest; - public class ExtremelyLongPushTimeWebsocketTest extends ExtremelyLongPushTimeTest { diff --git a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java index 33b9323803..2463054b01 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/IdlePushChannelWebsocketTest.java @@ -19,8 +19,6 @@ import java.util.List; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.tests.tb3.WebsocketTest; - public class IdlePushChannelWebsocketTest extends IdlePushChannelTest { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java index 5c017153f6..d266ea9476 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectLongPollingTest.java @@ -15,10 +15,10 @@ */ package com.vaadin.tests.push; -import org.openqa.selenium.remote.DesiredCapabilities; - import java.util.List; +import org.openqa.selenium.remote.DesiredCapabilities; + public class ReconnectLongPollingTest extends ReconnectTest { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java index 505dda18c4..985e458fbb 100755 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectStreamingTest.java @@ -15,10 +15,10 @@ */ package com.vaadin.tests.push; -import org.openqa.selenium.remote.DesiredCapabilities; - import java.util.List; +import org.openqa.selenium.remote.DesiredCapabilities; + public class ReconnectStreamingTest extends ReconnectTest { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java index 2ff4736044..b6be0c4e1f 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectTest.java @@ -16,7 +16,6 @@ package com.vaadin.tests.push; import org.junit.Test; -import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; diff --git a/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java index 6f147bf0ce..60fa9f80af 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/ReconnectWebsocketTest.java @@ -19,8 +19,6 @@ import java.util.List; import org.openqa.selenium.remote.DesiredCapabilities; -import com.vaadin.tests.tb3.WebsocketTest; - public class ReconnectWebsocketTest extends ReconnectTest { @Override diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java index 5cc2395e71..f898d74f71 100644 --- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java +++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersWebSocketTest.java @@ -1,9 +1,9 @@ package com.vaadin.tests.push; -import org.openqa.selenium.remote.DesiredCapabilities; - import java.util.List; +import org.openqa.selenium.remote.DesiredCapabilities; + public class SendMultibyteCharactersWebSocketTest extends SendMultibyteCharactersTest { diff --git a/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java b/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java index f718bd58b5..ccb3d51901 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/FaviconTest.java @@ -1,14 +1,15 @@ package com.vaadin.tests.themes; -import com.vaadin.tests.tb3.SingleBrowserTest; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.fail; import java.net.HttpURLConnection; import java.net.URL; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; +import org.junit.Test; + +import com.vaadin.tests.tb3.SingleBrowserTest; //Extending SingleBrowserTest just to include the test into our test suites. public class FaviconTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java b/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java index 46c7382726..7e2ccc574b 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/chameleon/ChameleonNotificationTest.java @@ -1,14 +1,15 @@ package com.vaadin.tests.themes.chameleon; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.NotificationElement; -import com.vaadin.tests.tb3.MultiBrowserTest; -import org.junit.Test; +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertThat; import java.io.IOException; -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertThat; +import org.junit.Test; + +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.testbench.elements.NotificationElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class ChameleonNotificationTest extends MultiBrowserTest { @Test diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java index 11b98174ba..29e7f30d0a 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ModalWindowTest.java @@ -1,14 +1,15 @@ package com.vaadin.tests.themes.valo; +import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; + +import org.junit.Test; +import org.openqa.selenium.WebElement; + import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.tests.ModalWindow; import com.vaadin.tests.tb3.SingleBrowserTest; -import org.junit.Test; -import org.openqa.selenium.WebElement; - -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; public class ModalWindowTest extends SingleBrowserTest { diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java index 42f0b2aeae..4d63a0bd19 100644 --- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TableSortIndicatorTest.java @@ -1,11 +1,12 @@ package com.vaadin.tests.themes.valo; -import com.vaadin.testbench.By; -import com.vaadin.tests.tb3.*; -import org.junit.*; -import org.openqa.selenium.*; +import java.io.IOException; + +import org.junit.Test; +import org.openqa.selenium.WebElement; -import java.io.*; +import com.vaadin.testbench.By; +import com.vaadin.tests.tb3.MultiBrowserTest; public class TableSortIndicatorTest extends MultiBrowserTest { |