Organize imports

Change-Id: Ie58291fd4858d5421b23e56603808f158d559687

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

@@ -42,7 +42,6 @@ import com.google.gwt.user.client.Timer;
 import com.google.gwt.user.client.ui.HasWidgets;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
-import com.vaadin.client.ApplicationConnection.ApplicationStoppedEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
 import com.vaadin.client.ResourceLoader.ResourceLoadListener;
 import com.vaadin.client.communication.ConnectionStateHandler;

compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java

@@ -88,13 +88,13 @@ import com.vaadin.v7.shared.ui.grid.EditorServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridClientRpc;
 import com.vaadin.v7.shared.ui.grid.GridColumnState;
 import com.vaadin.v7.shared.ui.grid.GridConstants;
+import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridState;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState;
-import com.vaadin.v7.shared.ui.grid.ScrollDestination;
-import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.CellState;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.RowState;
+import com.vaadin.v7.shared.ui.grid.ScrollDestination;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;

compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java

@@ -20,8 +20,8 @@ import com.vaadin.client.communication.JsonDecoder;
 import com.vaadin.client.metadata.TypeDataStore;
 import com.vaadin.shared.communication.URLReference;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.client.renderers.ImageRenderer;
 import com.vaadin.v7.client.renderers.ClickableRenderer.RendererClickHandler;
+import com.vaadin.v7.client.renderers.ImageRenderer;
 
 import elemental.json.JsonObject;
 import elemental.json.JsonValue;

compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java

@@ -39,8 +39,8 @@ import com.vaadin.v7.client.widget.grid.events.SelectAllEvent;
 import com.vaadin.v7.client.widget.grid.events.SelectAllHandler;
 import com.vaadin.v7.client.widget.grid.selection.MultiSelectionRenderer;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel;
-import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Multi;
+import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.client.widgets.Grid;
 import com.vaadin.v7.client.widgets.Grid.HeaderCell;
 import com.vaadin.v7.shared.ui.grid.GridState;

compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java

@@ -22,8 +22,8 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.v7.client.renderers.Renderer;
 import com.vaadin.v7.client.widget.grid.selection.ClickSelectHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel;
-import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Single;
+import com.vaadin.v7.client.widget.grid.selection.SpaceSelectHandler;
 import com.vaadin.v7.shared.ui.grid.GridState;
 import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelServerRpc;
 import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelState;

compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java

@@ -60,7 +60,6 @@ import com.vaadin.client.ui.FocusableFlexTable;
 import com.vaadin.client.ui.SubPartAware;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.v7.client.ui.VPopupCalendar;
 
 @SuppressWarnings("deprecation")
 public class VCalendarPanel extends FocusableFlexTable implements

compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java

@@ -40,8 +40,8 @@ import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.ConnectorMap;
 import com.vaadin.client.ui.Field;
 import com.vaadin.client.ui.ShortcutActionHandler;
