Move remaining selects and container implementations to compatibility package

Because of dependencies also moves
Calendar, ColorPicker, SQLContainer, container filters

Change-Id: I0594cb24f20486ebbca4be578827fea7cdf92108

158 files changed, 4 insertions, 10 deletions

diff --git a/client/src/main/java/com/vaadin/client/ui/VCalendar.java b/compatibility-client/src/main/java/com/vaadin/client/ui/VCalendar.java
index 8414d7c99c..8414d7c99c 100644
--- a/client/src/main/java/com/vaadin/client/ui/VCalendar.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/VCalendar.java
diff --git a/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java b/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
index 44cbcf28f6..44cbcf28f6 100644
--- a/client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java
diff --git a/client/src/main/java/com/vaadin/client/ui/VTree.java b/compatibility-client/src/main/java/com/vaadin/client/ui/VTree.java
index f9101a5e30..f9101a5e30 100644
--- a/client/src/main/java/com/vaadin/client/ui/VTree.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/VTree.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
index f97ba9d14a..f97ba9d14a 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/VCalendarAction.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/VCalendarAction.java
index f16a43fbb2..f16a43fbb2 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/VCalendarAction.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/VCalendarAction.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarDay.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarDay.java
index c2ade39a6d..c2ade39a6d 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarDay.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarDay.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java
index 937b7c0ccb..937b7c0ccb 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/CalendarEvent.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
index 2590c4ed03..2590c4ed03 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCell.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java
index 92c39c0791..92c39c0791 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellContainer.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java
index 7404f557a8..7404f557a8 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellDayEvent.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java
index 907a71c449..907a71c449 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateCellGroup.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateUtil.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateUtil.java
index 4a11e95245..4a11e95245 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateUtil.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DateUtil.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java
index 0ba1023945..0ba1023945 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/DayToolbar.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java
index a498525c92..a498525c92 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableComplexPanel.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java
index fd46f5553b..fd46f5553b 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableGrid.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java
index 3a838a58a3..3a838a58a3 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/FocusableHTML.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java
index 936f978abb..936f978abb 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/HasTooltipKey.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java
index c62b21592a..c62b21592a 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthEventLabel.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthGrid.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthGrid.java
index 119fe27992..119fe27992 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthGrid.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/MonthGrid.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java
index 45ae5ed8e5..45ae5ed8e5 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayCell.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java
index e83a2cce3a..e83a2cce3a 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleDayToolbar.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java
index 30c52e1059..30c52e1059 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/SimpleWeekToolbar.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java
index cfc9d6231a..cfc9d6231a 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGrid.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java
index 984d3d48dc..984d3d48dc 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekGridMinuteTimeRange.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekLabel.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekLabel.java
index ae7001cb21..ae7001cb21 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekLabel.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeekLabel.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java
index fe1f3e181e..fe1f3e181e 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEvents.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java
index a098ab9c1a..a098ab9c1a 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/WeeklyLongEventsDateCell.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java
index 58757b8552..58757b8552 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarDropHandler.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java
index 663ee1eb98..663ee1eb98 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarMonthDropHandler.java
diff --git a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java
index c0ad635ef7..c0ad635ef7 100644
--- a/client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/schedule/dd/CalendarWeekDropHandler.java
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
index 6f480538e0..6f480538e0 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/AbstractColorPickerConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
index 828cc689c7..828cc689c7 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
index 6254e7adbe..6254e7adbe 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
index c05449d7bd..c05449d7bd 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
index cd0a3d1466..cd0a3d1466 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java
index b75bee23c1..b75bee23c1 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGradient.java
diff --git a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java
index 67f2ce07dd..67f2ce07dd 100644
--- a/client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/VColorPickerGrid.java
diff --git a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
index f6dff893f5..f6dff893f5 100644
--- a/client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
index b02f8df147..b02f8df147 100644
--- a/client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java
diff --git a/client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
index 6992ebcaad..6992ebcaad 100644
--- a/client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java
diff --git a/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
index c28a58aaad..c28a58aaad 100644
--- a/client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java
diff --git a/client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java
index 34b8428582..34b8428582 100644
--- a/client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java
diff --git a/client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java
index 46089af16e..46089af16e 100644
--- a/client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java
+++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java
diff --git a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
index 995e2f8675..995e2f8675 100644
--- a/server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java
index 1995102345..1995102345 100644
--- a/server/src/main/java/com/vaadin/data/util/AbstractContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
index 43b65ab75e..43b65ab75e 100644
--- a/server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java
index 01a5256199..01a5256199 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java
index c0c4fdcaa6..c0c4fdcaa6 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java
diff --git a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
index 66e553164d..66e553164d 100644
--- a/server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
index 9e108cd615..9e108cd615 100644
--- a/server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java
diff --git a/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
index 46b4f4bcd4..46b4f4bcd4 100644
--- a/server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
index 8d7a1512f9..8d7a1512f9 100644
--- a/server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
index 115fd91791..115fd91791 100644
--- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java
index 4ff253394a..4ff253394a 100644
--- a/server/src/main/java/com/vaadin/data/util/IndexedContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
index d3559b5652..d3559b5652 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
index 77919f72b2..77919f72b2 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
index e7d83e118d..e7d83e118d 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
index 1a29d531bc..1a29d531bc 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
index 367135782f..367135782f 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
index ce6680089d..ce6680089d 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
index 5f78df79e1..5f78df79e1 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
index ffc8bfc6f7..ffc8bfc6f7 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
index dde57d3610..dde57d3610 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
index 2abe45d5fc..2abe45d5fc 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
index 5cd3e6fac8..5cd3e6fac8 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
index cf50a641de..cf50a641de 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
index 842a264caa..842a264caa 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
index 9cf02a9e68..9cf02a9e68 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
index 586fe28171..586fe28171 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
index 8066d563a4..8066d563a4 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
index fac0b1ab45..fac0b1ab45 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
index 884a303684..884a303684 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
index ed57967772..ed57967772 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
index 16e04a7da0..16e04a7da0 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
index 959c494634..959c494634 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
index 9c05545e41..9c05545e41 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
index baddc60e3f..baddc60e3f 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
index 0097b5017c..0097b5017c 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
index 6011346b78..6011346b78 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
index 43cfb597bb..43cfb597bb 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
index 6eab9f5596..6eab9f5596 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
index 2cdecd1e6d..2cdecd1e6d 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
index bcb348dc8a..bcb348dc8a 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
index e593146550..e593146550 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
index dd7a90828a..dd7a90828a 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
index 3c27240e9e..3c27240e9e 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
index fe98ca24b6..fe98ca24b6 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
index 2f30acc89f..2f30acc89f 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
index b8fb306076..b8fb306076 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
index 312adc5ed7..312adc5ed7 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java
diff --git a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
index f8005f4290..f8005f4290 100644
--- a/server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
+++ b/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java
diff --git a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
index d7d12c6d03..d7d12c6d03 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java
diff --git a/server/src/main/java/com/vaadin/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java
index 57c2fc1046..57c2fc1046 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java
diff --git a/server/src/main/java/com/vaadin/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java
index 1a2c7ef716..1a2c7ef716 100644
--- a/server/src/main/java/com/vaadin/ui/Calendar.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java
diff --git a/server/src/main/java/com/vaadin/ui/ColorPicker.java b/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java
index 67002373d0..67002373d0 100644
--- a/server/src/main/java/com/vaadin/ui/ColorPicker.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java
diff --git a/server/src/main/java/com/vaadin/ui/ColorPickerArea.java b/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java
index c4f3971259..c4f3971259 100644
--- a/server/src/main/java/com/vaadin/ui/ColorPickerArea.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java
diff --git a/server/src/main/java/com/vaadin/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java
index a78823d9a3..a78823d9a3 100644
--- a/server/src/main/java/com/vaadin/ui/ComboBox.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java
diff --git a/server/src/main/java/com/vaadin/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/ui/Tree.java
index 5da499f94e..5da499f94e 100644
--- a/server/src/main/java/com/vaadin/ui/Tree.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/Tree.java
diff --git a/server/src/main/java/com/vaadin/ui/TwinColSelect.java b/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java
index 261d813ffa..261d813ffa 100644
--- a/server/src/main/java/com/vaadin/ui/TwinColSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
index f007f0cf34..f007f0cf34 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
index 2c4fec95d4..2c4fec95d4 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
index 09d6c80a7f..09d6c80a7f 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
index 3b71ab5a00..3b71ab5a00 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
index b0a6aaa95a..b0a6aaa95a 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
index e2a580085a..e2a580085a 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
index fbf197d3eb..fbf197d3eb 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
index aaa76418a6..aaa76418a6 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
index b4195cf0b1..b4195cf0b1 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
index 1d4fabed5a..1d4fabed5a 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
index 5a44cae4ac..5a44cae4ac 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
index 61f738fcd0..61f738fcd0 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
index 0107e10e3d..0107e10e3d 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
index 60f0016312..60f0016312 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
index 51e4bc1cbc..51e4bc1cbc 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
index 6cdc00bee2..6cdc00bee2 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java
diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
index 128c6abfbd..128c6abfbd 100644
--- a/server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
index aa703deb19..aa703deb19 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
index b234dc3d5d..b234dc3d5d 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
index 23748a967a..23748a967a 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
index 9e5580c719..9e5580c719 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
index 1173faf152..1173faf152 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
index dbf3b18bf3..dbf3b18bf3 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
index dc133ce156..dc133ce156 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
index ae3dee4069..ae3dee4069 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
index d9264745a8..d9264745a8 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java
diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
index 7980111e2b..7980111e2b 100644
--- a/server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
+++ b/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java
diff --git a/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..979f472e20 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java
diff --git a/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java
index f825ef64c6..f825ef64c6 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java
index 7c3dba9db3..7c3dba9db3 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java
index 4bdad3c54d..4bdad3c54d 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java
index 18013cd41c..18013cd41c 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
index 39054008cd..39054008cd 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java
index e797b484f8..e797b484f8 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java
diff --git a/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/compatibility-server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java
index dd8267107a..dd8267107a 100644
--- a/server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
index 98a2513515..98a2513515 100644
--- a/server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java
index 5e0d464fe8..5e0d464fe8 100644
--- a/server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
index d5a7131182..d5a7131182 100644
--- a/server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java
index d8a1290b68..d8a1290b68 100644
--- a/server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/SerializationTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/SerializationTest.java
index 30b0729ace..30b0729ace 100644
--- a/server/src/test/java/com/vaadin/tests/server/SerializationTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/SerializationTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
index 7d011afc8b..7d011afc8b 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
index f6896ff15d..f6896ff15d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
index 9cc78269f8..9cc78269f8 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
index 401b5861ce..401b5861ce 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
index 2e3b8e412e..2e3b8e412e 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
index a55ed89691..a55ed89691 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java
index 482267f63d..482267f63d 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
index e8ca64895a..e8ca64895a 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
index ade24a0df6..ade24a0df6 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
index 1e73f953b2..1e73f953b2 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java
index ec10c4fe39..ec10c4fe39 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java
index ed455415ea..ed455415ea 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
index 02a2ebfd77..02a2ebfd77 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
index 9348de63c2..9348de63c2 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java
diff --git a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
index 66a4ec2370..66a4ec2370 100644
--- a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java
diff --git a/server/src/main/java/com/vaadin/event/dd/DragSource.java b/server/src/main/java/com/vaadin/event/dd/DragSource.java
index 07f8dd43aa..bf5983e502 100644
--- a/server/src/main/java/com/vaadin/event/dd/DragSource.java
+++ b/server/src/main/java/com/vaadin/event/dd/DragSource.java
@@ -20,7 +20,6 @@ import java.util.Map;
 import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.ui.Component;
