From 07325917588193e4911a1045810ad16140d06a8d Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 30 Aug 2016 17:15:01 +0300 Subject: Organize imports Change-Id: Ie58291fd4858d5421b23e56603808f158d559687 --- .../com/vaadin/v7/client/connectors/GridConnector.java | 4 ++-- .../v7/client/connectors/ImageRendererConnector.java | 2 +- .../v7/client/connectors/MultiSelectionModelConnector.java | 2 +- .../client/connectors/SingleSelectionModelConnector.java | 2 +- .../main/java/com/vaadin/v7/client/ui/VCalendarPanel.java | 1 - .../main/java/com/vaadin/v7/client/ui/VRichTextArea.java | 2 +- .../vaadin/v7/client/ui/calendar/CalendarConnector.java | 2 +- .../java/com/vaadin/v7/client/ui/table/TableConnector.java | 2 +- .../vaadin/v7/client/ui/treetable/TreeTableConnector.java | 2 +- .../src/main/java/com/vaadin/v7/client/widgets/Grid.java | 14 +++++++------- 10 files changed, 16 insertions(+), 17 deletions(-) (limited to 'compatibility-client/src') diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java index 6a89b6c938..cf48586d01 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/GridConnector.java +++ b/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; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java index 0f3dfc1cc5..1568f3cfc6 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/ImageRendererConnector.java +++ b/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; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java index ff40816d93..bdaf0f1f88 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/MultiSelectionModelConnector.java +++ b/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; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java index 8c206b8def..059278c311 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/connectors/SingleSelectionModelConnector.java +++ b/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; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java index 782cd1ca44..fd1edda55d 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VCalendarPanel.java +++ b/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 diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java index a00ff78e9d..d46e73aeb9 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VRichTextArea.java +++ b/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; /** diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java index ea3aa49833..62e8e123db 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/calendar/CalendarConnector.java +++ b/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; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java index 8cb408fd7a..9d2677af54 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/table/TableConnector.java +++ b/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 diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java index 094bbc0e9b..1b2b1dd776 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/treetable/TreeTableConnector.java +++ b/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; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java b/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java index ca565e01c2..35874b5d4b 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/widgets/Grid.java +++ b/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 -- cgit v1.2.3