-import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.client.ui.TouchScrollDelegate;
 import com.vaadin.v7.client.ui.richtextarea.VRichTextToolbar;
 
 /**

compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java

@@ -58,12 +58,12 @@ import com.vaadin.v7.client.ui.VCalendar.WeekClickListener;
 import com.vaadin.v7.client.ui.calendar.schedule.CalendarDay;
 import com.vaadin.v7.client.ui.calendar.schedule.CalendarEvent;
 import com.vaadin.v7.client.ui.calendar.schedule.DateCell;
+import com.vaadin.v7.client.ui.calendar.schedule.DateCell.DateCellSlot;
 import com.vaadin.v7.client.ui.calendar.schedule.DateCellDayEvent;
 import com.vaadin.v7.client.ui.calendar.schedule.DateUtil;
 import com.vaadin.v7.client.ui.calendar.schedule.HasTooltipKey;
 import com.vaadin.v7.client.ui.calendar.schedule.MonthEventLabel;
 import com.vaadin.v7.client.ui.calendar.schedule.SimpleDayCell;
-import com.vaadin.v7.client.ui.calendar.schedule.DateCell.DateCellSlot;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarDropHandler;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarMonthDropHandler;
 import com.vaadin.v7.client.ui.calendar.schedule.dd.CalendarWeekDropHandler;

compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java

@@ -47,9 +47,9 @@ import com.vaadin.v7.client.ui.VScrollTable.FooterCell;
 import com.vaadin.v7.client.ui.VScrollTable.HeaderCell;
 import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.v7.shared.ui.table.TableConstants;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.shared.ui.table.TableServerRpc;
 import com.vaadin.v7.shared.ui.table.TableState;
-import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 
 @Connect(com.vaadin.v7.ui.Table.class)
 public class TableConnector extends AbstractFieldConnector

compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java

@@ -22,8 +22,8 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.WidgetUtil;
 import com.vaadin.client.ui.FocusableScrollPanel;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.client.ui.VTreeTable;
 import com.vaadin.v7.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow;
+import com.vaadin.v7.client.ui.VTreeTable;
 import com.vaadin.v7.client.ui.VTreeTable.PendingNavigationEvent;
 import com.vaadin.v7.client.ui.VTreeTable.VTreeTableScrollBody.VTreeTableRow;
 import com.vaadin.v7.client.ui.table.TableConnector;

compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java

@@ -105,12 +105,14 @@ import com.vaadin.v7.client.widget.escalator.Row;
 import com.vaadin.v7.client.widget.escalator.RowContainer;
 import com.vaadin.v7.client.widget.escalator.RowVisibilityChangeEvent;
 import com.vaadin.v7.client.widget.escalator.RowVisibilityChangeHandler;
+import com.vaadin.v7.client.widget.escalator.ScrollbarBundle.Direction;
 import com.vaadin.v7.client.widget.escalator.Spacer;
 import com.vaadin.v7.client.widget.escalator.SpacerUpdater;
-import com.vaadin.v7.client.widget.escalator.ScrollbarBundle.Direction;
 import com.vaadin.v7.client.widget.escalator.events.RowHeightChangedEvent;
 import com.vaadin.v7.client.widget.escalator.events.RowHeightChangedHandler;
 import com.vaadin.v7.client.widget.grid.AutoScroller;
+import com.vaadin.v7.client.widget.grid.AutoScroller.AutoScrollerCallback;
+import com.vaadin.v7.client.widget.grid.AutoScroller.ScrollAxis;
 import com.vaadin.v7.client.widget.grid.CellReference;
 import com.vaadin.v7.client.widget.grid.CellStyleGenerator;
 import com.vaadin.v7.client.widget.grid.DataAvailableEvent;
@@ -118,14 +120,12 @@ import com.vaadin.v7.client.widget.grid.DataAvailableHandler;
 import com.vaadin.v7.client.widget.grid.DefaultEditorEventHandler;
 import com.vaadin.v7.client.widget.grid.DetailsGenerator;
 import com.vaadin.v7.client.widget.grid.EditorHandler;
+import com.vaadin.v7.client.widget.grid.EditorHandler.EditorRequest;
 import com.vaadin.v7.client.widget.grid.EventCellReference;
 import com.vaadin.v7.client.widget.grid.HeightAwareDetailsGenerator;
 import com.vaadin.v7.client.widget.grid.RendererCellReference;
 import com.vaadin.v7.client.widget.grid.RowReference;
 import com.vaadin.v7.client.widget.grid.RowStyleGenerator;
-import com.vaadin.v7.client.widget.grid.AutoScroller.AutoScrollerCallback;
-import com.vaadin.v7.client.widget.grid.AutoScroller.ScrollAxis;
-import com.vaadin.v7.client.widget.grid.EditorHandler.EditorRequest;
 import com.vaadin.v7.client.widget.grid.events.AbstractGridKeyEventHandler;
 import com.vaadin.v7.client.widget.grid.events.AbstractGridMouseEventHandler;
 import com.vaadin.v7.client.widget.grid.events.BodyClickHandler;
@@ -165,11 +165,11 @@ import com.vaadin.v7.client.widget.grid.selection.MultiSelectionRenderer;
 import com.vaadin.v7.client.widget.grid.selection.SelectionEvent;
 import com.vaadin.v7.client.widget.grid.selection.SelectionHandler;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModel;
+import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Multi;
+import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Single;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModelMulti;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModelNone;
 import com.vaadin.v7.client.widget.grid.selection.SelectionModelSingle;
-import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Multi;
-import com.vaadin.v7.client.widget.grid.selection.SelectionModel.Single;
 import com.vaadin.v7.client.widget.grid.sort.Sort;
 import com.vaadin.v7.client.widget.grid.sort.SortEvent;
 import com.vaadin.v7.client.widget.grid.sort.SortHandler;
@@ -180,10 +180,10 @@ import com.vaadin.v7.client.widgets.Grid.Editor.State;
 import com.vaadin.v7.client.widgets.Grid.StaticSection.StaticCell;
 import com.vaadin.v7.client.widgets.Grid.StaticSection.StaticRow;
 import com.vaadin.v7.shared.ui.grid.GridConstants;
+import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridStaticCellType;
 import com.vaadin.v7.shared.ui.grid.HeightMode;
 import com.vaadin.v7.shared.ui.grid.ScrollDestination;
-import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 
 /**
  * A data grid view that supports columns and lazy loading of data rows from a

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

@@ -25,13 +25,13 @@ import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.AbstractTextField;
 import com.vaadin.v7.ui.CheckBox;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.InlineDateField;
-import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.ListSelect;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.RichTextArea;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.TextField;

compatibility-server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java

@@ -22,9 +22,9 @@ import java.util.Comparator;
 import java.util.List;
 
 import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Sortable;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Sortable;
 
 /**
  * Provides a default implementation of an ItemSorter. The

compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java

@@ -18,9 +18,9 @@ package com.vaadin.v7.data.util;
 import java.io.Serializable;
 
 import com.vaadin.data.sort.SortOrder;
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
 
 /**

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/And.java

@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 /**
  * A compound {@link Filter} that accepts an item if all of its filters accept

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Between.java

@@ -18,8 +18,8 @@ package com.vaadin.v7.data.util.filter;
 import java.util.Arrays;
 
 import com.vaadin.shared.util.SharedUtil;
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 public class Between implements Filter {
 

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java

@@ -15,9 +15,9 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 
 /**
  * Simple container filter comparing an item property value against a given

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java

@@ -15,9 +15,9 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 
 /**
  * Simple container filter checking whether an item property value is null.

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Like.java

@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 public class Like implements Filter {
     private final Object propertyId;

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Not.java

@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 /**
  * Negating filter that accepts the items rejected by another filter.

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/Or.java

@@ -15,8 +15,8 @@
  */
 package com.vaadin.v7.data.util.filter;
 