-import com.vaadin.ui.Tree;
 
 /**
  * DragSource is a {@link Component} that builds a {@link Transferable} for a
@@ -48,7 +47,7 @@ public interface DragSource extends Component {
      * the client side. Vaadin developer don't and can't know anything about
      * these generated keys, only about item identifiers. When tree node is
      * dragged client puts that key to {@link Transferable}s client side
-     * counterpart. In {@link Tree#getTransferable(Map)} the key is converted
+     * counterpart. In {@code Tree.getTransferable(Map)} the key is converted
      * back to item identifier that the server side developer can use.
      * <p>
      *
diff --git a/server/src/main/java/com/vaadin/event/dd/TargetDetails.java b/server/src/main/java/com/vaadin/event/dd/TargetDetails.java
index 7a51f8f3b7..b30d902dce 100644
--- a/server/src/main/java/com/vaadin/event/dd/TargetDetails.java
+++ b/server/src/main/java/com/vaadin/event/dd/TargetDetails.java
@@ -17,15 +17,13 @@ package com.vaadin.event.dd;
 
 import java.io.Serializable;
 
-import com.vaadin.ui.Tree.TreeTargetDetails;
-
 /**
  * TargetDetails wraps drop target related information about
  * {@link DragAndDropEvent}.
  * <p>
  * When a TargetDetails object is used in {@link DropHandler} it is often
  * preferable to cast the TargetDetails to an implementation provided by
- * DropTarget like {@link TreeTargetDetails}. They often provide a better typed,
+ * DropTarget like {@code TreeTargetDetails}. They often provide a better typed,
  * drop target specific API.
  *
  * @since 6.3
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java
index 272a52c276..4879609e01 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java
@@ -32,7 +32,6 @@ import org.jsoup.parser.Parser;
 
 import com.vaadin.event.ShortcutAction;
 import com.vaadin.server.Resource;
-import com.vaadin.ui.AbstractSelect;
 import com.vaadin.ui.declarative.converters.DesignDateConverter;
 import com.vaadin.ui.declarative.converters.DesignEnumConverter;
 import com.vaadin.ui.declarative.converters.DesignObjectConverter;
@@ -379,7 +378,7 @@ public class DesignFormatter implements Serializable {
      * </p>
      * <p>
      * Typically, this method will be used by components to encode data (like
-     * option items in {@link AbstractSelect}) when dumping to HTML format
+     * option items in {@code AbstractSelect}) when dumping to HTML format
      * </p>
      *
      * @since 7.5.7
@@ -403,7 +402,7 @@ public class DesignFormatter implements Serializable {
      *
      * <p>
      * Typically this method will be used by components to read back data (like
-     * option items in {@link AbstractSelect}) from HTML. Note that this method
+     * option items in {@code AbstractSelect}) from HTML. Note that this method
      * unencodes more characters than {@link #encodeForTextNode(String)} encodes
      * </p>
      *
diff --git a/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
index f1a83adadc..4662f6f84b 100644
--- a/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
@@ -10,7 +10,6 @@ import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.CustomLayout;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.components.colorpicker.ColorPickerPreview;
 
 public class AddRemoveComponentTest {
 
@@ -22,7 +21,6 @@ public class AddRemoveComponentTest {
 
         // No default constructor, special case
         containerClasses.remove(CustomLayout.class);
-        containerClasses.remove(ColorPickerPreview.class);
         testRemoveComponentFromWrongContainer(new CustomLayout("dummy"));
 
         for (Class<? extends ComponentContainer> c : containerClasses) {