-import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
 
 /**
  * A compound {@link Filter} that accepts an item if any of its filters accept

compatibility-server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java

@@ -15,9 +15,9 @@
  */
 package com.vaadin.v7.data.util.filter;
 
+import com.vaadin.v7.data.Container.Filter;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
-import com.vaadin.v7.data.Container.Filter;
 
 /**
  * Simple string filter for matching items that start with or contain a

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

@@ -57,10 +57,10 @@ import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.IndexedContainer;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.Converter.ConversionException;
+import com.vaadin.v7.data.util.converter.ConverterUtil;
 import com.vaadin.v7.event.DataBoundTransferable;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
 import com.vaadin.v7.shared.ui.select.AbstractSelectState;
-import com.vaadin.v7.data.util.converter.ConverterUtil;
 
 /**
  * <p>

compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java

@@ -34,6 +34,7 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.server.PaintException;
 import com.vaadin.server.PaintTarget;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.LegacyComponent;
 import com.vaadin.ui.declarative.DesignAttributeHandler;
@@ -44,7 +45,6 @@ import com.vaadin.v7.data.Validator.InvalidValueException;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.validator.DateRangeValidator;
 import com.vaadin.v7.shared.ui.datefield.DateFieldConstants;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.shared.ui.datefield.TextualDateFieldState;
 
 /**

compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java

@@ -101,15 +101,15 @@ import com.vaadin.v7.shared.ui.grid.EditorServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridClientRpc;
 import com.vaadin.v7.shared.ui.grid.GridColumnState;
 import com.vaadin.v7.shared.ui.grid.GridConstants;
+import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridServerRpc;
 import com.vaadin.v7.shared.ui.grid.GridState;
 import com.vaadin.v7.shared.ui.grid.GridStaticCellType;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState;
-import com.vaadin.v7.shared.ui.grid.HeightMode;
-import com.vaadin.v7.shared.ui.grid.ScrollDestination;
-import com.vaadin.v7.shared.ui.grid.GridConstants.Section;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.CellState;
 import com.vaadin.v7.shared.ui.grid.GridStaticSectionState.RowState;
+import com.vaadin.v7.shared.ui.grid.HeightMode;
+import com.vaadin.v7.shared.ui.grid.ScrollDestination;
 import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelServerRpc;
 import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelState;
 import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelServerRpc;

compatibility-server/src/main/java/com/vaadin/v7/ui/ProgressBar.java

@@ -22,7 +22,6 @@ import com.vaadin.ui.declarative.DesignAttributeHandler;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.shared.ui.progressindicator.ProgressBarState;
-import com.vaadin.v7.ui.AbstractField;
 
 /**
  * Shows the current progress of a long running task.

compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java

@@ -77,9 +77,9 @@ import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.v7.shared.ui.table.CollapseMenuContent;
 import com.vaadin.v7.shared.ui.table.TableConstants;
+import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 import com.vaadin.v7.shared.ui.table.TableServerRpc;
 import com.vaadin.v7.shared.ui.table.TableState;
-import com.vaadin.v7.shared.ui.table.TableConstants.Section;
 
 /**
  * <p>

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

@@ -24,11 +24,11 @@ import org.junit.Test;
 
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.ComboBox;
-import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.InlineDateField;
-import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.PopupDateField;
 import com.vaadin.v7.ui.TextField;
 
 public class DefaultFieldGroupFieldFactoryTest {

compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java

@@ -11,8 +11,8 @@ import java.util.TimeZone;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.vaadin.v7.data.validator.DateRangeValidator;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.v7.data.validator.DateRangeValidator;
 
 public class DateRangeValidatorTest {
     Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),

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

@@ -10,8 +10,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.Converter.ConversionException;
 import com.vaadin.v7.data.util.MethodProperty;
+import com.vaadin.v7.data.util.converter.Converter.ConversionException;
 import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
 import com.vaadin.v7.ui.TextField;
 

compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java

@@ -22,10 +22,10 @@ import java.util.Locale;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.util.ObjectProperty;
 import com.vaadin.v7.data.util.converter.Converter;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.DateField;
 
 public class DateFieldConverterTest {

compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java

@@ -21,8 +21,8 @@ import java.util.TimeZone;
 
 import org.junit.Test;
 
-import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.v7.ui.DateField;
 
 /**

compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java

@@ -19,8 +19,8 @@ import java.util.Date;
 
 import org.junit.Test;
 
-import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.tests.design.DeclarativeTestBase;
 import com.vaadin.v7.ui.PopupDateField;
 
 /**

compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java

@@ -20,8 +20,8 @@ import java.util.EnumSet;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.v7.ui.Table.RowHeaderMode;
 import com.vaadin.v7.shared.ui.treetable.TreeTableState;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
 import com.vaadin.v7.ui.TreeTable;
 
 /**

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

@@ -13,6 +13,7 @@ import com.vaadin.server.ExternalResource;
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.Sizeable;
 import com.vaadin.shared.MouseEventDetails.MouseButton;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Component;
@@ -26,7 +27,6 @@ import com.vaadin.v7.data.util.DefaultItemSorter;
 import com.vaadin.v7.data.util.HierarchicalContainer;
 import com.vaadin.v7.event.ItemClickEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.ItemStyleGenerator;
 

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

@@ -16,6 +16,7 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Component.Event;
@@ -27,7 +28,6 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.PasswordField;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.Tree;
 

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

@@ -17,6 +17,7 @@
 package com.vaadin.tests;
 
 import com.vaadin.server.ClassResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Embedded;
 import com.vaadin.ui.GridLayout;
@@ -27,7 +28,6 @@ import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 /**
  * This example demonstrates layouts. Layouts are populated with sample Vaadin

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

@@ -20,9 +20,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import com.vaadin.server.LegacyApplication;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;

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

@@ -20,13 +20,13 @@ import java.util.Date;
 import java.util.Map;
 
 import com.vaadin.server.UserError;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.TextField;

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

@@ -18,11 +18,11 @@ package com.vaadin.tests;
 
 import java.util.Date;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;

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

@@ -18,12 +18,12 @@ package com.vaadin.tests;
 
 import java.util.Date;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 
 public class PerformanceTestSubTreeCaching extends CustomComponent {

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

@@ -20,6 +20,7 @@ import com.vaadin.server.ClassResource;
 import com.vaadin.server.ErrorMessage;
 import com.vaadin.server.ExternalResource;
 import com.vaadin.server.UserError;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
@@ -37,7 +38,6 @@ import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.Upload;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.ProgressIndicator;

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

@@ -19,6 +19,7 @@ package com.vaadin.tests;
 import java.util.Locale;
 
 import com.vaadin.server.Sizeable;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
@@ -30,7 +31,6 @@ import com.vaadin.ui.Panel;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.Table;
 
 public class TestForBasicApplicationLayout extends CustomComponent {

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

@@ -20,9 +20,9 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import com.vaadin.server.LegacyApplication;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;

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

@@ -16,6 +16,7 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.CustomComponent;
@@ -23,7 +24,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.RichTextArea;
 
 /**

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

@@ -28,6 +28,7 @@ import java.lang.management.MemoryMXBean;
 
 import com.vaadin.server.LegacyApplication;
 import com.vaadin.server.StreamResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
@@ -45,7 +46,6 @@ import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.Upload.SucceededEvent;
 import com.vaadin.ui.Upload.SucceededListener;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.ProgressIndicator;
 
 public class TestForStyledUpload extends LegacyApplication

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

@@ -29,6 +29,7 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryMXBean;
 
 import com.vaadin.server.StreamResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CheckBox;
@@ -44,7 +45,6 @@ import com.vaadin.ui.Upload.StartedEvent;
 import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractField;
 import com.vaadin.v7.ui.ProgressIndicator;
 import com.vaadin.v7.ui.Select;

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

@@ -16,10 +16,10 @@
 
 package com.vaadin.tests;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class TestIFrames extends CustomComponent {
 

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

@@ -19,13 +19,13 @@ package com.vaadin.tests;
 import java.io.File;
 
 import com.vaadin.server.VaadinSession;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.util.SampleDirectory;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Item;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Tree;
 import com.vaadin.v7.ui.Tree.ExpandEvent;
 

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

@@ -19,13 +19,13 @@ package com.vaadin.tests;
 import java.util.LinkedList;
 import java.util.Random;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Select;
 
 public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication

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

@@ -1,9 +1,9 @@
 package com.vaadin.tests.application;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 

uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java

@@ -4,9 +4,9 @@ import com.vaadin.server.VaadinService;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
-import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.LegacyWindow;
 
 public class ChangeSessionId extends AbstractTestCase {
 

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

@@ -7,6 +7,7 @@ import com.vaadin.server.VaadinRequest;
 import com.vaadin.server.VaadinServlet;
 import com.vaadin.server.WebBrowser;
 import com.vaadin.shared.communication.PushMode;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.shared.ui.ui.UIState.PushConfigurationState;
 import com.vaadin.ui.Button;
@@ -14,7 +15,6 @@ import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Notification.Type;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.PushConfiguration;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalLayout;

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

@@ -1,10 +1,10 @@
 package com.vaadin.tests.components;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 /**
  *

uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java

@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.button;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Label;
 
 public class ButtonMouseDetails extends TestBase {

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

@@ -21,6 +21,7 @@ import java.util.GregorianCalendar;
 
 import com.vaadin.event.Action;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.FormLayout;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalSplitPanel;
@@ -30,7 +31,6 @@ import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.data.util.BeanItemContainer;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.Calendar;
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.Table;

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

@@ -26,6 +26,7 @@ import com.vaadin.annotations.Theme;
 import com.vaadin.data.Binder;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -46,7 +47,6 @@ import com.vaadin.v7.data.fieldgroup.FieldGroup;
 import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.Calendar;
 import com.vaadin.v7.ui.Calendar.TimeFormat;
 import com.vaadin.v7.ui.ComboBox;

uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java

@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.caption;
 
 import com.vaadin.server.ThemeResource;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
@@ -10,7 +11,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.ComboBox;
 
 public class IconsInCaption extends TestBase {

uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java

@@ -29,6 +29,7 @@ import javax.imageio.ImageIO;
 import com.vaadin.server.StreamResource;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.colorpicker.Color;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.CheckBox;
@@ -38,7 +39,6 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Panel;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractColorPicker;
 import com.vaadin.v7.ui.ColorPicker;
 import com.vaadin.v7.ui.ColorPickerArea;

uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java

@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.customcomponent;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.TextField;
 
 public class ClipContent extends TestBase {

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

@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Calendar;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class CustomDateFormat extends TestBase {
 

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

@@ -19,10 +19,10 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class CustomDateFormatEEE extends AbstractTestUI {
 

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

@@ -7,6 +7,7 @@ import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.DateField;
@@ -15,7 +16,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Item;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.NativeSelect;
 
 public class CustomDateFormats extends TestBase {

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

@@ -16,11 +16,11 @@
 package com.vaadin.tests.components.datefield;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;

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

@@ -6,10 +6,10 @@ import java.util.Date;
 import java.util.TimeZone;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldDayResolutionOffset extends AbstractTestUI {
 

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

@@ -4,6 +4,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.Button;
@@ -13,8 +15,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
 import com.vaadin.v7.data.util.ObjectProperty;
-import com.vaadin.shared.ui.datefield.Resolution;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.PopupDateField;
 
 @SuppressWarnings("serial")

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

@@ -3,11 +3,11 @@ package com.vaadin.tests.components.datefield;
 import java.util.Calendar;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 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.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.InlineDateField;

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

@@ -3,11 +3,11 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 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.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class DateFieldLocale extends TestBase {

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

@@ -3,11 +3,11 @@ package com.vaadin.tests.components.datefield;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldMinResolution extends TestBase {
 

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

@@ -3,12 +3,12 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestCase;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.LegacyWindow;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldPopupOffScreen extends AbstractTestCase {
 

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

@@ -4,12 +4,12 @@ import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.data.HasValue;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.CheckBoxWithPropertyDataSource;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.v7.data.util.BeanItem;
 import com.vaadin.v7.data.validator.RangeValidator;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.PopupDateField;
 
 public class DateFieldRangeValidation extends TestBase {

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

@@ -6,6 +6,7 @@ import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -18,7 +19,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.NativeSelect;
 
 public class DateFieldRanges extends AbstractTestUI {

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

@@ -4,11 +4,11 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class DateFieldReadOnly extends AbstractTestUI {

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

@@ -7,9 +7,9 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DateFieldTest<T extends DateField>
         extends AbstractFieldTest<T, Date> {

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

@@ -8,13 +8,13 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.tests.util.Log;
 import com.vaadin.ui.DateField;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.shared.ui.combobox.FilteringMode;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.ComboBox;
 
 public class DateFieldTimezone extends TestBase {

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

@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 
 import com.vaadin.server.UserError;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class DatePopupStyleName extends TestBase {
     @Override

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

@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.datefield;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.GridLayout;
 

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

@@ -5,10 +5,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.InlineDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class InlineDateFields extends ComponentTestCase<InlineDateField> {

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

@@ -6,6 +6,7 @@ import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
@@ -16,7 +17,6 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.InlineDateField;
 import com.vaadin.v7.ui.NativeSelect;

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

@@ -7,8 +7,8 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
-import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.shared.ui.datefield.Resolution;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.v7.ui.DateField;
 
 public class LegacyDateFieldTest<T extends DateField>

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

@@ -5,10 +5,10 @@ import java.util.Locale;
 
 import com.vaadin.data.HasValue.ValueChange;
 import com.vaadin.data.HasValue.ValueChangeListener;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class LenientMode extends TestBase implements ValueChangeListener<Date> {
 

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

@@ -21,11 +21,11 @@ import java.util.Date;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class LocaleChange extends AbstractTestUI {

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

@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.datefield;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class LowResolution extends TestBase {

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

@@ -16,10 +16,10 @@
 package com.vaadin.tests.components.datefield;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class PopupClosingWithEsc extends AbstractTestUI {
 

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

@@ -4,11 +4,11 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+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.ui.Button.ClickListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.PopupDateField;
 
 @SuppressWarnings("serial")

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

@@ -4,9 +4,9 @@ import java.util.Calendar;
 import java.util.Locale;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class PopupDateFieldLocaleTest extends AbstractTestUI {
 

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

@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Calendar;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class PopupDateFieldPopup extends TestBase {
 

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

@@ -23,12 +23,12 @@ import java.util.Arrays;
 import java.util.Calendar;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.DateField;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.v7.ui.NativeSelect;
 
 /**

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

@@ -5,10 +5,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.PopupDateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class PopupDateFields extends ComponentTestCase<PopupDateField> {

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

@@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield;
 import java.util.Date;
 import java.util.Locale;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.DateField;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 public class TestDatefieldYear extends TestBase {
 

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

@@ -2,10 +2,10 @@ package com.vaadin.tests.components.datefield;
 
 import java.util.Date;
 
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.ui.DateField;
 
 public class WidthRecalculationOnEnableStateChange extends TestBase {

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

@@ -27,11 +27,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.server.StreamVariable;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Html5File;
 import com.vaadin.ui.Label;
 

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

@@ -28,11 +28,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.server.FontAwesome;
 import com.vaadin.server.StreamVariable;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUIWithLog;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.DragAndDropWrapper;
 import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Html5File;
 import com.vaadin.ui.Label;
 

uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java

@@ -1,12 +1,12 @@
 package com.vaadin.tests.components.gridlayout;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.InlineDateField;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.datefield.Resolution;
 
 @SuppressWarnings("serial")
 public class GridLayoutCellSizesUI extends AbstractTestUI {

uitest/src/main/java/com/vaadin/tests/components/label/Labels.java

@@ -1,9 +1,9 @@
 package com.vaadin.tests.components.label;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.ComponentTestCase;
 import com.vaadin.tests.util.LoremIpsum;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class Labels extends ComponentTestCase<Label> {
 

uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java

@@ -1,6 +1,7 @@
 package com.vaadin.tests.components.label;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Accordion;
@@ -8,7 +9,6 @@ import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 
 public class MarginsInLabels extends AbstractTestUI {
 

uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java

@@ -4,10 +4,10 @@ import java.util.ArrayList;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.shared.ui.MarginInfo;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractSelect;
 import com.vaadin.v7.ui.ListSelect;
 

uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java

@@ -1,10 +1,10 @@
 package com.vaadin.tests.components.optiongroup;
 
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Label;
 import com.vaadin.v7.data.Property;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.OptionGroup;
 
 public class OptionGroupMultipleValueChange extends TestBase {

uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java

@@ -10,6 +10,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractOrderedLayout;
@@ -25,7 +26,6 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.AbstractField;
 import com.vaadin.v7.ui.NativeSelect;
 import com.vaadin.v7.ui.TextField;