summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-08-18 23:19:41 +0300
committerArtur Signell <artur@vaadin.com>2016-08-22 15:59:51 +0300
commitc6b44ac8adc9b2ffd6290c98643a633f405dd6c6 (patch)
tree634982e9a789452ab8046e660a9170cc8b25623f /uitest
parentec8904f6b0ab77231d567daa35c9cc7138b6fe59 (diff)
downloadvaadin-framework-c6b44ac8adc9b2ffd6290c98643a633f405dd6c6.tar.gz
vaadin-framework-c6b44ac8adc9b2ffd6290c98643a633f405dd6c6.zip
Move and rename server classes which go into the compatibility package
* Use com.vaadin.v7 * Use the same class name as in Vaadin 7 * Use a "vaadin7-" declarative prefix for Vaadin 7 components Change-Id: I19a27f3835b18980b91a4f8f9464b2adde1a5fd5
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/Components.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/FocusingComponents.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/LayoutDemo.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/ListenerOrder.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/ModalWindow.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/NativeWindowing.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/Parameters.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TableSelectTest.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestBench.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForAlignments.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForTrees.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForUpload.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestForWindowing.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestMethodProperty.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/HierarchicalContainerSorting.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/TestBase.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java28
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java64
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopup.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/NewItemsESCPress.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/SlowComboBox.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java36
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDisabledMultiselect.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorMultiselect.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridSelectAllCell.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java26
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java28
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java384
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectNull.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java24
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java2
-rwxr-xr-xuitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java2
-rwxr-xr-xuitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreas.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/NativeSelects.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/NullSelectionItemId.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/SelectTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelects.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/AddNonRenderedRow.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandRatio.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderEvent.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidths.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChange.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java32
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/EditableTableFocus.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/FixedHeightTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/Footer.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/NotselectablePaintSelections.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java26
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/RowGenerators.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ScrollDetachSynchronization.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SelectableEditable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SelectingItemScrollsRight.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderShifting.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableItemIcon.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthCalculation.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableScrollOnFocus.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSingleSelect.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java26
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWithManyColumns.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/Tables.java28
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/table/WideSelectableTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textarea/Wordwrap.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java28
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java28
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/AddNodesOnExpand.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java32
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableInternalError.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/components/FormsCssTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowNativeSelect.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/SubWindowOrder.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/ScrolledDropTarget.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java60
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java42
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java26
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java30
-rw-r--r--uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java2
-rwxr-xr-xuitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java28
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/DeepComponentTrees.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java60
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseCaption.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/BasicPush.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java8
-rw-r--r--uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java64
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java38
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java48
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMiscTests.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java16
-rw-r--r--uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java14
-rw-r--r--uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java20
-rw-r--r--uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java18
-rw-r--r--uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java10
-rw-r--r--uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java4
-rw-r--r--uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java12
-rw-r--r--uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/util/TestUtils.java6
-rw-r--r--uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java42
-rw-r--r--uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java22
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/server/SuperTextArea.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java4
-rwxr-xr-xuitest/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLTestsConstants.java (renamed from uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java)10
-rw-r--r--uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java40
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java13
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java11
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java13
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java11
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java13
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java13
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java11
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java20
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java9
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java9
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java11
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/LegacyGridElement.java31
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java9
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java46
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java8
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java14
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java8
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java57
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java3
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java26
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java83
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java16
-rw-r--r--uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java5
-rw-r--r--uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java56
-rw-r--r--uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java10
-rw-r--r--uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java6
-rw-r--r--uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java17
-rw-r--r--uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java16
-rw-r--r--uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPasswordFieldElement.java9
-rw-r--r--uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java48
-rw-r--r--uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java61
-rw-r--r--uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java28
-rw-r--r--uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java76
-rw-r--r--uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java4
-rw-r--r--uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java7
-rw-r--r--uitest/src/test/java/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyCheckBoxElement.java9
-rw-r--r--uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java28
-rw-r--r--uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java28
-rw-r--r--uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java28
-rw-r--r--uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyTextFieldElement.java9
1106 files changed, 3775 insertions, 4316 deletions
diff --git a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
index ac92eabab7..857966af9c 100644
--- a/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
+++ b/uitest/src/main/java/com/vaadin/screenshotbrowser/ScreenshotBrowser.java
@@ -26,9 +26,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.event.ShortcutListener;
import com.vaadin.server.ExternalResource;
@@ -41,9 +38,12 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
@Theme("valo")
public class ScreenshotBrowser extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java
index 10c204135f..0a9256364d 100644
--- a/uitest/src/main/java/com/vaadin/tests/Components.java
+++ b/uitest/src/main/java/com/vaadin/tests/Components.java
@@ -9,9 +9,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.DefaultItemSorter;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.server.ExternalResource;
@@ -25,10 +22,13 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.ItemStyleGenerator;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.DefaultItemSorter;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.ItemStyleGenerator;
public class Components extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
index 1e09a083c2..18a6ecf46e 100644
--- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java
@@ -23,13 +23,13 @@ import com.vaadin.ui.Component.Event;
import com.vaadin.ui.Component.Listener;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
import com.vaadin.ui.PasswordField;
import com.vaadin.ui.TextField;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
/**
* This example demonstrates custom layout. All components created here are
@@ -156,7 +156,7 @@ public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication
// Check if event occured at fsTree component
if (event.getSource() == menu) {
// Check if event is about changing value
- if (event.getClass() == LegacyField.ValueChangeEvent.class) {
+ if (event.getClass() == Field.ValueChangeEvent.class) {
// Update body area with selected item
setBody(menu.getValue().toString());
}
diff --git a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
index fe730262ab..6173aea527 100644
--- a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java
@@ -1,16 +1,16 @@
package com.vaadin.tests;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.DateField;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.TextField;
/**
* Simple test helper to test Focusable.focus() method.
@@ -30,7 +30,7 @@ public class FocusingComponents extends CustomComponent {
addFocusableTest(f);
addFocusableTest(new ComboBox());
- addFocusableTest(new LegacyTextField());
+ addFocusableTest(new TextField());
addFocusableTest(new DateField());
addFocusableTest(new NativeSelect());
addFocusableTest(new ListSelect());
diff --git a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
index 0be5305708..bd1ef0a71f 100644
--- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
+++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java
@@ -24,10 +24,10 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
/**
* This example demonstrates layouts. Layouts are populated with sample Vaadin
diff --git a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
index b24ba1e99c..10fa0a50b8 100644
--- a/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/ListenerOrder.java
@@ -3,18 +3,18 @@ package com.vaadin.tests;
import java.util.HashMap;
import java.util.Iterator;
-import com.vaadin.data.Container.ItemSetChangeEvent;
-import com.vaadin.data.Container.ItemSetChangeListener;
-import com.vaadin.data.Container.PropertySetChangeEvent;
-import com.vaadin.data.Container.PropertySetChangeListener;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.data.Container.ItemSetChangeEvent;
+import com.vaadin.v7.data.Container.ItemSetChangeListener;
+import com.vaadin.v7.data.Container.PropertySetChangeEvent;
+import com.vaadin.v7.data.Container.PropertySetChangeListener;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Select;
public class ListenerOrder extends com.vaadin.server.LegacyApplication
implements Button.ClickListener, PropertySetChangeListener,
diff --git a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
index 820cd64f19..cbb91a8f42 100644
--- a/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/ModalWindow.java
@@ -20,10 +20,10 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.TextField;
/**
* Simple program that demonstrates "modal windows" that block all access other
@@ -50,7 +50,7 @@ public class ModalWindow extends com.vaadin.server.LegacyApplication
main.addComponent(new Label("ModalWindow demo"));
// Main window textfield
- final LegacyTextField f = new LegacyTextField();
+ final TextField f = new TextField();
f.setTabIndex(1);
main.addComponent(f);
@@ -87,7 +87,7 @@ public class ModalWindow extends com.vaadin.server.LegacyApplication
"You have to close this window before accessing others."));
// Textfield for modal window
- final LegacyTextField f = new LegacyTextField();
+ final TextField f = new TextField();
f.setTabIndex(4);
layout.addComponent(f);
f.focus();
diff --git a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
index 4d60ea4279..557003eb13 100644
--- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java
@@ -24,9 +24,9 @@ import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyWindow;
public class NativeWindowing extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/Parameters.java b/uitest/src/main/java/com/vaadin/tests/Parameters.java
index 5616dee109..42379e4017 100644
--- a/uitest/src/main/java/com/vaadin/tests/Parameters.java
+++ b/uitest/src/main/java/com/vaadin/tests/Parameters.java
@@ -27,11 +27,11 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinResponse;
import com.vaadin.server.VaadinSession;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Link;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
/**
* This is a demonstration of how URL parameters can be recieved and handled.
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
index fb2e7ae238..2617da651e 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java
@@ -22,14 +22,14 @@ 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.ComboBox;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.DateField;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class PerformanceTestBasicComponentRendering extends CustomComponent {
@@ -80,7 +80,7 @@ public class PerformanceTestBasicComponentRendering extends CustomComponent {
}
testContainer.addComponent(cb);
- LegacyTextField tf = new LegacyTextField("TextField " + i);
+ TextField tf = new TextField("TextField " + i);
tf.setDescription("DESC SDKJSDF");
tf.setComponentError(new UserError("dsfjklsdf"));
testContainer.addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
index 6c32e45123..5d22ddf2a4 100644
--- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java
@@ -23,8 +23,8 @@ 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.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class PerformanceTestSubTreeCaching extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
index a467c6b00b..dde926234e 100644
--- a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
+++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java
@@ -27,13 +27,13 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Link;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Select;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.TextField;
/**
* This example demonstrates layouts. Layouts are populated with sample Vaadin
@@ -149,7 +149,7 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication {
break;
case 2:
// TextField
- result = new LegacyTextField();
+ result = new TextField();
result.setCaption("TextField component " + caption);
break;
case 3:
diff --git a/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java b/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
index c72817ac41..7ca1b8ca77 100644
--- a/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/ScrollbarStressTest.java
@@ -8,14 +8,14 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.Table;
public class ScrollbarStressTest extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
index f0416f73ca..3b045eb50b 100644
--- a/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/StressComponentsInTable.java
@@ -22,8 +22,8 @@ import java.util.Vector;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class StressComponentsInTable extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
index 4427c74e95..e41b701563 100644
--- a/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableChangingDatasource.java
@@ -21,8 +21,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class TableChangingDatasource extends CustomComponent
implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
index c063e25eb8..4b52f845a4 100644
--- a/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/TableSelectTest.java
@@ -16,11 +16,11 @@
package com.vaadin.tests;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.Table;
public class TableSelectTest extends CustomComponent
implements Table.ValueChangeListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestBench.java b/uitest/src/main/java/com/vaadin/tests/TestBench.java
index 6f7d5cdf00..f0ae215794 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestBench.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestBench.java
@@ -24,8 +24,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.server.ExternalResource;
import com.vaadin.server.LegacyApplication;
import com.vaadin.server.Page;
@@ -35,11 +33,13 @@ import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Link;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
/**
* TestBench finds out testable classes within given java packages and adds them
diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
index 719a85a22b..aa1ec78c5b 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java
@@ -32,21 +32,21 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.Link;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.Panel;
import com.vaadin.ui.ProgressIndicator;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.Select;
import com.vaadin.ui.Slider;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.Upload;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.TwinColSelect;
public class TestCaptionWrapper extends CustomComponent implements Listener {
@@ -163,7 +163,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener {
final Table table = new Table("Table " + count++);
test(layout, table);
- final LegacyTextField tf = new LegacyTextField("Textfield " + count++);
+ final TextField tf = new TextField("Textfield " + count++);
test(layout, tf);
final Tree tree = new Tree("Tree " + count++);
diff --git a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
index bb3e4206af..a0127631d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestContainerChanges.java
@@ -3,23 +3,23 @@
*/
package com.vaadin.tests;
-import com.vaadin.data.Container;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.ContainerOrderedWrapper;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.data.util.ContainerOrderedWrapper;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Tree;
/**
* @author marc
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
index f124b05832..1d743a3c5f 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java
@@ -22,7 +22,7 @@ import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.DateField;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TestForAlignments extends CustomComponent {
@@ -34,8 +34,8 @@ public class TestForAlignments extends CustomComponent {
final Button b2 = new Button("Left");
final Button b3 = new Button("Bottom");
final Button b4 = new Button("Top");
- final LegacyTextField t1 = new LegacyTextField("Right aligned");
- final LegacyTextField t2 = new LegacyTextField("Bottom aligned");
+ final TextField t1 = new TextField("Right aligned");
+ final TextField t2 = new TextField("Bottom aligned");
final DateField d1 = new DateField("Center aligned");
final DateField d2 = new DateField("Center aligned");
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
index b68d928296..cadef51b0d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForApplicationLayoutThatUsesWholeBrosersSpace.java
@@ -19,10 +19,10 @@ package com.vaadin.tests;
import com.vaadin.server.LegacyApplication;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class TestForApplicationLayoutThatUsesWholeBrosersSpace
extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
index c9bc23daf6..5b1b5c7f06 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java
@@ -29,9 +29,9 @@ import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.Table;
public class TestForBasicApplicationLayout extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
index 158217e374..27c93ad426 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForChildComponentRendering.java
@@ -26,8 +26,8 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
-import com.vaadin.ui.Select;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Select;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
index 35f356eb4a..10c3328e89 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForContainerFilterable.java
@@ -16,16 +16,16 @@
package com.vaadin.tests;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TestForContainerFilterable extends CustomComponent {
@@ -34,8 +34,8 @@ public class TestForContainerFilterable extends CustomComponent {
Table t = new Table();
private static String parts[] = { "Neo", "Sa", "rem", "the", "adi", "za",
"tre", "day", "Ca", "re", "cen", "ter", "mi", "nal" };
- LegacyTextField fooFilter = new LegacyTextField("foo-filter");
- LegacyTextField barFilter = new LegacyTextField("bar-filter");
+ TextField fooFilter = new TextField("foo-filter");
+ TextField barFilter = new TextField("bar-filter");
Button filterButton = new Button("Filter");
Label count = new Label();
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
index 8de6e1c758..3757a13829 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java
@@ -27,7 +27,7 @@ import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.Select;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
index 41448e0e9e..c1face8492 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForMultipleStyleNames.java
@@ -20,13 +20,13 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.TwinColSelect;
/**
* TODO: Note you need to add Theme under WebContent/VAADIN/Themes/mytheme in
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
index 18db338f81..96d4879a30 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java
@@ -24,9 +24,9 @@ import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyWindow;
public class TestForNativeWindowing extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
index ebc2901140..7cc3c9e513 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java
@@ -16,7 +16,6 @@
package com.vaadin.tests;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
@@ -25,12 +24,13 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.TwinColSelect;
/**
* @author Vaadin Ltd.
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
index 5bb81c1cd7..5ad1032879 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java
@@ -16,15 +16,15 @@
package com.vaadin.tests;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.RichTextArea;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
index 700b4b5a94..24b19e1ac2 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java
@@ -33,7 +33,6 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Link;
import com.vaadin.ui.Panel;
import com.vaadin.ui.ProgressIndicator;
@@ -47,6 +46,7 @@ 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.v7.ui.LegacyWindow;
public class TestForStyledUpload extends LegacyApplication
implements Upload.FinishedListener, FailedListener, SucceededListener,
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
index 204ad61faa..0cb616d084 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java
@@ -25,8 +25,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
index 2429538352..44f42efaf7 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java
@@ -27,8 +27,8 @@ import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Tree;
/**
* Some test cases for trees. Events panel logs events that happen server side.
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
index 91dd6503ec..1d4434d63e 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java
@@ -28,7 +28,6 @@ import java.io.OutputStream;
import java.lang.management.ManagementFactory;
import java.lang.management.MemoryMXBean;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.server.StreamResource;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Button;
@@ -37,18 +36,19 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Link;
import com.vaadin.ui.Panel;
import com.vaadin.ui.ProgressIndicator;
-import com.vaadin.ui.Select;
import com.vaadin.ui.Upload;
import com.vaadin.ui.Upload.FinishedEvent;
import com.vaadin.ui.Upload.StartedEvent;
import com.vaadin.ui.Upload.StartedListener;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.TextField;
public class TestForUpload extends CustomComponent
implements Upload.ProgressListener {
@@ -73,7 +73,7 @@ public class TestForUpload extends CustomComponent
private final Select uploadBufferSelector;
- private LegacyTextField textField;
+ private TextField textField;
private Label textFieldValue;
@@ -99,7 +99,7 @@ public class TestForUpload extends CustomComponent
main.addComponent(new Label(
"Clicking on button b updates information about upload components status or same with garbage collector."));
- textField = new LegacyTextField("Test field");
+ textField = new TextField("Test field");
textFieldValue = new Label();
main.addComponent(textField);
main.addComponent(textFieldValue);
@@ -218,7 +218,7 @@ public class TestForUpload extends CustomComponent
uploadBufferSelector.setValue("memory");
uploadBufferSelector.addItem("tempfile");
uploadBufferSelector
- .addListener(new LegacyAbstractField.ValueChangeListener() {
+ .addListener(new AbstractField.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
setBuffer();
diff --git a/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
index cbe5a231d9..c23413a87d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestForWindowing.java
@@ -16,21 +16,21 @@
package com.vaadin.tests;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.Select;
import com.vaadin.ui.Slider;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.Select;
public class TestForWindowing extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestMethodProperty.java b/uitest/src/main/java/com/vaadin/tests/TestMethodProperty.java
index ab9c416a5c..73da774a54 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestMethodProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestMethodProperty.java
@@ -1,6 +1,6 @@
package com.vaadin.tests;
-import com.vaadin.data.util.MethodProperty;
+import com.vaadin.v7.data.util.MethodProperty;
public class TestMethodProperty {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
index 537fdfab66..48287f6945 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java
@@ -25,8 +25,8 @@ import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.DateField;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Select;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Select;
/**
* This test has a somewhat deep layout within one page. At the bottom, Select
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
index c12a70c04d..5f5777108d 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSetVisibleAndCaching.java
@@ -21,9 +21,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
public class TestSetVisibleAndCaching
extends com.vaadin.server.LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
index 14da52ce4c..dbb1b517cd 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSizeableIncomponents.java
@@ -21,26 +21,26 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
-import com.vaadin.data.Container;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.LegacyApplication;
import com.vaadin.server.ThemeResource;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.ui.AbstractComponent;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class TestSizeableIncomponents extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
index 38bb88fe5d..7ece674dd3 100644
--- a/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/TestSplitPanel.java
@@ -17,8 +17,8 @@
package com.vaadin.tests;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.ui.LegacyWindow;
public class TestSplitPanel extends com.vaadin.server.LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
index 3df67c9758..80ff0aaccc 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java
@@ -18,16 +18,16 @@ package com.vaadin.tests;
import java.io.File;
-import com.vaadin.data.Item;
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.Tree;
-import com.vaadin.ui.Tree.ExpandEvent;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
/**
* Browsable file explorer using Vaadin Tree component. Demonstrates: how to add
diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
index 2ac9b2c0b8..9892d1725e 100644
--- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java
@@ -18,18 +18,18 @@ package com.vaadin.tests;
import java.io.File;
-import com.vaadin.data.util.FilesystemContainer;
-import com.vaadin.data.util.FilesystemContainer.FileItem;
import com.vaadin.server.VaadinSession;
import com.vaadin.tests.util.SampleDirectory;
import com.vaadin.ui.Component.Event;
import com.vaadin.ui.Component.Listener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.util.FilesystemContainer;
+import com.vaadin.v7.data.util.FilesystemContainer.FileItem;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
/**
* Browsable file explorer using Vaadin Tree component. Demonstrates: how to use
@@ -107,7 +107,7 @@ public class TreeFilesystemContainer extends com.vaadin.server.LegacyApplication
// Check if event occured at fsTree component
if (event.getSource() == filesystem) {
// Check if event is about changing value
- if (event.getClass() == LegacyField.ValueChangeEvent.class) {
+ if (event.getClass() == Field.ValueChangeEvent.class) {
// Update property panel contents
final FileItem fileItem = (FileItem) filesystem
.getItem(filesystem.getValue());
diff --git a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
index 79b4bd7c2c..6be06393cc 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java
@@ -18,12 +18,12 @@ package com.vaadin.tests;
import java.util.Random;
-import com.vaadin.data.Item;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Select;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.Select;
public class UsingCustomNewItemHandlerInSelect extends CustomComponent {
diff --git a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
index 9c629bd7b1..e4be12648e 100644
--- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java
@@ -19,14 +19,14 @@ package com.vaadin.tests;
import java.util.LinkedList;
import java.util.Random;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
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.Select;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Select;
public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication
implements ValueChangeListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
index 80ff121ed2..1a0a27124b 100644
--- a/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
+++ b/uitest/src/main/java/com/vaadin/tests/actions/ActionsWithoutKeyCode.java
@@ -3,14 +3,14 @@ package com.vaadin.tests.actions;
import com.vaadin.event.Action;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("serial")
public class ActionsWithoutKeyCode extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
tf.setWidth("100%");
tf.setInputPrompt(
"Enter text with å,ä or ä or press windows key while textfield is focused");
diff --git a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
index bd93b6aebd..17059cf08a 100644
--- a/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/appengine/GAESyncTest.java
@@ -1,8 +1,6 @@
package com.vaadin.tests.appengine;
import com.google.apphosting.api.DeadlineExceededException;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.server.ClassResource;
import com.vaadin.server.DownloadStream;
import com.vaadin.server.LegacyApplication;
@@ -11,9 +9,11 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Notification;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.TextField;
public class GAESyncTest extends LegacyApplication {
@@ -48,7 +48,7 @@ public class GAESyncTest extends LegacyApplication {
private class IntrWindow extends LegacyWindow {
private int n = 0;
private static final long serialVersionUID = -6521351715072191625l;
- LegacyTextField tf;
+ TextField tf;
Label l;
LegacyApplication app;
GridLayout gl;
@@ -56,7 +56,7 @@ public class GAESyncTest extends LegacyApplication {
private IntrWindow(LegacyApplication app) {
this.app = app;
- tf = new LegacyTextField("Echo thingie");
+ tf = new TextField("Echo thingie");
tf.setImmediate(true);
tf.addListener(new Property.ValueChangeListener() {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
index c3ba0adb0b..190d125214 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyWindow;
public class ApplicationCloseTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
index 602b66e512..0521399eb0 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/CommErrorEmulatorUI.java
@@ -16,8 +16,6 @@
package com.vaadin.tests.application;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.server.VaadinServlet;
import com.vaadin.tests.components.AbstractTestUIWithLog;
@@ -31,7 +29,9 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -130,7 +130,7 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
private Component createConfigPanel() {
Panel p = new Panel("Reconnect dialog configuration");
p.setSizeUndefined();
- final LegacyTextField reconnectDialogMessage = new LegacyTextField(
+ final TextField reconnectDialogMessage = new TextField(
"Reconnect message");
reconnectDialogMessage.setWidth("50em");
reconnectDialogMessage
@@ -144,7 +144,7 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
}
});
- final LegacyTextField reconnectDialogGaveUpMessage = new LegacyTextField(
+ final TextField reconnectDialogGaveUpMessage = new TextField(
"Reconnect gave up message");
reconnectDialogGaveUpMessage.setWidth("50em");
@@ -158,7 +158,7 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
reconnectDialogGaveUpMessage.getValue());
}
});
- final LegacyTextField reconnectDialogReconnectAttempts = new LegacyTextField(
+ final TextField reconnectDialogReconnectAttempts = new TextField(
"Reconnect attempts");
reconnectDialogReconnectAttempts.setConverter(Integer.class);
reconnectDialogReconnectAttempts.setConvertedValue(
@@ -172,7 +172,7 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
.getConvertedValue());
}
});
- final LegacyTextField reconnectDialogReconnectInterval = new LegacyTextField(
+ final TextField reconnectDialogReconnectInterval = new TextField(
"Reconnect interval (ms)");
reconnectDialogReconnectInterval.setConverter(Integer.class);
reconnectDialogReconnectInterval.setConvertedValue(
@@ -187,7 +187,7 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
}
});
- final LegacyTextField reconnectDialogGracePeriod = new LegacyTextField(
+ final TextField reconnectDialogGracePeriod = new TextField(
"Reconnect dialog grace period (ms)");
reconnectDialogGracePeriod.setConverter(Integer.class);
reconnectDialogGracePeriod.setConvertedValue(
@@ -228,12 +228,12 @@ public class CommErrorEmulatorUI extends AbstractTestUIWithLog {
hl.setSpacing(true);
hl.setDefaultComponentAlignment(Alignment.MIDDLE_LEFT);
Label l1 = new Label("Respond to " + type + " requests with code");
- final LegacyTextField responseCode = new LegacyTextField(null,
+ final TextField responseCode = new TextField(null,
"" + response.code);
responseCode.setConverter(Integer.class);
responseCode.setWidth("5em");
Label l2 = new Label("for the following");
- final LegacyTextField timeField = new LegacyTextField(null,
+ final TextField timeField = new TextField(null,
"" + response.time);
timeField.setConverter(Integer.class);
timeField.setWidth("5em");
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java b/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
index a09c4c845a..dd6840b835 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ErrorInUnloadEvent.java
@@ -9,10 +9,10 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.PasswordField;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
public class ErrorInUnloadEvent extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java b/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
index ed611117d0..63c29517f5 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/ThreadLocalInstances.java
@@ -10,8 +10,8 @@ import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Embedded;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.UI;
+import com.vaadin.v7.ui.LegacyWindow;
public class ThreadLocalInstances extends AbstractTestCase {
private static final VaadinSession staticInitApplication = VaadinSession
diff --git a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
index fa3b2057dd..148c080c01 100644
--- a/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
+++ b/uitest/src/main/java/com/vaadin/tests/application/calculator/Calc.java
@@ -25,11 +25,11 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnHeaderMode;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnHeaderMode;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("serial")
public class Calc extends AbstractTestUI {
@@ -65,7 +65,7 @@ public class Calc extends AbstractTestUI {
VerticalLayout vl = new VerticalLayout();
vl.setMargin(true);
- final LegacyTextField tf = new LegacyTextField();
+ final TextField tf = new TextField();
tf.setSizeFull();
vl.addComponent(tf);
@@ -128,7 +128,7 @@ public class Calc extends AbstractTestUI {
private VerticalLayout topLayout = new VerticalLayout();
// User interface components
- private final LegacyTextField display = new LegacyTextField();
+ private final TextField display = new TextField();
private final Log log = new Log();
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
index fc1d249e26..993833aadd 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationcontext/ChangeSessionId.java
@@ -6,7 +6,7 @@ import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyWindow;
public class ChangeSessionId extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java
index 9912e660ef..e515155dd7 100644
--- a/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java
+++ b/uitest/src/main/java/com/vaadin/tests/applicationservlet/SystemMessages.java
@@ -2,8 +2,6 @@ package com.vaadin.tests.applicationservlet;
import java.util.Locale;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.launcher.ApplicationRunnerServlet;
import com.vaadin.server.CustomizedSystemMessages;
import com.vaadin.server.VaadinRequest;
@@ -12,7 +10,9 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.NativeSelect;
import elemental.json.JsonObject;
diff --git a/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
index f9d8dacd51..b1682d29cc 100644
--- a/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/browserfeatures/WebkitScrollbarTest.java
@@ -21,10 +21,10 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.ListSelect;
@SuppressWarnings("serial")
public class WebkitScrollbarTest extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
index c8b1da8e98..5720834bd1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java
@@ -15,12 +15,12 @@ import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.InlineDateField;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.PopupDateField;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalSplitPanel;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public abstract class AbstractComponentContainerTest<T extends AbstractComponentContainer>
extends AbstractComponentTest<T>
@@ -68,7 +68,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent
private Command<T, ComponentSize> addTextFieldCommand = new Command<T, ComponentSize>() {
@Override
public void execute(T c, ComponentSize size, Object data) {
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
c.addComponent(tf);
size.apply(tf);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
index ece6cc5cad..3e25b01893 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentTestCase.java
@@ -11,7 +11,7 @@ import com.vaadin.server.ThemeResource;
import com.vaadin.server.UserError;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Layout.SpacingHandler;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.Field;
public abstract class AbstractComponentTestCase<T extends AbstractComponent>
extends TestBase {
@@ -154,7 +154,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent>
@Override
public void execute(T c, String value, Object data) {
- ((LegacyField<?>) c).setRequiredError(value);
+ ((Field<?>) c).setRequiredError(value);
}
};
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
index 8d575c78f4..6b67405bdb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptions.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Test to see if AbstractOrderedLayout displays captions correctly with
@@ -34,7 +34,7 @@ public class AbstractOrderedLayoutWithCaptions extends AbstractTestUI {
VerticalLayout layout = new VerticalLayout();
layout.setSizeFull();
- LegacyTextField textField = new LegacyTextField("Input Text:");
+ TextField textField = new TextField("Input Text:");
Label label1 = new Label("LABEL 1");
Label label2 = new Label("LABEL 2");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
index 66079d6543..d2ff9f8900 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.ui.PopupDateField;
public class AddRemoveSetStyleNamesTest extends TestBase {
@@ -10,7 +10,7 @@ public class AddRemoveSetStyleNamesTest extends TestBase {
private String style2 = "style2";
private String thestyle = "thestyle";
- private LegacyPopupDateField popupDateField;
+ private PopupDateField popupDateField;
private Button button1;
private Button button2;
private Button button3;
@@ -19,7 +19,7 @@ public class AddRemoveSetStyleNamesTest extends TestBase {
@Override
protected void setup() {
- popupDateField = new LegacyPopupDateField("PopupDateField");
+ popupDateField = new PopupDateField("PopupDateField");
popupDateField.setRequired(true);
popupDateField.setRequiredError("abcd");
addComponent(popupDateField);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
index 64df5b1f09..5c73c851a5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ComponentTestCase.java
@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
@@ -14,8 +11,11 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.NativeSelect;
public abstract class ComponentTestCase<T extends AbstractComponent>
extends AbstractComponentTestCase<T> {
@@ -73,7 +73,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent>
actions.add(createReadonlyAction(false));
actions.add(createErrorIndicatorAction(false));
- if (LegacyField.class.isAssignableFrom(getTestClass())) {
+ if (Field.class.isAssignableFrom(getTestClass())) {
actions.add(createRequiredAction(false));
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
index bbd3f8c024..18936f0a93 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/DisableEnableCascadeStyles.java
@@ -9,9 +9,9 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class DisableEnableCascadeStyles extends TestBase {
@@ -19,7 +19,7 @@ public class DisableEnableCascadeStyles extends TestBase {
private TabSheet innerTabsheet;
private Button button;
private TextArea textArea;
- private LegacyTextField textField;
+ private TextField textField;
private VerticalLayout layout;
private NativeButton nativeButton;
private Button enableDisablePanelButton;
@@ -36,7 +36,7 @@ public class DisableEnableCascadeStyles extends TestBase {
button = new Button("Button, enabled");
nativeButton = new NativeButton("NativeButton, enabled");
- textField = new LegacyTextField(
+ textField = new TextField(
"TextField with caption and value, enabled");
textField.setValue("Text");
textArea = new TextArea("TextArea with caption and value, enabled");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
index 2d8cfd6831..6e49ee50d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ErrorMessages.java
@@ -6,8 +6,8 @@ import java.util.List;
import com.vaadin.server.CompositeErrorMessage;
import com.vaadin.server.UserError;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
public class ErrorMessages extends TestBase {
@@ -20,7 +20,7 @@ public class ErrorMessages extends TestBase {
bb.setComponentError(new CompositeErrorMessage(errors));
addComponent(bb);
- LegacyTextField tf = new LegacyTextField("",
+ TextField tf = new TextField("",
"Textfield with UserError");
tf.setComponentError(new UserError("This is a failure"));
addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
index 8dbff74c69..807af1efd8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java
@@ -10,14 +10,14 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.TextField;
public class FocusAndBlurListeners extends TestBase {
@@ -46,7 +46,7 @@ public class FocusAndBlurListeners extends TestBase {
protected void setup() {
Layout l = getLayout();
- LegacyTextField tf = new LegacyTextField("TextField");
+ TextField tf = new TextField("TextField");
l.addComponent(tf);
DateField df = new DateField("DateField");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
index 58c87df0a5..9de40f2210 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/FocusFromShortcutAction.java
@@ -6,8 +6,8 @@ import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.event.ShortcutAction.ModifierKey;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Select;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.TextField;
public class FocusFromShortcutAction extends TestBase {
@@ -15,7 +15,7 @@ public class FocusFromShortcutAction extends TestBase {
protected void setup() {
final Select select = new Select("Select",
Arrays.asList("Option 1", "Option 2"));
- final LegacyTextField text = new LegacyTextField("Text");
+ final TextField text = new TextField("Text");
addComponent(select);
addComponent(text);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/HierarchicalContainerSorting.java b/uitest/src/main/java/com/vaadin/tests/components/HierarchicalContainerSorting.java
index ec33b8f0e3..d42dce8512 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/HierarchicalContainerSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/HierarchicalContainerSorting.java
@@ -3,11 +3,11 @@ package com.vaadin.tests.components;
import java.util.HashMap;
import java.util.Map;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Tree;
public class HierarchicalContainerSorting extends TestBase {
IndexedContainer hierarchicalContainer = new HierarchicalContainer();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
index 9d2689810b..d1cdc31e7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/LayoutAttachListenerInfo.java
@@ -2,8 +2,6 @@ package com.vaadin.tests.components;
import java.util.Arrays;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.ui.AbsoluteLayout;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
@@ -12,8 +10,10 @@ import com.vaadin.ui.HasComponents.ComponentAttachEvent;
import com.vaadin.ui.HasComponents.ComponentAttachListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.OptionGroup;
public class LayoutAttachListenerInfo extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java b/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
index a75f8ab06f..bc3ef3cd46 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/MultipleDebugIds.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components;
import com.vaadin.ui.Button;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class MultipleDebugIds extends TestBase {
@@ -17,8 +17,8 @@ public class MultipleDebugIds extends TestBase {
@Override
protected void setup() {
- LegacyTextField textField = new LegacyTextField();
- LegacyTextField textField2 = new LegacyTextField();
+ TextField textField = new TextField();
+ TextField textField2 = new TextField();
Button button = new Button();
Button button2 = new Button();
textField.setId("textfield");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
index b82c1dd18b..cb26a48486 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java
@@ -8,9 +8,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.RowHeaderMode;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
public class SaneErrors extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
index f2d48a9ffa..995b62e712 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java
@@ -3,8 +3,8 @@ 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.v7.ui.LegacyWindow;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
index 1be0bd63a2..8db90bf332 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchDevicesTooltip.java
@@ -6,9 +6,9 @@ import javax.validation.constraints.NotNull;
import com.vaadin.annotations.Viewport;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Label;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
+import com.vaadin.v7.ui.TextField;
@Viewport(value = "width=device-width,height=device-height")
public class TouchDevicesTooltip extends AbstractTestUI {
@@ -24,10 +24,10 @@ public class TouchDevicesTooltip extends AbstractTestUI {
}
private void createTextField(int n) {
- LegacyTextField textField = new LegacyTextField("Value" + n);
- textField.setConverter(new LegacyStringToIntegerConverter());
+ TextField textField = new TextField("Value" + n);
+ textField.setConverter(new StringToIntegerConverter());
textField.addValidator(
- new LegacyIntegerRangeValidator(getErrorMessage(n), 0, 100));
+ new IntegerRangeValidator(getErrorMessage(n), 0, 100));
textField.setImmediate(true);
textField.setValue("-5");
addComponent(textField);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
index 691f93b09e..876c25dd69 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java
@@ -2,8 +2,6 @@ package com.vaadin.tests.components;
import java.util.Collection;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.DataBoundTransferable;
@@ -15,7 +13,6 @@ import com.vaadin.shared.ui.dd.VerticalDropLocation;
import com.vaadin.tests.util.Person;
import com.vaadin.tests.util.PersonContainer;
import com.vaadin.tests.util.TestUtils;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
import com.vaadin.ui.Accordion;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
@@ -27,9 +24,12 @@ import com.vaadin.ui.Layout;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Table;
public class TouchScrollables extends TestBase {
java.util.Random r = new java.util.Random(1);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
index 779ce83ff0..0722813e26 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutHideComponent.java
@@ -27,16 +27,16 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyPasswordField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.PasswordField;
+import com.vaadin.v7.ui.TextField;
public class AbsoluteLayoutHideComponent extends AbstractTestUI {
private AbsoluteLayout mainLayout;
private VerticalLayout topBar = new VerticalLayout();
private GridLayout menu;
- private LegacyTextField editEmail = new LegacyTextField();
- private LegacyPasswordField editPassword = new LegacyPasswordField();
+ private TextField editEmail = new TextField();
+ private PasswordField editPassword = new PasswordField();
@Override
protected void setup(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
index 04cd9b57e9..ccb30fb5e5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutRelativeSizeContent.java
@@ -22,7 +22,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.AbsoluteLayout;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
* Tests how AbsoluteLayout handles relative sized contents.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
index e7ed64d263..104476d8bf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutResizing.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.absolutelayout;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.AbsoluteLayout;
import com.vaadin.ui.HorizontalSplitPanel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.ui.TextArea;
public class AbsoluteLayoutResizing extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
index 1eab44df0b..6b1ace2971 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java
@@ -21,7 +21,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyWindow;
public class AllComponentTooltipTest extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
index 5424efc2cb..87ee746721 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/EnableState.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.abstractcomponent;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
public class EnableState extends AbstractTestCase {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
index f0dc432aeb..628cde1ae4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/PrimaryStyle.java
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class PrimaryStyle extends AbstractTestUI {
@@ -37,7 +37,7 @@ public class PrimaryStyle extends AbstractTestUI {
button.setStyleName("state");
addComponent(button);
- final LegacyTextField tf = new LegacyTextField("Test TextField");
+ final TextField tf = new TextField("Test TextField");
tf.setPrimaryStyleName("initial");
tf.setStyleName("state");
addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
index 0750469b22..763d7752b8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java
@@ -4,16 +4,16 @@ import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinSession;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
-import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.ComboBox;
public abstract class AbstractComponentDataBindingTest extends TestBase
implements ValueChangeListener {
@@ -70,15 +70,15 @@ public abstract class AbstractComponentDataBindingTest extends TestBase
@Override
protected void addComponent(Component c) {
super.addComponent(c);
- if (c instanceof LegacyAbstractField) {
- configureField((LegacyAbstractField<?>) c);
+ if (c instanceof AbstractField) {
+ configureField((AbstractField<?>) c);
if (c != localeSelect) {
fields.add(c);
}
}
}
- protected void configureField(LegacyAbstractField<?> field) {
+ protected void configureField(AbstractField<?> field) {
field.setImmediate(true);
field.addListener(this);
}
@@ -95,7 +95,7 @@ public abstract class AbstractComponentDataBindingTest extends TestBase
@Override
public void valueChange(ValueChangeEvent event) {
- LegacyAbstractField field = (LegacyAbstractField) event.getProperty();
+ AbstractField field = (AbstractField) event.getProperty();
// if (field == localeSelect) {
// return;
// }
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
index dbc89baf64..feaa1371ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java
@@ -1,17 +1,17 @@
package com.vaadin.tests.components.abstractfield;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Notification;
-import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.validator.StringLengthValidator;
+import com.vaadin.v7.ui.TextField;
public class AbstractFieldCommitWithInvalidValues extends TestBase {
- private LegacyTextField tf;
+ private TextField tf;
@Override
protected String getDescription() {
@@ -25,10 +25,10 @@ public class AbstractFieldCommitWithInvalidValues extends TestBase {
@Override
protected void setup() {
- tf = new LegacyTextField("A field, must contain 1-2 chars",
+ tf = new TextField("A field, must contain 1-2 chars",
new ObjectProperty<String>("a"));
tf.addValidator(
- new LegacyStringLengthValidator("Invalid length", 1, 2, false));
+ new StringLengthValidator("Invalid length", 1, 2, false));
tf.setBuffered(true);
tf.setRequired(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
index 36b9476a38..27f15cee3f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.abstractfield;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component.Event;
import com.vaadin.ui.Component.Listener;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.TextField;
public class AbstractFieldDataSourceReadOnly extends TestBase {
@@ -41,7 +41,7 @@ public class AbstractFieldDataSourceReadOnly extends TestBase {
});
// Input field
- LegacyTextField input = new LegacyTextField("Field");
+ TextField input = new TextField("Field");
input.setPropertyDataSource(stateHolder.getTextField());
addComponent(button);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
index 1c0f29f381..a3595b36b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBackedByString.java
@@ -1,6 +1,6 @@
package com.vaadin.tests.components.abstractfield;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.DateField;
public class DateFieldBackedByString extends AbstractComponentDataBindingTest {
@@ -8,10 +8,10 @@ public class DateFieldBackedByString extends AbstractComponentDataBindingTest {
@Override
protected void createFields() {
- LegacyDateField df = new LegacyDateField("Date field");
+ DateField df = new DateField("Date field");
addComponent(df);
df.setPropertyDataSource(
- new com.vaadin.data.util.ObjectProperty<String>(s,
+ new com.vaadin.v7.data.util.ObjectProperty<String>(s,
String.class));
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
index 63e2c67516..b4a2906576 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.abstractfield;
import java.util.Date;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.PopupDateField;
public class DateFieldBasedOnLong extends AbstractComponentDataBindingTest {
@@ -14,7 +14,7 @@ public class DateFieldBasedOnLong extends AbstractComponentDataBindingTest {
@Override
protected void createFields() {
- LegacyPopupDateField pdf = new LegacyPopupDateField("DateField");
+ PopupDateField pdf = new PopupDateField("DateField");
addComponent(pdf);
property = new ObjectProperty<Long>(l, Long.class);
pdf.setPropertyDataSource(property);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
index 675e170e59..11a8dccfb0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/DoubleInTextField.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.abstractfield;
-import com.vaadin.data.util.MethodProperty;
import com.vaadin.tests.data.bean.Address;
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.ui.LegacyTextField;
+import com.vaadin.v7.data.util.MethodProperty;
+import com.vaadin.v7.ui.TextField;
public class DoubleInTextField extends AbstractComponentDataBindingTest {
@@ -15,13 +15,13 @@ public class DoubleInTextField extends AbstractComponentDataBindingTest {
new Address("Dovestreet 12", 12233, "Johnston",
Country.SOUTH_AFRICA));
- LegacyTextField salary = new LegacyTextField(
+ TextField salary = new TextField(
"Vaadin 7 - TextField with Double");
addComponent(salary);
salary.setPropertyDataSource(
new MethodProperty<Double>(person, "salaryDouble"));
- LegacyTextField salary6 = new LegacyTextField(
+ TextField salary6 = new TextField(
"Vaadin 6 - TextField with Double");
addComponent(salary6);
salary6.setPropertyDataSource(
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
index 71937c871e..e5062a65a9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
@@ -6,14 +6,14 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.TextField;
public class FieldFocusOnClick extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- addComponent(new LegacyTextField(null, "TextField"));
+ addComponent(new TextField(null, "TextField"));
addComponent(new CheckBox("CheckBox"));
addComponent(
new OptionGroup(null, Arrays.asList("Option 1", "Option 2")));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
index 7676b5a11a..f436c4aca3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.abstractfield;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
-import com.vaadin.v7.data.validator.LegacyDoubleValidator;
-import com.vaadin.v7.data.validator.LegacyIntegerValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.validator.DoubleValidator;
+import com.vaadin.v7.data.validator.IntegerValidator;
+import com.vaadin.v7.ui.TextField;
public class IntegerDoubleFieldsWithDataSource extends TestBase {
@@ -17,19 +17,19 @@ public class IntegerDoubleFieldsWithDataSource extends TestBase {
protected void setup() {
addComponent(log);
- LegacyTextField tf = createIntegerTextField();
- tf.addValidator(new LegacyIntegerValidator("Must be an Integer"));
+ TextField tf = createIntegerTextField();
+ tf.addValidator(new IntegerValidator("Must be an Integer"));
addComponent(tf);
tf = createIntegerTextField();
tf.setCaption("Enter a double");
tf.setPropertyDataSource(new ObjectProperty<Double>(2.1));
- tf.addValidator(new LegacyDoubleValidator("Must be a Double"));
+ tf.addValidator(new DoubleValidator("Must be a Double"));
addComponent(tf);
}
- private LegacyTextField createIntegerTextField() {
- final LegacyTextField tf = new LegacyTextField("Enter an integer");
+ private TextField createIntegerTextField() {
+ final TextField tf = new TextField("Enter an integer");
tf.setPropertyDataSource(new ObjectProperty<Integer>(new Integer(2)));
tf.setImmediate(true);
tf.addListener(new ValueChangeListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
index 5c53177e94..1f81609c19 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.abstractfield;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
public class IntegerFieldWithoutDataSource extends TestBase {
@@ -14,7 +14,7 @@ public class IntegerFieldWithoutDataSource extends TestBase {
protected void setup() {
addComponent(log);
- LegacyTextField tf = createIntegerTextField();
+ TextField tf = createIntegerTextField();
tf.setCaption(tf.getCaption() + "(invalid allowed)");
addComponent(tf);
tf = createIntegerTextField();
@@ -23,8 +23,8 @@ public class IntegerFieldWithoutDataSource extends TestBase {
addComponent(tf);
}
- private LegacyTextField createIntegerTextField() {
- final LegacyTextField tf = new LegacyTextField("Enter an integer");
+ private TextField createIntegerTextField() {
+ final TextField tf = new TextField("Enter an integer");
tf.setConverter(Integer.class);
tf.setImmediate(true);
tf.addListener(new ValueChangeListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
index 65c267b3fb..2262258460 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
@@ -9,16 +9,16 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
-import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.AbstractComponentTest;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.MenuBar.MenuItem;
-import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ReadOnlyStatusChangeEvent;
+import com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractField;
-public abstract class LegacyAbstractFieldTest<T extends LegacyAbstractField>
+public abstract class LegacyAbstractFieldTest<T extends AbstractField>
extends AbstractComponentTest<T>
implements ValueChangeListener, ReadOnlyStatusChangeListener {
@@ -53,7 +53,7 @@ public abstract class LegacyAbstractFieldTest<T extends LegacyAbstractField>
protected void populateSettingsMenu(MenuItem settingsMenu) {
super.populateSettingsMenu(settingsMenu);
- if (LegacyAbstractField.class.isAssignableFrom(getTestClass())) {
+ if (AbstractField.class.isAssignableFrom(getTestClass())) {
MenuItem abstractField = settingsMenu.addItem("LegacyAbstractField",
null);
abstractField.addItem("Show value", new MenuBar.Command() {
@@ -141,7 +141,7 @@ public abstract class LegacyAbstractFieldTest<T extends LegacyAbstractField>
};
@Override
- public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) {
+ public void valueChange(com.vaadin.v7.data.Property.ValueChangeEvent event) {
log(event.getClass().getSimpleName() + ", new value: "
+ getValue(event.getProperty()));
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
index f8031c4d65..71ed46eb66 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
@@ -6,10 +6,10 @@ import java.util.List;
import com.vaadin.event.FieldEvents.TextChangeEvent;
import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.v7.ui.LegacyAbstractTextField;
-import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.AbstractTextField;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
-public abstract class LegacyAbstractTextFieldTest<T extends LegacyAbstractTextField>
+public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField>
extends LegacyAbstractFieldTest<T> implements TextChangeListener {
private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() {
@@ -211,7 +211,7 @@ public abstract class LegacyAbstractTextFieldTest<T extends LegacyAbstractTextFi
}
private void createTextChangeEventModeAction(String category) {
- LinkedHashMap<String, TextChangeEventMode> options = new LinkedHashMap<String, LegacyAbstractTextField.TextChangeEventMode>();
+ LinkedHashMap<String, TextChangeEventMode> options = new LinkedHashMap<String, AbstractTextField.TextChangeEventMode>();
for (TextChangeEventMode m : TextChangeEventMode.values()) {
options.put(m.toString(), m);
}
@@ -245,7 +245,7 @@ public abstract class LegacyAbstractTextFieldTest<T extends LegacyAbstractTextFi
@Override
public void textChange(TextChangeEvent event) {
- LegacyAbstractTextField tf = (LegacyAbstractTextField) event
+ AbstractTextField tf = (AbstractTextField) event
.getComponent();
log("TextChangeEvent: text='" + event.getText() + "', cursor position="
+ event.getCursorPosition() + " (field cursor pos: "
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
index f14091b2c7..6cacd68b59 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/RequiredIndicatorForFieldsWithoutCaption.java
@@ -14,11 +14,11 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.TextField;
public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI {
- private Set<LegacyField> fields = new HashSet<LegacyField>();
+ private Set<Field> fields = new HashSet<Field>();
@Override
protected void setup(VaadinRequest request) {
@@ -27,7 +27,7 @@ public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI {
required.setImmediate(true);
required.addValueChangeListener(event -> {
boolean newRequired = event.getValue();
- for (LegacyField f : fields) {
+ for (Field f : fields) {
f.setRequired(newRequired);
}
});
@@ -48,7 +48,7 @@ public class RequiredIndicatorForFieldsWithoutCaption extends AbstractTestUI {
* @return
*/
private Component createWrappedTextField(ComponentContainer container) {
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
tf.setRequired(true);
tf.setWidth(200, Unit.PIXELS);
fields.add(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
index 899d62d72d..1158f677ff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/TextFieldConversions.java
@@ -2,18 +2,18 @@ package com.vaadin.tests.components.abstractfield;
import java.util.Date;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.server.ErrorEvent;
import com.vaadin.server.ErrorHandler;
import com.vaadin.server.UserError;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
public class TextFieldConversions extends AbstractComponentDataBindingTest {
- private LegacyTextField tf;
+ private TextField tf;
private Object o;
@@ -39,7 +39,7 @@ public class TextFieldConversions extends AbstractComponentDataBindingTest {
});
addComponent(dataType);
- tf = new LegacyTextField("TextField");
+ tf = new TextField("TextField");
addComponent(tf);
tf.setErrorHandler(new ErrorHandler() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
index 0fcfa9087f..918459dfde 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java
@@ -2,15 +2,15 @@ package com.vaadin.tests.components.abstractfield;
import java.util.Locale;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.Converter;
public class Vaadin6ImplicitDoubleConverter
- implements LegacyConverter<String, Double> {
+ implements Converter<String, Double> {
@Override
public Double convertToModel(String value,
Class<? extends Double> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
if (null == value) {
return null;
}
@@ -20,7 +20,7 @@ public class Vaadin6ImplicitDoubleConverter
@Override
public String convertToPresentation(Double value,
Class<? extends String> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
if (value == null) {
return null;
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
index f1e1f72bec..01e2d93a96 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Accordion;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.TabSheet.Tab;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class AccordionInactiveTabSize extends TestBase {
@@ -26,10 +26,10 @@ public class AccordionInactiveTabSize extends TestBase {
Accordion acc = new Accordion();
- Tab tab1 = acc.addTab(new LegacyTextField("first field"));
+ Tab tab1 = acc.addTab(new TextField("first field"));
tab1.setCaption("First tab");
- Tab tab2 = acc.addTab(new LegacyTextField("second field"));
+ Tab tab2 = acc.addTab(new TextField("second field"));
tab2.setCaption("Second tab");
acc.setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
index 254779f872..2e5235c78b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerGenerator.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.beanitemcontainer;
import java.util.Date;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.util.PortableRandom;
+import com.vaadin.v7.data.util.BeanItemContainer;
public class BeanItemContainerGenerator {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
index 877f521332..a5b5c14e8f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.beanitemcontainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class BeanItemContainerNullValues extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
index 20becea974..8612e60475 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.beanitemcontainer;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
public class TestBeanItemContainerUsage extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
index 48c12d5047..0b0382dcae 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonTabIndex.java
@@ -18,15 +18,15 @@ package com.vaadin.tests.components.button;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.NativeButton;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class ButtonTabIndex extends TestBase {
@Override
protected void setup() {
- LegacyTextField tf1 = new LegacyTextField("Tab index 0");
+ TextField tf1 = new TextField("Tab index 0");
tf1.setTabIndex(0);
- LegacyTextField tf2 = new LegacyTextField(
+ TextField tf2 = new TextField(
"Tab index -1, focused initially");
tf2.setTabIndex(-1);
tf2.focus();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
index e8a2e10d9a..6864edb916 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonUndefinedWidth.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.button;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
/**
* Test UI for buttons with undefined width.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
index 51fe9cee22..0ca638fa19 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/BeanItemContainerTestUI.java
@@ -19,24 +19,24 @@ import java.util.Arrays;
import java.util.Date;
import java.util.GregorianCalendar;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.Action;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.datefield.Resolution;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.FormLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.Window;
import com.vaadin.ui.Window.CloseEvent;
-import com.vaadin.ui.components.calendar.ContainerEventProvider;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyTextField;
+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.v7.ui.Calendar;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.components.calendar.ContainerEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
public class BeanItemContainerTestUI extends UI {
@@ -135,14 +135,14 @@ public class BeanItemContainerTestUI extends UI {
final FieldGroup fieldGroup = new FieldGroup();
FormLayout formLayout = new FormLayout();
- LegacyTextField captionField = new LegacyTextField("Caption");
+ TextField captionField = new TextField("Caption");
captionField.setImmediate(true);
- LegacyTextField descriptionField = new LegacyTextField("Description");
+ TextField descriptionField = new TextField("Description");
descriptionField.setImmediate(true);
- LegacyDateField startField = new LegacyDateField("Start");
+ DateField startField = new DateField("Start");
startField.setResolution(Resolution.MINUTE);
startField.setImmediate(true);
- LegacyDateField endField = new LegacyDateField("End");
+ DateField endField = new DateField("End");
endField.setImmediate(true);
endField.setResolution(Resolution.MINUTE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
index d846e7c8fb..7218c29248 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionEventSource.java
@@ -25,13 +25,13 @@ import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
import com.vaadin.ui.Label;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
public class CalendarActionEventSource extends AbstractTestUI {
@@ -42,7 +42,7 @@ public class CalendarActionEventSource extends AbstractTestUI {
calendar = new Calendar(new CalendarEventProvider() {
@Override
- public List<com.vaadin.ui.components.calendar.event.CalendarEvent> getEvents(
+ public List<com.vaadin.v7.ui.components.calendar.event.CalendarEvent> getEvents(
Date startDate, Date endDate) {
List<CalendarEvent> events = new ArrayList<CalendarEvent>();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
index c5d415e35c..818eea0680 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsMenuTest.java
@@ -25,17 +25,17 @@ import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
public class CalendarActionsMenuTest extends AbstractTestUI {
@@ -46,7 +46,7 @@ public class CalendarActionsMenuTest extends AbstractTestUI {
calendar = new Calendar(new CalendarEventProvider() {
@Override
- public List<com.vaadin.ui.components.calendar.event.CalendarEvent> getEvents(
+ public List<com.vaadin.v7.ui.components.calendar.event.CalendarEvent> getEvents(
Date startDate, Date endDate) {
List<CalendarEvent> events = new ArrayList<CalendarEvent>();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
index 799ed3c8d3..82c110c21e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarActionsUI.java
@@ -22,11 +22,11 @@ import com.vaadin.event.Action;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI;
-import com.vaadin.ui.components.calendar.CalendarDateRange;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.CalendarDateRange;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
public class CalendarActionsUI extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
index 3558146097..6064413567 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarBackwardForward.java
@@ -22,10 +22,10 @@ import java.util.Locale;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
/**
* Test: Vaadin Calendar: Navigation to invisible days of week (#12243)
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
index 5e2a9a98c5..77167150d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarDragAndDrop.java
@@ -28,13 +28,13 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.Table.TableTransferable;
-import com.vaadin.ui.components.calendar.CalendarTargetDetails;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Table.TableTransferable;
+import com.vaadin.v7.ui.components.calendar.CalendarTargetDetails;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
public class CalendarDragAndDrop extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
index bf149d3286..c3742e2797 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarHtmlInEvents.java
@@ -19,18 +19,18 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
public class CalendarHtmlInEvents extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
index 83903e3192..cc284d6087 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarMonthViewDndEvent.java
@@ -20,14 +20,14 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.BasicEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeListener;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeListener;
/**
* Test UI for DnD regular (not all day event) in month view.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
index a83dada9cd..2ee8288ed3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarNotifications.java
@@ -24,14 +24,14 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
public class CalendarNotifications extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
index b8e1dd4ba5..d1b4a69ecd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarReadOnly.java
@@ -6,10 +6,10 @@ import java.text.SimpleDateFormat;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
@Theme(ValoTheme.THEME_NAME)
public class CalendarReadOnly extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
index 9c3bd886c8..bfb5af8435 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarRescheduleEvent.java
@@ -20,14 +20,14 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.BasicEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeListener;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeListener;
/**
* Test UI to check ability to reschedule events unlimited times.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
index e3cc3a85fd..ef9761afb7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarResizeOverlappingEvents.java
@@ -24,10 +24,10 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
index 59baa24615..b9b856d2c9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarShownNotCorrectlyWhenPartiallyOutOfView.java
@@ -21,10 +21,10 @@ import java.text.SimpleDateFormat;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
index 1acc62a5e7..7989e42597 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTest.java
@@ -24,12 +24,6 @@ import java.util.TimeZone;
import com.vaadin.annotations.Theme;
import com.vaadin.data.Binder;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.shared.ui.combobox.FilteringMode;
@@ -38,33 +32,39 @@ import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.BasicEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.handler.BasicDateClickHandler;
-import com.vaadin.ui.components.calendar.handler.BasicWeekClickHandler;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+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.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.handler.BasicDateClickHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicWeekClickHandler;
/** Calendar component test application */
@Theme("tests-calendar")
@@ -110,7 +110,7 @@ public class CalendarTest extends UI {
private CheckBox readOnlyButton;
private ComboBox customFirstDayOfWeekSelect;
- private LegacyTextField captionField;
+ private TextField captionField;
private Window scheduleEventPopup;
@@ -156,8 +156,8 @@ public class CalendarTest extends UI {
private boolean useSecondResolution;
- private LegacyDateField startDateField;
- private LegacyDateField endDateField;
+ private DateField startDateField;
+ private DateField endDateField;
@SuppressWarnings("serial")
@Override
@@ -504,7 +504,7 @@ public class CalendarTest extends UI {
});
captionField = createTextField("Caption");
- final LegacyTextField whereField = createTextField("Where");
+ final TextField whereField = createTextField("Where");
final TextArea descriptionField = createTextArea("Description");
descriptionField.setRows(3);
@@ -537,8 +537,8 @@ public class CalendarTest extends UI {
return cb;
}
- private LegacyTextField createTextField(String caption) {
- LegacyTextField f = new LegacyTextField(caption);
+ private TextField createTextField(String caption) {
+ TextField f = new TextField(caption);
f.setNullRepresentation("");
return f;
}
@@ -549,8 +549,8 @@ public class CalendarTest extends UI {
return f;
}
- private LegacyDateField createDateField(String caption) {
- LegacyDateField f = new LegacyDateField(caption);
+ private DateField createDateField(String caption) {
+ DateField f = new DateField(caption);
if (useSecondResolution) {
f.setResolution(Resolution.SECOND);
} else {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
index d1bbbf24f0..e0416a14a6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java
@@ -15,12 +15,12 @@
*/
package com.vaadin.tests.components.calendar;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
/**
* Test CalendarEvent implementation.
*
- * @see com.vaadin.addon.calendar.test.ui.Calendar.Event
+ * @see com.vaadin.v7.ui.addon.calendar.test.ui.Calendar.Event
*/
public class CalendarTestEvent extends BasicEvent {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
index 0171c65faa..9e8811f0db 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarVisibleHours.java
@@ -21,10 +21,10 @@ import java.text.SimpleDateFormat;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
index 732899e85e..3ee6cf3a3a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarWeekSelection.java
@@ -6,7 +6,7 @@ import java.util.Locale;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
+import com.vaadin.v7.ui.Calendar;
public class CalendarWeekSelection extends AbstractTestUI {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
index 8178f9a745..93d2374951 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/DndCalendarTargetDetails.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.calendar;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.table.DndTableTargetDetails;
-import com.vaadin.ui.Calendar;
+import com.vaadin.v7.ui.Calendar;
/**
* Test UI for calendar as a drop target: CalendarTargetDetails should provide
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
index bcbee04f4d..37df80ef0f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/HiddenFwdBackButtons.java
@@ -22,11 +22,11 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.UI;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler;
public class HiddenFwdBackButtons extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
index f8f08cde79..8c14211e18 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NotificationTestUI.java
@@ -22,15 +22,15 @@ import java.util.Locale;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Calendar;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Notification;
import com.vaadin.ui.UI;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.event.CalendarEventProvider;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider;
public class NotificationTestUI extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
index 896078d1c9..059b50ede8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/NullEventMoveHandler.java
@@ -6,11 +6,11 @@ import java.util.Locale;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
public class NullEventMoveHandler extends AbstractTestUIWithLog {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
index bf219d3ee9..57bd206641 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDay.java
@@ -22,9 +22,9 @@ import java.util.Locale;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
@Theme("tests-calendar")
public class SetFirstVisibleHourOfDay extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
index 5467fc5b15..cf6d48a88c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/TestHideTimeAndSeparator.java
@@ -6,8 +6,8 @@ import java.util.Locale;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.Calendar;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
@Theme("tests-calendar")
public class TestHideTimeAndSeparator extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java b/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
index 5c954f397d..9b39387539 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/EmptyCaptions.java
@@ -2,42 +2,42 @@ package com.vaadin.tests.components.caption;
import com.vaadin.server.UserError;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class EmptyCaptions extends TestBase {
@Override
protected void setup() {
- LegacyTextField tf;
+ TextField tf;
- tf = new LegacyTextField(null, "Null caption");
+ tf = new TextField(null, "Null caption");
addComponent(tf);
- tf = new LegacyTextField("", "Empty caption");
+ tf = new TextField("", "Empty caption");
addComponent(tf);
- tf = new LegacyTextField(" ", "Space as caption");
+ tf = new TextField(" ", "Space as caption");
addComponent(tf);
- tf = new LegacyTextField(null, "Null caption, required");
+ tf = new TextField(null, "Null caption, required");
tf.setRequired(true);
addComponent(tf);
- tf = new LegacyTextField("", "Empty caption, required");
+ tf = new TextField("", "Empty caption, required");
tf.setRequired(true);
addComponent(tf);
- tf = new LegacyTextField(" ", "Space as caption, required");
+ tf = new TextField(" ", "Space as caption, required");
tf.setRequired(true);
addComponent(tf);
- tf = new LegacyTextField(null, "Null caption, error");
+ tf = new TextField(null, "Null caption, error");
tf.setComponentError(new UserError("error"));
addComponent(tf);
- tf = new LegacyTextField("", "Empty caption, error");
+ tf = new TextField("", "Empty caption, error");
tf.setComponentError(new UserError("error"));
addComponent(tf);
- tf = new LegacyTextField(" ", "Space as caption, error");
+ tf = new TextField(" ", "Space as caption, error");
tf.setComponentError(new UserError("error"));
addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
index 80e010da08..f4cc2e5560 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java
@@ -1,17 +1,17 @@
package com.vaadin.tests.components.caption;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
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;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.Embedded;
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.v7.ui.ComboBox;
public class IconsInCaption extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java
index ab77fbf2ba..14a78fd842 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerHsvTest.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.colorpicker;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.colorpicker.Color;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ColorPickerArea;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ColorPickerArea;
/**
* Tests the HSV tab slider values when initially opening the tab.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
index 9f9164d582..950634039f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java
@@ -31,19 +31,19 @@ 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.AbstractColorPicker;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ColorPicker;
-import com.vaadin.ui.ColorPickerArea;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.components.colorpicker.ColorChangeEvent;
-import com.vaadin.ui.components.colorpicker.ColorChangeListener;
+import com.vaadin.v7.ui.AbstractColorPicker;
+import com.vaadin.v7.ui.ColorPicker;
+import com.vaadin.v7.ui.ColorPickerArea;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeEvent;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeListener;
public class ColorPickerTestUI extends AbstractTestUI
implements ColorChangeListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
index 5117140bfb..5b110f0659 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidth.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ColorPicker;
+import com.vaadin.v7.ui.ColorPicker;
/**
* Test for color picker with default caption.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
index a084d1019d..a2f54de1f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxBorder.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.combobox;
import java.util.Arrays;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.UserError;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxBorder extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
index d91912ba6e..7b47bed2c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxClickIcon.java
@@ -21,7 +21,7 @@ import java.util.List;
import com.vaadin.server.FontAwesome;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
/**
* Test UI to check click on icon in the combobox.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
index f7d12356f7..5e7b5befc5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java
@@ -6,7 +6,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxCombinedWithEnterShortcut extends TestBase {
final String[] cities = new String[] { "Berlin", "Brussels", "Helsinki",
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
index 855bda649c..7baee460c9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxCursorPositionReset.java
@@ -17,9 +17,9 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxCursorPositionReset extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
index 204093bbf4..40bdf0c7a1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java
@@ -1,15 +1,15 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class ComboBoxDataSourceChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java
index bd71850a89..c0316892d9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxDuplicateCaption.java
@@ -3,14 +3,14 @@ package com.vaadin.tests.components.combobox;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.tests.util.Person;
-import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxDuplicateCaption extends TestBase {
@@ -40,7 +40,7 @@ public class ComboBoxDuplicateCaption extends TestBase {
@Override
public void valueChange(
- com.vaadin.data.Property.ValueChangeEvent event) {
+ com.vaadin.v7.data.Property.ValueChangeEvent event) {
Person p = (Person) event.getProperty().getValue();
log.log("Person = " + p.getFirstName() + " " + p.getLastName());
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java
index 2f96724db1..4d5c25597e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigation.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxEmptyItemsKeyboardNavigation extends AbstractTestUI {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
index c5e411678d..16b3c5df5c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxEnablesComboBox extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
index cdae1c8e38..ed915f1a51 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.Log;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxIdenticalItems extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopup.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
index 209a31708c..d09ca0c99d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopup.java
@@ -4,10 +4,10 @@ import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxInPopup extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
index 131ab7effa..ad70412e9f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInPopupView.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.combobox;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.PopupView;
import com.vaadin.ui.PopupView.PopupVisibilityEvent;
import com.vaadin.ui.PopupView.PopupVisibilityListener;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxInPopupView extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
index 81813528ef..5137d8f751 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInputPrompt.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxInputPrompt extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
index 0afa1e887e..b83f295682 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxInvalidNullSelection extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
index da72349e81..c1f151bbf2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListener.java
@@ -20,7 +20,7 @@ import com.vaadin.event.FieldEvents.FocusListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
/**
* Test UI to verify that focus event actually update the ComboBox suggestion
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
index 62ae652dd0..f6fd24f2a4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxItemIcon.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Item;
import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxItemIcon extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
index e119571e20..97d03e3a6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.combobox;
import java.util.Date;
-import com.vaadin.data.Item;
import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxLargeIcons extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
index 8480c3b9ad..812513bcaa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnter.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxMouseSelectEnter extends AbstractTestUI {
protected ComboBox comboBox;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
index 4e4d1a32a4..d872365c58 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxMousewheel.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
/**
* Tests mousewheel handling in ComboBox.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
index 0e355af302..fb7a6a35c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxNavigation.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxNavigation extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
index a284437712..25665d85ab 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreen.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Item;
import com.vaadin.server.ClassResource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.ComboBox;
/**
* Test UI for issue #11929 where ComboBox suggestion popup hides the ComboBox
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
index 6e4546920b..dc8b152185 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPageLength.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxPageLength extends ComboBoxes2<ComboBox> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
index 22f0379343..9910c764ea 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.ComboBox;
/**
* The Application's "main" class
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java
index aaab648c4f..1c9f00fe39 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrolls.java
@@ -17,8 +17,8 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxPopupWhenBodyScrolls extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
index 82cb6b440d..ae74090a27 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java
@@ -1,15 +1,15 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Container;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.LegacyApplication;
import com.vaadin.shared.ui.combobox.FilteringMode;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.LegacyWindow;
@SuppressWarnings("serial")
public class ComboBoxReapperingOldValue extends LegacyApplication
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java
index 7196547861..0336be06ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxResetValue.java
@@ -5,9 +5,9 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxResetValue extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
index 0dabc1a127..a3d804bcf5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSQLContainerFilteredValueChange.java
@@ -4,17 +4,17 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.Filtering;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.ui.AbstractSelect.Filtering;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSQLContainerFilteredValueChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
index 1b0675c914..e1c5c49a57 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabled.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.combobox;
import java.util.ArrayList;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.ComponentTestCase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Notification;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxScrollingToPageDisabled
extends ComponentTestCase<ComboBox> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
index 7fdd0b59df..58c0a3efc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrows.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.AbstractLayout;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ComboBox;
/**
* Test UI verifying navigating in combobox via arrow keys.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
index 2c68f5741e..e9a46cd297 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelecting.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
public class ComboBoxSelecting extends AbstractTestUI {
protected ComboBox comboBox;
@@ -42,7 +42,7 @@ public class ComboBoxSelecting extends AbstractTestUI {
// Had to add an extra text field for our old Firefox browsers, because
// tab will otherwise send the focus to address bar and FF 24 won't fire
// a key event properly. Nice!
- addComponents(comboBox, label, new LegacyTextField());
+ addComponents(comboBox, label, new TextField());
}
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
index 94dd39f4d6..ef07726d17 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowed.java
@@ -15,9 +15,9 @@
*/
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Property;
public class ComboBoxSelectingWithNewItemsAllowed extends ComboBoxSelecting {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
index 445c2fc9b8..80a6a8eac7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowed.java
@@ -15,12 +15,12 @@
*/
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSetNullWhenNewItemsAllowed extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java
index 3668637846..8cf8cb4bfb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlow.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.Log;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
public class ComboBoxSlow extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
index 2efa1c3991..baf8f7487b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class ComboBoxSlowInFF extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
index 800e31c0de..9a87dcda01 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java
@@ -5,9 +5,9 @@ import java.util.Arrays;
import com.vaadin.event.FieldEvents;
import com.vaadin.event.FieldEvents.FocusEvent;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSuggestionOnDetach extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
index 1e9b7cd981..06b97bd7bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java
@@ -21,7 +21,7 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSuggestionPageLength extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java
index 253d6a0d1e..088cf5597e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupClose.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSuggestionPopupClose extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java
index b21a082dcc..ccc589ef31 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidth.java
@@ -5,7 +5,7 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSuggestionPopupWidth extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java
index 2ce4450590..29326bce82 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacy.java
@@ -5,7 +5,7 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSuggestionPopupWidthLegacy extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java
index 5cf736b088..8b1d89d339 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentage.java
@@ -5,7 +5,7 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSuggestionPopupWidthPercentage extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java
index 7ebf149a5c..fa8fd118ae 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixels.java
@@ -5,7 +5,7 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxSuggestionPopupWidthPixels extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
index b882a58354..024a5f0ade 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTabWhenFilter.java
@@ -15,13 +15,13 @@
*/
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Container;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.TextField;
/**
* A test case for typing in combo box input field fast plus then press TAB.
@@ -44,7 +44,7 @@ public class ComboBoxTabWhenFilter extends AbstractTestUI {
comboBox.setNewItemsAllowed(true);
comboBox.setFilteringMode(FilteringMode.CONTAINS);
layout.addComponent(comboBox);
- layout.addComponent(new LegacyTextField());
+ layout.addComponent(new TextField());
}
private IndexedContainer createContainer() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
index 4dbd69f000..01fe899476 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java
@@ -2,17 +2,17 @@ package com.vaadin.tests.components.combobox;
import java.util.Arrays;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Select;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.TextField;
public class ComboBoxTextFieldEventOrder extends TestBase {
@Override
protected void setup() {
- LegacyTextField textField = new LegacyTextField("text field");
+ TextField textField = new TextField("text field");
textField.setImmediate(true);
final Select select = new Select("select",
Arrays.asList("1", "2", "3", "4"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
index 1598a77d66..f4805789e2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Item;
import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxUndefinedWidthAndIcon extends TestBase {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
index 64ed79a54f..4592bbae0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxValueInput extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
index 76ee83384e..a416c2e9c3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxValueUpdate extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java
index c2ee20cf4a..f5ab454737 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboBoxes2.java
@@ -5,8 +5,8 @@ import java.util.LinkedHashMap;
import com.vaadin.server.Resource;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.tests.components.select.AbstractSelectTestCase;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.ComboBox.ItemStyleGenerator;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox.ItemStyleGenerator;
public class ComboBoxes2<T extends ComboBox> extends AbstractSelectTestCase<T> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
index 3fdee9d579..3fbe2d02a7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java
@@ -3,15 +3,15 @@ package com.vaadin.tests.components.combobox;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.event.FieldEvents;
import com.vaadin.event.FieldEvents.BlurEvent;
import com.vaadin.event.FieldEvents.FocusEvent;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
public class ComboFocusBlurEvents extends TestBase {
@@ -51,7 +51,7 @@ public class ComboFocusBlurEvents extends TestBase {
}
});
- LegacyTextField field = new LegacyTextField("Some textfield");
+ TextField field = new TextField("Some textfield");
field.setImmediate(true);
addComponent(field);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
index cf91425ec0..0f0a460bcf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java
@@ -6,17 +6,17 @@ import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.event.FieldEvents;
import com.vaadin.event.FieldEvents.BlurEvent;
import com.vaadin.event.FieldEvents.FocusEvent;
import com.vaadin.server.VaadinSession;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.ProgressIndicator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
public class ComboPushTiming extends TestBase {
@@ -58,7 +58,7 @@ public class ComboPushTiming extends TestBase {
}
});
- LegacyTextField field = new LegacyTextField("Some textfield");
+ TextField field = new TextField("Some textfield");
field.setImmediate(true);
addComponent(field);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
index 66ed6d6da5..c10e1ece64 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPage.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
@SuppressWarnings("serial")
public class ComboSelectedValueBeyondTheFirstDropdownPage
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
index 45d6c0a03d..4c6e4663fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxInPopupViewWithItems.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.components.combobox;
import java.util.Arrays;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.PopupView;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextArea;
public class ComboboxInPopupViewWithItems extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
index d792bb0475..b60a08cd8b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopen.java
@@ -20,12 +20,12 @@ import java.util.ArrayList;
import com.vaadin.server.Page;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.MenuBar.MenuItem;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
+import com.vaadin.v7.ui.ComboBox;
/**
* Test UI for combobox popup which should be closed on any click outside it.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java
index 9f1c4b9e03..c6753f0b01 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPopupScrolling.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.v7.ui.ComboBox;
@Theme("valo")
public class ComboboxPopupScrolling extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
index 67f5669d8e..f5de8d508d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPrimaryStyleNames.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboboxPrimaryStyleNames extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
index 82c28989f8..d223ed7a28 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidth.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
/**
* Test UI for adding a stylename to a combobox with an undefined width.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
index 3cdbcda3f3..e2da8be910 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/Comboboxes.java
@@ -6,8 +6,8 @@ import java.util.List;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.ComponentTestCase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
+import com.vaadin.v7.ui.ComboBox;
public class Comboboxes extends ComponentTestCase<ComboBox> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
index 7f0816c842..6171dcd331 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboxBoxErrorMessage.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.combobox;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class ComboxBoxErrorMessage extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java
index 02c212a3e1..43d042c578 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/EscapeClosesComboboxNotWindow.java
@@ -4,11 +4,11 @@ import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.ComboBox;
/**
* Ticket #12163: when a combo box popup is open in a subwindow, escape should
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
index c6a50e5db1..5d2ef019f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/FilteringTurkishLocale.java
@@ -18,12 +18,12 @@ package com.vaadin.tests.components.combobox;
import java.util.Arrays;
import java.util.Locale;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
public class FilteringTurkishLocale extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
index c2c3703ee4..a7657e0a13 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.combobox;
import com.vaadin.tests.components.AbstractTestCase;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.LegacyWindow;
@SuppressWarnings("serial")
public class GridLayoutComboBoxZoomOut extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/NewItemsESCPress.java
index 0acb4a3c1d..95af0ad435 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/NewItemsESCPress.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/NewItemsESCPress.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.combobox;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.NewItemHandler;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.AbstractSelect.NewItemHandler;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextArea;
@SuppressWarnings("serial")
public class NewItemsESCPress extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
index d77af57eab..88907504f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/PopUpWidth.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.combobox;
-import com.vaadin.data.Item;
import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.ComboBox;
public class PopUpWidth extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
index 1099d03786..b8609de3e2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java
@@ -4,7 +4,7 @@ import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
@SuppressWarnings("serial")
public class RemovalOfSelectedIcon extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/SlowComboBox.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/SlowComboBox.java
index 2cd715f9fc..eccc4832a6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/SlowComboBox.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/SlowComboBox.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.combobox;
import java.util.Map;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
/**
* A combo box component with delay. Can be useful to use while testing UI.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
index 1b1e256ead..687ef412fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/WidthToggleReadOnly.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.combobox;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class WidthToggleReadOnly extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
index 95664ba7d3..df666e0ad6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.customcomponent;
-import com.vaadin.data.Property.ValueChangeEvent;
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.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.TextField;
public class ClipContent extends TestBase {
@@ -21,18 +21,18 @@ public class ClipContent extends TestBase {
cc.setWidth("20px");
cc.setHeight("20px");
- final LegacyTextField w = new LegacyTextField("Width");
+ final TextField w = new TextField("Width");
w.setValue("20px");
- w.addListener(new LegacyTextField.ValueChangeListener() {
+ w.addListener(new TextField.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
cc.setWidth(w.getValue());
}
});
addComponent(w);
- final LegacyTextField h = new LegacyTextField("Height");
+ final TextField h = new TextField("Height");
h.setValue("20px");
- h.addListener(new LegacyTextField.ValueChangeListener() {
+ h.addListener(new TextField.ValueChangeListener() {
@Override
public void valueChange(ValueChangeEvent event) {
cc.setHeight(h.getValue());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
index bd57a857a1..6a7501006a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutPrimaryStyleName.java
@@ -8,7 +8,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class CustomLayoutPrimaryStyleName extends TestBase {
@@ -19,7 +19,7 @@ public class CustomLayoutPrimaryStyleName extends TestBase {
try {
final CustomLayout cl = new CustomLayout(is);
- cl.addComponent(new LegacyTextField("Hello world"), "loc1");
+ cl.addComponent(new TextField("Hello world"), "loc1");
cl.setPrimaryStyleName("my-customlayout");
addComponent(cl);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
index 5d7870f504..77b9b1a2c4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTemplate.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class CustomLayoutUsingTemplate extends TestBase
implements ClickListener {
@@ -61,7 +61,7 @@ public class CustomLayoutUsingTemplate extends TestBase
if (event.getButton() == button1) {
layout.addComponent(button2, "location1");
} else {
- layout.addComponent(new LegacyTextField("A text field!"),
+ layout.addComponent(new TextField("A text field!"),
"location2");
}
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
index f915b68f30..17c65cc471 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUsingTheme.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class CustomLayoutUsingTheme extends TestBase implements ClickListener {
@@ -20,8 +20,8 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener {
setTheme("tests-tickets");
layout = new CustomLayout("Ticket1775");
addComponent(layout);
- layout.addComponent(new LegacyTextField("Username"), "loginUser");
- layout.addComponent(new LegacyTextField("Password"), "loginPassword");
+ layout.addComponent(new TextField("Username"), "loginUser");
+ layout.addComponent(new TextField("Password"), "loginPassword");
layout.addComponent(new Button("Login"), "loginButton");
layout.setWidth(null);
@@ -58,7 +58,7 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener {
@Override
public void buttonClick(ClickEvent event) {
- layout.addComponent(new LegacyTextField("A text field!"), "location2");
+ layout.addComponent(new TextField("A text field!"), "location2");
}
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
index c59efc951b..8cc2bab5ba 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutWithMissingSlot.java
@@ -24,7 +24,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
@@ -35,7 +35,7 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
cl = new CustomLayout(new ByteArrayInputStream(
"<div>First: <div location='first'></div><p>Second: <div location='second'></div><p>"
.getBytes("UTF-8")));
- cl.addComponent(new LegacyTextField("This should be visible"),
+ cl.addComponent(new TextField("This should be visible"),
"first");
Button button = new Button(
"This button is visible, together with one label");
@@ -48,7 +48,7 @@ public class CustomLayoutWithMissingSlot extends AbstractTestUIWithLog {
});
cl.addComponent(button, "second");
cl.addComponent(
- new LegacyTextField("This won't be as the slot is missing"),
+ new TextField("This won't be as the slot is missing"),
"third");
addComponent(cl);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
index 8eee0f03c3..2a231e6534 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormats.java
@@ -7,16 +7,16 @@ import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.shared.ui.datefield.Resolution;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.DateField;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.NativeSelect;
public class CustomDateFormats extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
index ae2c17f536..2b660b8b0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java
@@ -4,9 +4,6 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.shared.ui.datefield.Resolution;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.TestBase;
@@ -15,7 +12,10 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.PopupDateField;
@SuppressWarnings("serial")
public class DateFieldEmptyValid extends TestBase {
@@ -27,7 +27,7 @@ public class DateFieldEmptyValid extends TestBase {
private SimpleDateFormat formatter = new SimpleDateFormat(
"MMMM d, yyyy hh:mm:ss aaa", Locale.US);
- public class MyDateField extends LegacyPopupDateField {
+ public class MyDateField extends PopupDateField {
@Override
public boolean isEmpty() {
return super.isEmpty();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
index 1f5eb4b394..0fbd807d5e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java
@@ -8,7 +8,7 @@ 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.v7.ui.LegacyWindow;
public class DateFieldPopupOffScreen extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
index 17e6d850ff..c6422891fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java
@@ -4,13 +4,13 @@ import java.util.Date;
import java.util.Locale;
import com.vaadin.data.HasValue;
-import com.vaadin.data.util.BeanItem;
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.validator.LegacyRangeValidator;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.validator.RangeValidator;
+import com.vaadin.v7.ui.PopupDateField;
public class DateFieldRangeValidation extends TestBase {
@@ -55,7 +55,7 @@ public class DateFieldRangeValidation extends TestBase {
private Range range = new Range();
- private LegacyPopupDateField actualDateField;
+ private PopupDateField actualDateField;
private HasValue.ValueChangeListener<Boolean> refreshField = event -> actualDateField
.markAsDirty();
@@ -65,7 +65,7 @@ public class DateFieldRangeValidation extends TestBase {
range.setFrom(new Date(2011 - 1900, 12 - 1, 4));
range.setTo(new Date(2011 - 1900, 12 - 1, 15));
- LegacyPopupDateField fromField = createDateField();
+ PopupDateField fromField = createDateField();
fromField.setPropertyDataSource(bi.getItemProperty("from"));
CheckBox fromInclusive = new CheckBoxWithPropertyDataSource(
"From inclusive", bi.getItemProperty("fromInclusive"));
@@ -76,13 +76,13 @@ public class DateFieldRangeValidation extends TestBase {
toInclusive.setImmediate(true);
toInclusive.addValueChangeListener(refreshField);
- LegacyPopupDateField toField = createDateField();
+ PopupDateField toField = createDateField();
toField.setPropertyDataSource(bi.getItemProperty("to"));
actualDateField = createDateField();
actualDateField.setValue(new Date(2011 - 1900, 12 - 1, 1));
actualDateField.addValidator(
- new LegacyRangeValidator<Date>("", Date.class, null, null) {
+ new RangeValidator<Date>("", Date.class, null, null) {
@Override
public boolean isMinValueIncluded() {
return range.isFromInclusive();
@@ -116,8 +116,8 @@ public class DateFieldRangeValidation extends TestBase {
addComponent(actualDateField);
}
- private LegacyPopupDateField createDateField() {
- LegacyPopupDateField df = new LegacyPopupDateField();
+ private PopupDateField createDateField() {
+ PopupDateField df = new PopupDateField();
df.setLocale(new Locale("en", "US"));
df.setResolution(Resolution.DAY);
df.setBuffered(false);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
index 61e0cf2597..d4912b7ebd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldRanges.java
@@ -4,8 +4,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.shared.ui.datefield.Resolution;
@@ -18,8 +16,10 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.InlineDateField;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.NativeSelect;
public class DateFieldRanges extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
index 28e67849e9..ccf50ca77e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTimezone.java
@@ -8,14 +8,14 @@ import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.shared.ui.datefield.Resolution;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.DateField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.ComboBox;
public class DateFieldTimezone extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
index e05e132517..3427701e40 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java
@@ -5,7 +5,7 @@ import java.util.Date;
import com.vaadin.data.Result;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.DateField;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
+import com.vaadin.v7.data.util.converter.Converter;
public class DateFieldUnparsableDate extends TestBase {
@@ -19,7 +19,7 @@ public class DateFieldUnparsableDate extends TestBase {
@Override
protected Result<Date> handleUnparsableDateString(String dateString)
- throws LegacyConverter.ConversionException {
+ throws Converter.ConversionException {
return Result.ok(oldDate);
}
}
@@ -31,7 +31,7 @@ public class DateFieldUnparsableDate extends TestBase {
@Override
protected Result<Date> handleUnparsableDateString(String dateString)
- throws LegacyConverter.ConversionException {
+ throws Converter.ConversionException {
return Result.ok(null);
}
}
@@ -43,7 +43,7 @@ public class DateFieldUnparsableDate extends TestBase {
@Override
protected Result<Date> handleUnparsableDateString(String dateString)
- throws LegacyConverter.ConversionException {
+ throws Converter.ConversionException {
return Result.error("You should not enter invalid dates!");
}
}
@@ -55,7 +55,7 @@ public class DateFieldUnparsableDate extends TestBase {
@Override
protected Result<Date> handleUnparsableDateString(String dateString)
- throws LegacyConverter.ConversionException {
+ throws Converter.ConversionException {
if (dateString != null && dateString.equals("today")) {
return Result.ok(new Date());
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
index daffdf5e05..1b1fcde201 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java
@@ -1,17 +1,17 @@
package com.vaadin.tests.components.datefield;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.v7.data.validator.LegacyNullValidator;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.validator.NullValidator;
+import com.vaadin.v7.ui.DateField;
@SuppressWarnings("serial")
public class DefaultHandleUnparsableDateField extends TestBase {
@Override
protected void setup() {
- final LegacyDateField date = new LegacyDateField("Default DateField");
+ final DateField date = new DateField("Default DateField");
date.setImmediate(true);
addComponent(date);
date.addListener(new Property.ValueChangeListener() {
@@ -25,11 +25,11 @@ public class DefaultHandleUnparsableDateField extends TestBase {
}
});
- final LegacyDateField validated = new LegacyDateField(
+ final DateField validated = new DateField(
"Validated Default DateField");
validated.setImmediate(true);
validated.addValidator(
- new LegacyNullValidator("Validator: Date is NULL", false));
+ new NullValidator("Validator: Date is NULL", false));
addComponent(validated);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java
index 1bac7a766e..ff295fcf4c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java
@@ -3,13 +3,13 @@ package com.vaadin.tests.components.datefield;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.DateField;
public class LegacyDateFieldIsValid extends AbstractTestUIWithLog {
@@ -29,7 +29,7 @@ public class LegacyDateFieldIsValid extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyDateField dateField = new LegacyDateField("Insert Date: ");
+ final DateField dateField = new DateField("Insert Date: ");
dateField.setImmediate(true);
dateField.setDateFormat(pattern);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java
index c4651ac0ff..2d0eeeee97 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java
@@ -4,8 +4,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.shared.ui.datefield.Resolution;
@@ -16,10 +14,12 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyInlineDateField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.InlineDateField;
+import com.vaadin.v7.ui.NativeSelect;
public class LegacyDateFieldRanges extends AbstractTestUI {
@@ -30,17 +30,17 @@ public class LegacyDateFieldRanges extends AbstractTestUI {
private Label label = new Label();
private NativeSelect resoSelect = new NativeSelect("Resolution");
- private LegacyDateField fromRange = new LegacyDateField("Range start");
- private LegacyDateField toRange = new LegacyDateField("Range end");
- private LegacyDateField valueDF = new LegacyDateField("Value");
+ private DateField fromRange = new DateField("Range start");
+ private DateField toRange = new DateField("Range end");
+ private DateField valueDF = new DateField("Value");
private CheckBox immediateCB = new CheckBox("Immediate");
private Button recreate = new Button("Recreate static datefields");
private Button clearRangeButton = new Button("Clear range");
private GridLayout currentStaticContainer;
- private LegacyDateField inlineDynamicDateField;
- private LegacyDateField dynamicDateField;
+ private DateField inlineDynamicDateField;
+ private DateField dynamicDateField;
private Calendar createCalendar() {
Calendar c = Calendar.getInstance();
@@ -201,10 +201,10 @@ public class LegacyDateFieldRanges extends AbstractTestUI {
endCal.add(Calendar.DATE, 30);
GridLayout gl = new GridLayout(2, 2);
gl.setSpacing(true);
- LegacyDateField df = createDateField(startCal.getTime(),
+ DateField df = createDateField(startCal.getTime(),
endCal.getTime(), null, Resolution.DAY, false);
gl.addComponent(df);
- LegacyDateField inline = createDateField(startCal.getTime(),
+ DateField inline = createDateField(startCal.getTime(),
endCal.getTime(), null, Resolution.DAY, true);
gl.addComponent(inline);
inline.setId("staticInline");
@@ -213,18 +213,18 @@ public class LegacyDateFieldRanges extends AbstractTestUI {
return gl;
}
- private LegacyDateField createDateField(Date rangeStart, Date rangeEnd,
+ private DateField createDateField(Date rangeStart, Date rangeEnd,
Date value, Resolution resolution, boolean inline) {
- LegacyDateField df = null;
+ DateField df = null;
if (inline) {
- df = new LegacyInlineDateField();
+ df = new InlineDateField();
} else {
- df = new LegacyDateField();
+ df = new DateField();
}
- final LegacyDateField gg = df;
+ final DateField gg = df;
updateValuesForDateField(df);
df.addValueChangeListener(new ValueChangeListener() {
@@ -245,7 +245,7 @@ public class LegacyDateFieldRanges extends AbstractTestUI {
}
- private void updateValuesForDateField(LegacyDateField df) {
+ private void updateValuesForDateField(DateField df) {
Date fromVal = fromRange.getValue();
Date toVal = toRange.getValue();
Date value = valueDF.getValue();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
index 5eb3d5c5b1..7f3b3872dc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java
@@ -9,15 +9,15 @@ import java.util.Locale;
import com.vaadin.shared.ui.datefield.Resolution;
import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.ui.DateField;
-public class LegacyDateFieldTest<T extends LegacyDateField>
+public class LegacyDateFieldTest<T extends DateField>
extends LegacyAbstractFieldTest<T> {
@SuppressWarnings("unchecked")
@Override
protected Class<T> getTestClass() {
- return (Class<T>) LegacyDateField.class;
+ return (Class<T>) DateField.class;
}
private Command<T, Date> setValue = new Command<T, Date>() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java
index f1d16d9cbb..1c011134ab 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.datefield;
-import com.vaadin.v7.ui.LegacyInlineDateField;
+import com.vaadin.v7.ui.InlineDateField;
public class LegacyInlineDateFieldTest
- extends LegacyDateFieldTest<LegacyInlineDateField> {
+ extends LegacyDateFieldTest<InlineDateField> {
@Override
- protected Class<LegacyInlineDateField> getTestClass() {
- return LegacyInlineDateField.class;
+ protected Class<InlineDateField> getTestClass() {
+ return InlineDateField.class;
}
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java
index c7c22c9636..1ce55d97b7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.components.datefield;
import java.util.LinkedHashMap;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.ui.PopupDateField;
public class LegacyPopupDateFieldTest
- extends LegacyDateFieldTest<LegacyPopupDateField> {
+ extends LegacyDateFieldTest<PopupDateField> {
@Override
- protected Class<LegacyPopupDateField> getTestClass() {
- return LegacyPopupDateField.class;
+ protected Class<PopupDateField> getTestClass() {
+ return PopupDateField.class;
}
@Override
@@ -27,10 +27,10 @@ public class LegacyPopupDateFieldTest
options.put("åäöÅÄÖ", "åäöÅÄÖ");
createSelectAction("Input prompt", category, options, "<none>",
- new Command<LegacyPopupDateField, String>() {
+ new Command<PopupDateField, String>() {
@Override
- public void execute(LegacyPopupDateField c, String value,
+ public void execute(PopupDateField c, String value,
Object data) {
c.setInputPrompt(value);
@@ -40,10 +40,10 @@ public class LegacyPopupDateFieldTest
private void createTextEnabledAction(String category) {
this.createBooleanAction("Text field enabled", category, true,
- new Command<LegacyPopupDateField, Boolean>() {
+ new Command<PopupDateField, Boolean>() {
@Override
- public void execute(LegacyPopupDateField c, Boolean value,
+ public void execute(PopupDateField c, Boolean value,
Object data) {
c.setTextFieldEnabled(value);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
index b77b782d2a..ed7573ef3d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/NarrowPopupDateFieldInTable.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.datefield;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.PopupDateField;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class NarrowPopupDateFieldInTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
index 4d8b21166c..a65cf18d01 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java
@@ -22,14 +22,14 @@ package com.vaadin.tests.components.datefield;
import java.util.Arrays;
import java.util.Calendar;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
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.ui.NativeSelect;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.NativeSelect;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
index d2d9d30a5e..327fe33b97 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/RequiredInvalidDateField.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.components.datefield;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.data.Property;
import com.vaadin.v7.data.Validator;
-import com.vaadin.v7.data.validator.LegacyAbstractValidator;
-import com.vaadin.v7.ui.LegacyDateField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.validator.AbstractValidator;
+import com.vaadin.v7.ui.DateField;
public class RequiredInvalidDateField extends TestBase {
@@ -35,7 +35,7 @@ public class RequiredInvalidDateField extends TestBase {
Date date = new Date(2011 - 1900, 9 - 1, 1);
- Validator dateValidator = new LegacyAbstractValidator<Date>(
+ Validator dateValidator = new AbstractValidator<Date>(
"Day of month must be an even number") {
@Override
@@ -55,10 +55,10 @@ public class RequiredInvalidDateField extends TestBase {
// not required
Property<Date> dateProperty1 = new ObjectProperty<Date>(date);
- LegacyDateField dateField1 = new LegacyDateField("Not required",
+ DateField dateField1 = new DateField("Not required",
dateProperty1);
dateField1.setLocale(new Locale("fi", "FI"));
- dateField1.setResolution(LegacyDateField.RESOLUTION_DAY);
+ dateField1.setResolution(DateField.RESOLUTION_DAY);
dateField1.setId("_DF1");
dateField1.setImmediate(true);
dateField1.addValidator(dateValidator);
@@ -66,10 +66,10 @@ public class RequiredInvalidDateField extends TestBase {
// required
Property<Date> dateProperty2 = new ObjectProperty<Date>(date);
- LegacyDateField dateField2 = new LegacyDateField("Required",
+ DateField dateField2 = new DateField("Required",
dateProperty2);
dateField2.setLocale(new Locale("fi", "FI"));
- dateField2.setResolution(LegacyDateField.RESOLUTION_DAY);
+ dateField2.setResolution(DateField.RESOLUTION_DAY);
dateField2.setId("_DF2");
dateField2.setRequired(true);
dateField2.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
index cb52f6a193..45df14eea1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java
@@ -4,16 +4,16 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.ObjectProperty;
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.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyPopupDateField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.PopupDateField;
public class ValueThroughProperty extends TestBase {
private final Property<Date> dateProperty = new ObjectProperty<Date>(null,
@@ -28,10 +28,10 @@ public class ValueThroughProperty extends TestBase {
+ "Using second button updates value correctly on the client-side too.",
ContentMode.XML));
- final LegacyPopupDateField df = new LegacyPopupDateField(dateProperty);
+ final PopupDateField df = new PopupDateField(dateProperty);
df.setLocale(new Locale("en", "US"));
df.setImmediate(true);
- df.setResolution(LegacyDateField.RESOLUTION_DAY);
+ df.setResolution(DateField.RESOLUTION_DAY);
addComponent(df);
Label valueLabel = new Label(df.getPropertyDataSource());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
index 570c8c0732..72d547597d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
@@ -12,8 +12,8 @@ import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
public class DragAndDropDisable extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
index 77f22d6035..fd0c372da7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropFocusObtain.java
@@ -15,8 +15,6 @@
*/
package com.vaadin.tests.components.draganddropwrapper;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.FieldEvents.FocusEvent;
import com.vaadin.event.FieldEvents.FocusListener;
import com.vaadin.event.dd.DragAndDropEvent;
@@ -28,10 +26,12 @@ import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
/**
* Test UI for text area inside {@link DragAndDropWrapper}: text area should
@@ -54,7 +54,7 @@ public class DragAndDropFocusObtain extends AbstractTestUIWithLog {
@Override
public void valueChange(ValueChangeEvent event) {
- LegacyAbstractField f = (LegacyAbstractField) event.getProperty();
+ AbstractField f = (AbstractField) event.getProperty();
log("Value of " + f.getCaption() + " changed to " + f.getValue());
}
};
@@ -101,13 +101,13 @@ public class DragAndDropFocusObtain extends AbstractTestUIWithLog {
area.addFocusListener(focusListener);
dndLayout.addComponent(area);
- LegacyTextField field = new LegacyTextField("Text field 1");
+ TextField field = new TextField("Text field 1");
field.setValue("text");
field.addValueChangeListener(listener);
field.addFocusListener(focusListener);
dndLayout.addComponent(field);
- field = new LegacyTextField("Text field 2");
+ field = new TextField("Text field 2");
field.setValue("text");
field.addValueChangeListener(listener);
field.addFocusListener(focusListener);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
index 149c13856b..6ec06a4b45 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java
@@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TextArea;
/**
* Test UI for text area: drag image should contain text-area text.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java
index 6a680abdf0..6451715017 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperInPanel.java
@@ -23,7 +23,7 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class DragAndDropWrapperInPanel extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
index 37ea2c2109..cbea455833 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/CaptionEnableDisable.java
@@ -4,10 +4,10 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.FormLayout;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
public class CaptionEnableDisable extends AbstractTestUI {
@@ -19,7 +19,7 @@ public class CaptionEnableDisable extends AbstractTestUI {
public FormLayout createFormLayout() {
FormLayout layout = new FormLayout();
- final LegacyTextField textField = new LegacyTextField("TextField");
+ final TextField textField = new TextField("TextField");
textField.setEnabled(false);
layout.addComponent(textField);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
index 7b09f5ece1..aee8d5d4e6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.FormLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class FormLayoutCaptionStyles extends TestBase {
@@ -13,8 +13,8 @@ public class FormLayoutCaptionStyles extends TestBase {
setTheme("reindeer-tests");
FormLayout fl = new FormLayout();
- LegacyTextField f1 = createTextField("Text field 1", "");
- final LegacyTextField f2 = createTextField("Text field 2", "bold");
+ TextField f1 = createTextField("Text field 1", "");
+ final TextField f2 = createTextField("Text field 2", "bold");
fl.addComponent(f1);
fl.addComponent(new Button("Toggle Text field 2 bold style",
@@ -37,8 +37,8 @@ public class FormLayoutCaptionStyles extends TestBase {
}
- private LegacyTextField createTextField(String caption, String style) {
- LegacyTextField tf = new LegacyTextField(caption);
+ private TextField createTextField(String caption, String style) {
+ TextField tf = new TextField(caption);
tf.setStyleName(style);
return tf;
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
index 4c7d95bd19..a72ca04963 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutInVerticalLayout.java
@@ -22,7 +22,7 @@ import com.vaadin.ui.CssLayout;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Test UI for H2 label inside FormLayout.
@@ -42,7 +42,7 @@ public class FormLayoutInVerticalLayout extends AbstractTestUI {
Label sectionLabel = createLabel();
formLayout.addComponent(sectionLabel);
- LegacyTextField nameTextField = new LegacyTextField("Name");
+ TextField nameTextField = new TextField("Name");
nameTextField.setValue("Lorem ipsum");
nameTextField.setWidth("50%");
formLayout.addComponent(nameTextField);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
index 8c7c03b9f8..595cca7089 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutResizing.java
@@ -22,9 +22,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.FormLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class FormLayoutResizing extends AbstractTestUI {
@@ -56,7 +56,7 @@ public class FormLayoutResizing extends AbstractTestUI {
private static FormLayout createForm(String caption, Component table) {
table.setCaption(caption);
- LegacyTextField tf = new LegacyTextField("Text field");
+ TextField tf = new TextField("Text field");
tf.setWidth("100%");
FormLayout form = new FormLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
index 14c5524ce8..9f3cadc995 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/HtmlCaptionInFormLayout.java
@@ -20,16 +20,16 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.FormLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class HtmlCaptionInFormLayout extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField asHtml = new LegacyTextField(
+ final TextField asHtml = new TextField(
"Contains <b>HTML</b>");
asHtml.setCaptionAsHtml(true);
- final LegacyTextField asText = new LegacyTextField(
+ final TextField asText = new TextField(
"Contains <b>HTML</b>");
addComponent(new FormLayout(asHtml, asText));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
index f02a66474b..cbc24bc021 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrolling.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.formlayout;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.FormLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TableInFormLayoutCausesScrolling extends AbstractTestUI {
@@ -15,7 +15,7 @@ public class TableInFormLayoutCausesScrolling extends AbstractTestUI {
addComponent(fl);
for (int i = 20; i-- > 0;) {
- fl.addComponent(new LegacyTextField());
+ fl.addComponent(new TextField());
}
final Table table = new Table();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
index cbddab968c..0c26449208 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/BeanRenderer.java
@@ -16,7 +16,7 @@
package com.vaadin.tests.components.grid;
import com.vaadin.tests.widgetset.client.SimpleTestBean;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
public class BeanRenderer extends AbstractRenderer<SimpleTestBean> {
public BeanRenderer() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
index 35da28944a..ca8a895f92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/CustomRenderer.java
@@ -16,16 +16,16 @@
package com.vaadin.tests.components.grid;
import com.vaadin.annotations.Widgetset;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.widgetset.TestingWidgetSet;
import com.vaadin.tests.widgetset.client.SimpleTestBean;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
@Widgetset(TestingWidgetSet.NAME)
public class CustomRenderer extends AbstractTestUI {
@@ -64,7 +64,7 @@ public class CustomRenderer extends AbstractTestUI {
Label debugLabel = new Label(INIT_DEBUG_LABEL_CAPTION);
debugLabel.setId(DEBUG_LABEL_ID);
- LegacyGrid grid = new LegacyGrid(container);
+ Grid grid = new Grid(container);
grid.getColumn(INT_ARRAY_PROPERTY).setRenderer(new IntArrayRenderer());
grid.getColumn(VOID_PROPERTY)
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
index aa03a9f705..d94969e51e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInit.java
@@ -15,17 +15,17 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
public class GridAddAndRemoveDataOnInit extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid gridAdd = new LegacyGrid();
+ Grid gridAdd = new Grid();
gridAdd.setHeight("240px");
gridAdd.setWidth("140px");
addComponent(gridAdd);
@@ -41,7 +41,7 @@ public class GridAddAndRemoveDataOnInit extends AbstractTestUI {
Object id = dataSource.addItem();
dataSource.getItem(id).getItemProperty("bar").setValue(i);
}
- LegacyGrid gridRemove = new LegacyGrid(dataSource);
+ Grid gridRemove = new Grid(dataSource);
gridRemove.setHeight("150px");
gridRemove.setWidth("140px");
addComponent(gridRemove);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
index 28aa71d048..f1fbedfce6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridAddRow.java
@@ -19,15 +19,15 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridAddRow extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setSelectionMode(SelectionMode.MULTI);
grid.addColumn("firstName");
grid.addColumn("age", Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
index 6a92e37375..650ecb2e78 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCheckBoxDisplay.java
@@ -17,10 +17,10 @@ package com.vaadin.tests.components.grid;
import java.io.Serializable;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
public class GridCheckBoxDisplay extends AbstractTestUI {
@@ -33,14 +33,14 @@ public class GridCheckBoxDisplay extends AbstractTestUI {
todoContainer.addBean(new Todo("Done task", true));
todoContainer.addBean(new Todo("Not done", false));
- LegacyGrid grid = new LegacyGrid(todoContainer);
+ Grid grid = new Grid(todoContainer);
grid.setSizeFull();
grid.setColumnOrder("done", "task");
grid.getColumn("done").setWidth(75);
grid.getColumn("task").setExpandRatio(1);
- grid.setSelectionMode(LegacyGrid.SelectionMode.SINGLE);
+ grid.setSelectionMode(Grid.SelectionMode.SINGLE);
grid.setEditorEnabled(true);
grid.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
index 59b42cb9dc..a09e994a4c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColspans.java
@@ -15,25 +15,25 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.FooterRow;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.renderers.NumberRenderer;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.FooterRow;
+import com.vaadin.v7.ui.Grid.HeaderRow;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.renderers.NumberRenderer;
public class GridColspans extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
Indexed dataSource = new IndexedContainer();
- final LegacyGrid grid;
+ final Grid grid;
dataSource.addContainerProperty("firstName", String.class, "");
dataSource.addContainerProperty("lastName", String.class, "");
@@ -46,7 +46,7 @@ public class GridColspans extends AbstractTestUI {
i.getItemProperty("streetAddress").setValue("Ruukinkatu 2-4");
i.getItemProperty("zipCode").setValue(20540);
i.getItemProperty("city").setValue("Turku");
- grid = new LegacyGrid(dataSource);
+ grid = new Grid(dataSource);
grid.setWidth("600px");
grid.getColumn("zipCode").setRenderer(new NumberRenderer());
grid.setSelectionMode(SelectionMode.MULTI);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
index f7c2a37fd9..62d578d2c4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
@@ -17,9 +17,9 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
public class GridColumnAutoExpand extends AbstractTestUI {
@@ -30,7 +30,7 @@ public class GridColumnAutoExpand extends AbstractTestUI {
layout.setMargin(true);
addComponent(layout);
- LegacyGrid grid = new LegacyGrid("Broken Grid with Caption");
+ Grid grid = new Grid("Broken Grid with Caption");
grid.setWidth("100%");
grid.setHeight("100px");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
index 45cce42c40..cc05a76e8e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnAutoWidth.java
@@ -15,19 +15,19 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Container;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
public class GridColumnAutoWidth extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid(createContainer());
+ Grid grid = new Grid(createContainer());
grid.getColumn("fixed width narrow").setWidth(50);
grid.getColumn("fixed width wide").setWidth(200);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
index 62b266cb9d..3512cdae59 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnExpand.java
@@ -25,13 +25,13 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
@Theme(Reindeer.THEME_NAME)
public class GridColumnExpand extends AbstractTestUI {
- private LegacyGrid grid;
+ private Grid grid;
private Label firstInfo = new Label();
private Label secondInfo = new Label();
private Column firstColumn;
@@ -39,7 +39,7 @@ public class GridColumnExpand extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- grid = new LegacyGrid(PersonContainer.createWithTestData());
+ grid = new Grid(PersonContainer.createWithTestData());
grid.removeAllColumns();
grid.addColumn("address.streetAddress");
grid.addColumn("lastName");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
index d03ac48d16..67790bd392 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculation.java
@@ -18,21 +18,21 @@ package com.vaadin.tests.components.grid;
import java.util.ArrayList;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class GridColumnWidthRecalculation extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("Column 1");
grid.addColumn("Column 2");
@@ -64,7 +64,7 @@ public class GridColumnWidthRecalculation extends AbstractTestUI {
}
@SuppressWarnings("unchecked")
- protected void swapData(LegacyGrid grid) {
+ protected void swapData(Grid grid) {
Indexed dataSource = grid.getContainerDataSource();
Object itemId = dataSource.getItemIds().iterator().next();
Item item = dataSource.getItem(itemId);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
index 8c7c142d5a..f2b4adddde 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutData.java
@@ -17,21 +17,21 @@ package com.vaadin.tests.components.grid;
import java.util.EnumSet;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.NativeSelect;
public class GridColumnWidthsWithoutData extends AbstractTestUI {
private SelectionMode selectionMode = SelectionMode.NONE;
- private LegacyGrid grid = createGrid(true);
+ private Grid grid = createGrid(true);
@Override
protected void setup(VaadinRequest request) {
@@ -82,13 +82,13 @@ public class GridColumnWidthsWithoutData extends AbstractTestUI {
}
- private void replaceGrid(LegacyGrid newGrid) {
+ private void replaceGrid(Grid newGrid) {
((VerticalLayout) grid.getParent()).replaceComponent(grid, newGrid);
grid = newGrid;
}
- private LegacyGrid createGrid(boolean withData) {
- LegacyGrid grid = new LegacyGrid();
+ private Grid createGrid(boolean withData) {
+ Grid grid = new Grid();
grid.addColumn("foo");
grid.addColumn("bar");
grid.setWidth("300px");
@@ -101,7 +101,7 @@ public class GridColumnWidthsWithoutData extends AbstractTestUI {
return grid;
}
- private void addDataToGrid(LegacyGrid grid) {
+ private void addDataToGrid(Grid grid) {
grid.addRow("Some", "Data with more data in one col");
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
index c602111754..aee8da4125 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridCustomSelectionModel.java
@@ -19,7 +19,7 @@ import com.vaadin.annotations.Widgetset;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.widgetset.TestingWidgetSet;
-import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
+import com.vaadin.v7.ui.Grid.MultiSelectionModel;
@Widgetset(TestingWidgetSet.NAME)
public class GridCustomSelectionModel extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
index 095a105c9c..4fa76c6d3d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDataSourceReset.java
@@ -19,20 +19,20 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.fieldgroup.ComplexPerson;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
public class GridDataSourceReset extends AbstractTestUI {
BeanItemContainer<ComplexPerson> container;
List<ComplexPerson> persons;
- LegacyGrid grid;
+ Grid grid;
@Override
protected void setup(VaadinRequest request) {
@@ -40,7 +40,7 @@ public class GridDataSourceReset extends AbstractTestUI {
container = new BeanItemContainer<ComplexPerson>(ComplexPerson.class,
persons);
- grid = new LegacyGrid(container);
+ grid = new Grid(container);
grid.select(container.firstItemId());
addComponent(new Button("Remove first", new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
index dc88bb3b78..ef7c059440 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDefaultSelectionMode.java
@@ -17,14 +17,14 @@ package com.vaadin.tests.components.grid;
import java.util.ArrayList;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
public class GridDefaultSelectionMode extends AbstractTestUI {
@@ -45,7 +45,7 @@ public class GridDefaultSelectionMode extends AbstractTestUI {
final BeanItemContainer<Person> container = new BeanItemContainer<Person>(
Person.class, items);
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setContainerDataSource(container);
VerticalLayout v = new VerticalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
index 338a2f383d..12dc93a1dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsDetach.java
@@ -15,7 +15,6 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.server.VaadinRequest;
@@ -24,15 +23,16 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridDetailsDetach extends AbstractTestUI {
- private LegacyGrid currentGrid;
+ private Grid currentGrid;
@Override
protected void setup(VaadinRequest request) {
@@ -70,14 +70,14 @@ public class GridDetailsDetach extends AbstractTestUI {
addComponent(layout);
}
- private LegacyGrid generateGrid() {
+ private Grid generateGrid() {
BeanItemContainer<GridExampleBean> container = new BeanItemContainer<GridExampleBean>(
GridExampleBean.class);
for (int i = 0; i < 1000; i++) {
container.addItem(new GridExampleBean("Bean " + i, i * i, i / 10d));
}
- final LegacyGrid grid = new LegacyGrid(container);
+ final Grid grid = new Grid(container);
grid.setColumnOrder("name", "amount", "count");
grid.setSizeFull();
grid.setSelectionMode(SelectionMode.NONE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
index 0bf0afd9f7..fadbf05e89 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
@@ -22,9 +22,9 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
/**
* Tests the layouting of Grid's details row when it contains a HorizontalLayout
@@ -37,7 +37,7 @@ public class GridDetailsLayoutExpand extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setSizeFull();
grid.addColumn("name", String.class);
grid.addColumn("born", Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
index a8ede14a24..aac4deedc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLocation.java
@@ -25,14 +25,14 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.TextField;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
+import com.vaadin.v7.ui.Grid.SelectionMode;
@Theme(ValoTheme.THEME_NAME)
public class GridDetailsLocation extends UI {
@@ -51,14 +51,14 @@ public class GridDetailsLocation extends UI {
};
private TextField numberTextField;
- private LegacyGrid grid;
+ private Grid grid;
@Override
protected void init(VaadinRequest request) {
Layout layout = new VerticalLayout();
- grid = new LegacyGrid(PersonContainer.createWithTestData(1000));
+ grid = new Grid(PersonContainer.createWithTestData(1000));
grid.setSelectionMode(SelectionMode.NONE);
layout.addComponent(grid);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
index c4901ba855..5fde4a2226 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsWidth.java
@@ -21,12 +21,12 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
+import com.vaadin.v7.ui.TextArea;
public class GridDetailsWidth extends AbstractTestUI {
@@ -35,7 +35,7 @@ public class GridDetailsWidth extends AbstractTestUI {
final VerticalLayout layout = new VerticalLayout();
layout.setMargin(true);
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
Column column = grid.addColumn("Hello", String.class);
for (int i = 0; i < 3; i++) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDisabledMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDisabledMultiselect.java
index d910b715a8..7fcfcf3373 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDisabledMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDisabledMultiselect.java
@@ -3,22 +3,22 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class GridDisabledMultiselect extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("foo", String.class);
grid.addRow("bar");
- grid.setSelectionMode(LegacyGrid.SelectionMode.SINGLE);
+ grid.setSelectionMode(Grid.SelectionMode.SINGLE);
addComponent(grid);
addButton("Multi", new Button.ClickListener() {
@Override
public void buttonClick(Button.ClickEvent event) {
- grid.setSelectionMode(LegacyGrid.SelectionMode.MULTI);
+ grid.setSelectionMode(Grid.SelectionMode.MULTI);
}
});
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
index 4bf35d465d..eaa2c4fa1d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragAndDrop.java
@@ -20,7 +20,7 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
@SuppressWarnings("serial")
public class GridDragAndDrop extends AbstractTestUI {
@@ -32,7 +32,7 @@ public class GridDragAndDrop extends AbstractTestUI {
"multiple", "columns", "plus", "these", "resemble", "a",
"group", "here", "no", "more");
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
for (String columnId : columnIds) {
grid.addColumn(columnId);
@@ -45,7 +45,7 @@ public class GridDragAndDrop extends AbstractTestUI {
grid.setColumnReorderingAllowed(true);
grid.setFrozenColumnCount(1);
- grid.setSelectionMode(LegacyGrid.SelectionMode.MULTI);
+ grid.setSelectionMode(Grid.SelectionMode.MULTI);
addComponent(grid);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
index 86c868eda7..82dfc6b24e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolled.java
@@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridDragSelectionWhileScrolled extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
index 32f3760059..a689fa9e1a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBars.java
@@ -17,16 +17,16 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridEditingWithNoScrollBars extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.addColumn("foo", String.class);
grid.addColumn("bar", String.class);
for (int i = 0; i < 10; ++i) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
index 000d7917fa..1432af13e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorConverterNotFound.java
@@ -18,7 +18,7 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.ErrorHandler;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class GridEditorConverterNotFound extends AbstractTestUIWithLog {
@@ -28,7 +28,7 @@ public class GridEditorConverterNotFound extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.addColumn("foo", Foo.class);
grid.addRow(new Foo());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
index 40f4b81245..e10e76e78b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorCustomField.java
@@ -19,22 +19,22 @@ import java.util.HashSet;
import java.util.Set;
import com.vaadin.annotations.Theme;
-import com.vaadin.legacy.ui.LegacyCustomField;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.fieldgroup.ComplexPerson;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.CustomField;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class GridEditorCustomField extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new PersonTestGrid(100);
+ Grid grid = new PersonTestGrid(100);
grid.setWidth("800px");
grid.setColumns("firstName", "lastName", "address.city");
grid.setEditorEnabled(true);
@@ -49,7 +49,7 @@ public class GridEditorCustomField extends AbstractTestUIWithLog {
addComponent(grid);
}
- public static class CustomCitySelect extends LegacyCustomField<String> {
+ public static class CustomCitySelect extends CustomField<String> {
private HorizontalLayout fieldLayout;
private String[] values;
private ComboBox cityComboBox;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
index 070b461a84..d502e6ab1f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUI.java
@@ -16,13 +16,13 @@
package com.vaadin.tests.components.grid;
import com.vaadin.tests.util.PersonContainer;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class GridEditorFrozenColumnsUI extends GridEditorUI {
@Override
- protected LegacyGrid createGrid(PersonContainer container) {
- LegacyGrid grid = super.createGrid(container);
+ protected Grid createGrid(PersonContainer container) {
+ Grid grid = super.createGrid(container);
grid.setFrozenColumnCount(2);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorMultiselect.java
index 4a282ed6be..7374596c0b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorMultiselect.java
@@ -2,13 +2,13 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class GridEditorMultiselect extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.addColumn("name");
grid.addColumn("age", Integer.class);
@@ -18,7 +18,7 @@ public class GridEditorMultiselect extends AbstractTestUI {
}
grid.setEditorEnabled(true);
- grid.setSelectionMode(LegacyGrid.SelectionMode.MULTI);
+ grid.setSelectionMode(Grid.SelectionMode.MULTI);
addComponent(grid);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
index 36bcf9ff43..1beb2e242d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridEditorUI.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.PersonContainer;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.v7.ui.LegacyPasswordField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.PasswordField;
+import com.vaadin.v7.ui.TextField;
public class GridEditorUI extends AbstractTestUI {
@@ -31,17 +31,17 @@ public class GridEditorUI extends AbstractTestUI {
addComponent(createGrid(container));
}
- protected LegacyGrid createGrid(PersonContainer container) {
- LegacyGrid grid = new LegacyGrid(container);
+ protected Grid createGrid(PersonContainer container) {
+ Grid grid = new Grid(container);
// Don't use address since there's no converter
grid.removeColumn("address");
grid.setEditorEnabled(true);
- grid.getColumn("firstName").setEditorField(new LegacyPasswordField());
+ grid.getColumn("firstName").setEditorField(new PasswordField());
- LegacyTextField lastNameField = (LegacyTextField) grid
+ TextField lastNameField = (TextField) grid
.getColumn("lastName").getEditorField();
lastNameField.setMaxLength(50);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
index 41dba2f5bd..a8c7009562 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridExtensionCommunication.java
@@ -16,23 +16,23 @@
package com.vaadin.tests.components.grid;
import com.vaadin.annotations.Widgetset;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.MouseEventDetails;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.widgetset.TestingWidgetSet;
import com.vaadin.tests.widgetset.client.grid.GridClickExtensionConnector.GridClickServerRpc;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.AbstractGridExtension;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.AbstractGridExtension;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.SelectionMode;
@Widgetset(TestingWidgetSet.NAME)
public class GridExtensionCommunication extends AbstractTestUIWithLog {
public class GridClickExtension extends AbstractGridExtension {
- public GridClickExtension(LegacyGrid grid) {
+ public GridClickExtension(Grid grid) {
super(grid);
registerRpc(new GridClickServerRpc() {
@@ -60,7 +60,7 @@ public class GridExtensionCommunication extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new PersonTestGrid(50);
+ Grid grid = new PersonTestGrid(50);
grid.setSelectionMode(SelectionMode.NONE);
new GridClickExtension(grid);
addComponent(grid);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
index fe58a15204..a5a41ff690 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridFastAsyncUpdate.java
@@ -8,8 +8,6 @@ import java.util.logging.Level;
import com.vaadin.annotations.Push;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.SelectionEvent;
import com.vaadin.event.SelectionEvent.SelectionListener;
import com.vaadin.server.VaadinRequest;
@@ -17,9 +15,11 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
@Push
@Theme("valo")
@@ -65,7 +65,7 @@ public class GridFastAsyncUpdate extends AbstractTestUI {
private int counter;
- private LegacyGrid grid;
+ private Grid grid;
private IndexedContainer container;
private long loggingStart;
private volatile boolean scrollLock = false;
@@ -126,7 +126,7 @@ public class GridFastAsyncUpdate extends AbstractTestUI {
container.addContainerProperty("level", String.class, null);
container.addContainerProperty("message", String.class, null);
- grid = new LegacyGrid(container);
+ grid = new Grid(container);
grid.setWidth("100%");
grid.setImmediate(true);
grid.setSelectionMode(SelectionMode.SINGLE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
index a552cf2c71..4c0aa04a93 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridGeneratedProperties.java
@@ -15,24 +15,24 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Container.Filterable;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.Item;
import com.vaadin.data.sort.Sort;
import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.GeneratedPropertyContainer;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.data.util.PropertyValueGenerator;
-import com.vaadin.data.util.filter.Compare;
-import com.vaadin.data.util.filter.UnsupportedFilterException;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.data.sort.SortDirection;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Container.Filterable;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.GeneratedPropertyContainer;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.PropertyValueGenerator;
+import com.vaadin.v7.data.util.filter.Compare;
+import com.vaadin.v7.data.util.filter.UnsupportedFilterException;
+import com.vaadin.v7.ui.Grid;
public class GridGeneratedProperties extends AbstractTestUI {
@@ -43,7 +43,7 @@ public class GridGeneratedProperties extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
container = new GeneratedPropertyContainer(createContainer());
- LegacyGrid grid = new LegacyGrid(container);
+ Grid grid = new Grid(container);
addComponent(grid);
container.addGeneratedProperty("miles",
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
index 773f46679f..3c9ff31ab8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFooterComponents.java
@@ -16,30 +16,30 @@
package com.vaadin.tests.components.grid;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.FooterRow;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
import com.vaadin.ui.TextField;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.FooterRow;
+import com.vaadin.v7.ui.Grid.HeaderRow;
@Theme("valo")
public class GridHeaderFooterComponents extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setWidth("800px");
grid.setContainerDataSource(createContainer());
grid.setFooterVisible(true);
final HeaderRow defaultRow = grid.getDefaultHeaderRow();
final HeaderRow toggleVisibilityRow = grid.appendHeaderRow();
- final LegacyGrid.HeaderRow filterRow = grid.appendHeaderRow();
+ final Grid.HeaderRow filterRow = grid.appendHeaderRow();
final FooterRow footerRow = grid.addFooterRowAt(0);
final FooterRow toggleVisibilityFooterRow = grid.addFooterRowAt(0);
@@ -48,8 +48,8 @@ public class GridHeaderFooterComponents extends AbstractTestUIWithLog {
// Set up a filter for all columns
for (final Object pid : grid.getContainerDataSource()
.getContainerPropertyIds()) {
- final LegacyGrid.HeaderCell headerCell = filterRow.getCell(pid);
- final LegacyGrid.FooterCell footerCell = filterFooterRow.getCell(pid);
+ final Grid.HeaderCell headerCell = filterRow.getCell(pid);
+ final Grid.FooterCell footerCell = filterFooterRow.getCell(pid);
headerCell.setComponent(createTextField(pid));
footerCell.setComponent(createTextField(pid));
@@ -86,7 +86,7 @@ public class GridHeaderFooterComponents extends AbstractTestUIWithLog {
filterFooterRow.getCell("string").getComponent().setVisible(false);
}
- private void addRemoveHeaderRow(final LegacyGrid grid, final HeaderRow row) {
+ private void addRemoveHeaderRow(final Grid grid, final HeaderRow row) {
row.getCell("action")
.setComponent(new Button("Remove row", new ClickListener() {
@Override
@@ -97,7 +97,7 @@ public class GridHeaderFooterComponents extends AbstractTestUIWithLog {
}
- private void addRemoveFooterRow(final LegacyGrid grid, final FooterRow row) {
+ private void addRemoveFooterRow(final Grid grid, final FooterRow row) {
row.getCell("action")
.setComponent(new Button("Remove row", new ClickListener() {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
index 3d064ebf29..aa5366d8d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderFormatChange.java
@@ -17,17 +17,17 @@ package com.vaadin.tests.components.grid;
import java.io.Serializable;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.LegacyGrid.SelectionModel;
-import com.vaadin.ui.renderers.NumberRenderer;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.HeaderRow;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.Grid.SelectionModel;
+import com.vaadin.v7.ui.renderers.NumberRenderer;
public class GridHeaderFormatChange extends AbstractTestUI {
@@ -99,12 +99,12 @@ public class GridHeaderFormatChange extends AbstractTestUI {
protected void setup(VaadinRequest request) {
BeanItemContainer<Person> datasource = new BeanItemContainer<Person>(
Person.class);
- final LegacyGrid grid;
+ final Grid grid;
datasource.addItem(new Person("Rudolph", "Reindeer", "Ruukinkatu 2-4",
20540, "Turku"));
- grid = new LegacyGrid(datasource);
+ grid = new Grid(datasource);
grid.setWidth("600px");
grid.getColumn("zipCode").setRenderer(new NumberRenderer());
grid.setColumnOrder("firstName", "lastName", "streetAddress", "zipCode",
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
index d8be65449c..2daa56c6f4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeaderStyleNames.java
@@ -22,12 +22,12 @@ import com.vaadin.tests.components.beanitemcontainer.BeanItemContainerGenerator;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.FooterCell;
-import com.vaadin.ui.LegacyGrid.FooterRow;
-import com.vaadin.ui.LegacyGrid.HeaderCell;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.FooterCell;
+import com.vaadin.v7.ui.Grid.FooterRow;
+import com.vaadin.v7.ui.Grid.HeaderCell;
+import com.vaadin.v7.ui.Grid.HeaderRow;
+import com.vaadin.v7.ui.Grid.SelectionMode;
@Theme("valo")
public class GridHeaderStyleNames extends AbstractTestUIWithLog {
@@ -40,7 +40,7 @@ public class GridHeaderStyleNames extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.setSelectionMode(SelectionMode.MULTI);
grid.setContainerDataSource(
BeanItemContainerGenerator.createContainer(100));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java
index 57d5fa9533..b4452a6f98 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridHeight.java
@@ -19,8 +19,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.server.VaadinRequest;
@@ -30,11 +28,13 @@ import com.vaadin.ui.Alignment;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
+import com.vaadin.v7.ui.OptionGroup;
/**
* Tests that Grid gets correct height based on height mode, and resizes
@@ -53,14 +53,14 @@ public class GridHeight extends AbstractTestUI {
static final String[] gridWidths = { FULL, UNDEFINED };
static final String[] detailsRowHeights = { FULL, UNDEFINED, PX100 };
- private LegacyGrid grid;
+ private Grid grid;
private Map<Object, VerticalLayout> detailsLayouts = new HashMap<Object, VerticalLayout>();
private OptionGroup detailsHeightSelector;
@Override
protected void setup(VaadinRequest request) {
- grid = new LegacyGrid();
+ grid = new Grid();
grid.addColumn("name", String.class);
grid.addColumn("born", Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
index 8f26f91820..ed3b280e88 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInGridLayout.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CssLayout;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Grid;
public class GridInGridLayout extends AbstractTestUI {
@@ -33,10 +33,10 @@ public class GridInGridLayout extends AbstractTestUI {
addComponent(cssLayout);
cssLayout.addComponent(layout);
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setSizeFull();
for (int i = 0; i < 20; i++) {
- LegacyGrid.Column column = grid.addColumn("" + i);
+ Grid.Column column = grid.addColumn("" + i);
column.setHidable(true);
column.setEditable(true);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
index f4186ea32e..185eb14927 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInTabSheet.java
@@ -20,18 +20,18 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.CellReference;
-import com.vaadin.ui.LegacyGrid.CellStyleGenerator;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.CellReference;
+import com.vaadin.v7.ui.Grid.CellStyleGenerator;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridInTabSheet extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
TabSheet sheet = new TabSheet();
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setSelectionMode(SelectionMode.MULTI);
grid.addColumn("count", Integer.class);
for (Integer i = 0; i < 3; ++i) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java
index d1c5bb623a..2187cfa8f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInWindowResize.java
@@ -16,23 +16,23 @@
package com.vaadin.tests.components.grid;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class GridInWindowResize extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid g = new LegacyGrid();
+ Grid g = new Grid();
IndexedContainer cont = new IndexedContainer();
for (int j = 0; j < 3; j++) {
cont.addContainerProperty("" + j, String.class, "");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
index 32bd184ded..2a32f4f09c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumns.java
@@ -18,13 +18,13 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.fieldgroup.ComplexPerson;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class GridInitiallyHiddenColumns extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.setContainerDataSource(ComplexPerson.createContainer(100));
grid.setColumns("firstName", "lastName", "age");
grid.getColumn("firstName").setHidden(true).setHidable(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
index 51477a0634..f01ffb192e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridItemSetChange.java
@@ -15,14 +15,14 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.Person;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
public class GridItemSetChange extends AbstractTestUI {
@@ -46,7 +46,7 @@ public class GridItemSetChange extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
final SneakyBeanContainer c = new SneakyBeanContainer();
- LegacyGrid g = new LegacyGrid(c);
+ Grid g = new Grid(c);
g.setColumns("firstName", "lastName");
addComponent(g);
addComponent(new Button("Reset", new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
index ff69aa3595..4b9c30c09e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridLayoutDetailsRow.java
@@ -22,9 +22,9 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
/**
* Tests that details row displays GridLayout contents properly.
@@ -35,7 +35,7 @@ public class GridLayoutDetailsRow extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setSizeFull();
grid.addColumn("name", String.class);
grid.addColumn("born", Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
index 802acd31ca..148e6fd30f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java
@@ -19,15 +19,15 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.MultiSelectionModel;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridMultiSelectionOnInit extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("foo", String.class);
grid.addRow("Foo 1");
grid.addRow("Foo 2");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
index 08b44b040b..7272e2fcf0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java
@@ -17,13 +17,13 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class GridMultiSelectionScrollBar extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.addColumn("X").setWidth(39.25d);
grid.addColumn("Hello");
grid.addColumn("World");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
index 8bf11bcc7b..f5a1fedd2a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRendererChange.java
@@ -20,17 +20,17 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.renderers.ButtonRenderer;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.TextRenderer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.renderers.ButtonRenderer;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.TextRenderer;
public class GridRendererChange extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setColumns("num", "foo");
grid.getColumn("num").setRenderer(new ButtonRenderer());
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
index 3d1a8a2c7e..c3d70de313 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridReplaceContainer.java
@@ -15,22 +15,22 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Container.Indexed;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.SelectionEvent;
import com.vaadin.event.SelectionEvent.SelectionListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.data.Container.Indexed;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridReplaceContainer extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setSelectionMode(SelectionMode.SINGLE);
grid.setContainerDataSource(createContainer());
grid.addSelectionListener(new SelectionListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
index d35450e889..39b8d46105 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeAndScroll.java
@@ -15,15 +15,15 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.SelectionEvent;
import com.vaadin.event.SelectionEvent.SelectionListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridResizeAndScroll extends AbstractTestUI {
@@ -32,7 +32,7 @@ public class GridResizeAndScroll extends AbstractTestUI {
VerticalLayout content = new VerticalLayout();
addComponent(content);
- final LegacyGrid g = new LegacyGrid();
+ final Grid g = new Grid();
content.setHeight("500px");
content.addComponent(g);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java
index 7a7d01400e..beaa051bb3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeHiddenColumn.java
@@ -18,16 +18,16 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.fieldgroup.ComplexPerson;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.ColumnResizeEvent;
-import com.vaadin.ui.LegacyGrid.ColumnResizeListener;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.ColumnResizeEvent;
+import com.vaadin.v7.ui.Grid.ColumnResizeListener;
@SuppressWarnings("serial")
public class GridResizeHiddenColumn extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.setContainerDataSource(ComplexPerson.createContainer(100));
grid.setColumns("firstName", "lastName", "gender", "birthDate");
grid.getColumn("firstName").setHidable(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
index b97ce60a07..f4b04233b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridResizeTerror.java
@@ -19,14 +19,14 @@ import com.vaadin.annotations.Widgetset;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.util.ResizeTerrorizer;
import com.vaadin.tests.widgetset.TestingWidgetSet;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.UI;
+import com.vaadin.v7.ui.Grid;
@Widgetset(TestingWidgetSet.NAME)
public class GridResizeTerror extends UI {
@Override
protected void init(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
int cols = 10;
Object[] data = new Object[cols];
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java
index 43edaf7aa8..f47052bff8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridRowHeightChange.java
@@ -3,14 +3,14 @@ package com.vaadin.tests.components.grid;
import java.util.Arrays;
import java.util.List;
-import com.vaadin.data.Property;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.grid.HeightMode;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.NativeSelect;
public class GridRowHeightChange extends AbstractTestUI {
@@ -19,7 +19,7 @@ public class GridRowHeightChange extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
// create column and fill rows
grid.addColumn("Header");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
index 6843ce8376..340b7df91d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizing.java
@@ -15,15 +15,15 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.SelectionEvent;
import com.vaadin.event.SelectionEvent.SelectionListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridScrollToLineWhileResizing extends AbstractTestUI {
@@ -44,7 +44,7 @@ public class GridScrollToLineWhileResizing extends AbstractTestUI {
addItem.getItemProperty("column1").setValue("cell" + i);
}
- final LegacyGrid grid = new LegacyGrid(indexedContainer);
+ final Grid grid = new Grid(indexedContainer);
grid.setSizeFull();
grid.setSelectionMode(SelectionMode.SINGLE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
index 28709d1b76..f7dcf61cbe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridScrolling.java
@@ -15,8 +15,6 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.grid.ScrollDestination;
import com.vaadin.tests.components.AbstractTestUI;
@@ -24,13 +22,15 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
@SuppressWarnings("serial")
public class GridScrolling extends AbstractTestUI {
- private LegacyGrid grid;
+ private Grid grid;
private IndexedContainer ds;
@@ -52,7 +52,7 @@ public class GridScrolling extends AbstractTestUI {
}
}
- grid = new LegacyGrid(ds);
+ grid = new Grid(ds);
HorizontalLayout hl = new HorizontalLayout();
hl.addComponent(grid);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSelectAllCell.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSelectAllCell.java
index 7b49fde9b0..21d02e656c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSelectAllCell.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSelectAllCell.java
@@ -3,18 +3,18 @@ package com.vaadin.tests.components.grid;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class GridSelectAllCell extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.addColumn("foo", String.class);
grid.addRow("bar");
- grid.setSelectionMode(LegacyGrid.SelectionMode.MULTI);
+ grid.setSelectionMode(Grid.SelectionMode.MULTI);
addComponent(grid);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java
index 35ea5fef14..01a4ad7532 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSidebarPosition.java
@@ -20,7 +20,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class GridSidebarPosition extends AbstractTestUI {
@@ -35,7 +35,7 @@ public class GridSidebarPosition extends AbstractTestUI {
hl.setSpacing(true);
hl.setHeight("100%");
setContent(hl);
- LegacyGrid grid = new LegacyGrid("Popup window height");
+ Grid grid = new Grid("Popup window height");
grid.setId(POPUP_WINDOW_HEIGHT);
grid.setWidth("100px");
for (int i = 0; i < 30; i++) {
@@ -46,7 +46,7 @@ public class GridSidebarPosition extends AbstractTestUI {
}
hl.addComponent(grid);
- grid = new LegacyGrid("Popup moved up");
+ grid = new Grid("Popup moved up");
grid.setId(POPUP_WINDOW_MOVED_UP);
grid.setWidth("100px");
grid.setHeight("400px");
@@ -56,7 +56,7 @@ public class GridSidebarPosition extends AbstractTestUI {
hl.addComponent(grid);
hl.setComponentAlignment(grid, Alignment.BOTTOM_LEFT);
- grid = new LegacyGrid("Popup above");
+ grid = new Grid("Popup above");
grid.setId(POPUP_ABOVE);
grid.setWidth("100px");
grid.setHeight("200px");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
index d7de9e2ad6..2ed98f0ae4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSingleColumn.java
@@ -15,13 +15,13 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridSingleColumn extends AbstractTestUI {
@@ -36,7 +36,7 @@ public class GridSingleColumn extends AbstractTestUI {
addItem.getItemProperty("column1").setValue("cell");
}
- LegacyGrid grid = new LegacyGrid(indexedContainer);
+ Grid grid = new Grid(indexedContainer);
grid.setSelectionMode(SelectionMode.NONE);
Column column = grid.getColumn("column1");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
index 2964109edc..3559b67970 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSortIndicator.java
@@ -24,7 +24,7 @@ import com.vaadin.event.SortEvent.SortListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.data.sort.SortDirection;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
/*
* Test UI for checking that sort indicators of a Grid are updated when the sort order is changed by a
@@ -34,7 +34,7 @@ public class GridSortIndicator extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid g = getGrid();
+ final Grid g = getGrid();
addComponent(g);
g.addSortListener(new SortListener() {
private SortDirection oldSortDirection = null;
@@ -68,8 +68,8 @@ public class GridSortIndicator extends AbstractTestUI {
});
}
- private final LegacyGrid getGrid() {
- LegacyGrid g = new LegacyGrid();
+ private final Grid getGrid() {
+ Grid g = new Grid();
g.addColumn("Name");
g.addColumn("Value", Integer.class);
g.addRow(new Object[] { "a", 4 });
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
index a675ed6854..a67c923d34 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrapping.java
@@ -18,14 +18,14 @@ package com.vaadin.tests.components.grid;
import java.util.Random;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
@Theme("valo")
public class GridSubPixelProblemWrapping extends AbstractTestUI {
@@ -79,7 +79,7 @@ public class GridSubPixelProblemWrapping extends AbstractTestUI {
addComponent(button);
container = new BeanItemContainer<DataObject>(DataObject.class);
container.addBean(new DataObject("Foo", "Bar"));
- LegacyGrid grid = new LegacyGrid(container);
+ Grid grid = new Grid(container);
grid.getColumn("foo").setWidth(248.525);
grid.setSelectionMode(SelectionMode.SINGLE);
grid.setEditorEnabled(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
index d98796dd43..9ced5d90af 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridSwitchRenderers.java
@@ -4,16 +4,16 @@ import java.util.List;
import java.util.Random;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.TextRenderer;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.TextRenderer;
@SuppressWarnings("serial")
@Theme("valo")
@@ -54,7 +54,7 @@ public class GridSwitchRenderers extends AbstractTestUIWithLog {
item.getItemProperty(getColumnProperty(1)).setReadOnly(true);
}
- final LegacyGrid grid = new LegacyGrid(ds);
+ final Grid grid = new Grid(ds);
grid.setWidth("100%");
grid.getColumn(EXPANSION_COLUMN_ID).setWidth(50);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
index bb1172991f..4b0da38036 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeChange.java
@@ -22,8 +22,8 @@ import com.vaadin.event.SelectionEvent;
import com.vaadin.event.SelectionEvent.SelectionListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class GridThemeChange extends AbstractTestUI {
private final List<String> themes = Arrays.asList("valo", "reindeer",
@@ -31,7 +31,7 @@ public class GridThemeChange extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setSelectionMode(SelectionMode.SINGLE);
grid.addColumn("Theme");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
index 0cc829117b..65c46c1320 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridThemeUI.java
@@ -21,26 +21,26 @@ import java.util.List;
import java.util.Locale;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.fieldgroup.ComplexPerson;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.renderers.DateRenderer;
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.renderers.DateRenderer;
@Theme("valo")
public class GridThemeUI extends AbstractTestUIWithLog {
- private LegacyGrid grid;
+ private Grid grid;
protected static String[] columns = new String[] { "firstName", "lastName",
"gender", "birthDate", "age", "alive", "address.streetAddress",
@@ -82,7 +82,7 @@ public class GridThemeUI extends AbstractTestUIWithLog {
}
- public class Editor extends LegacyGrid {
+ public class Editor extends Grid {
@Override
public String toString() {
return "Editor";
@@ -96,14 +96,14 @@ public class GridThemeUI extends AbstractTestUIWithLog {
getColumn("lastName").setEditable(false);
setSizeFull();
getColumn("age").getEditorField().addValidator(
- new LegacyIntegerRangeValidator("Must be between 0 and 100",
+ new IntegerRangeValidator("Must be between 0 and 100",
0, 100));
getColumn("birthDate").setRenderer(new DateRenderer(
DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US)));
}
}
- public class HeaderFooter extends LegacyGrid {
+ public class HeaderFooter extends Grid {
@Override
public String toString() {
return getClass().getSimpleName();
@@ -136,7 +136,7 @@ public class GridThemeUI extends AbstractTestUIWithLog {
setEditorEnabled(true);
setSizeFull();
getColumn("age").getEditorField().addValidator(
- new LegacyIntegerRangeValidator("Must be between 0 and 100",
+ new IntegerRangeValidator("Must be between 0 and 100",
0, 100));
getColumn("birthDate").setRenderer(new DateRenderer(
DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US)));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
index fed8214049..4d7ec80e20 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWidthIncrease.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class GridWidthIncrease extends AbstractTestUI {
@@ -27,7 +27,7 @@ public class GridWidthIncrease extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
Object[] rowData = new String[COLUMN_COUNT];
for (int i = 0; i < COLUMN_COUNT; ++i) {
grid.addColumn("Column " + i, String.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
index a3e6f1a0e0..5a72daccee 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithBrokenRenderer.java
@@ -20,14 +20,14 @@ import com.vaadin.server.Resource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.integration.FlagSeResource;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.renderers.ImageRenderer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.renderers.ImageRenderer;
public class GridWithBrokenRenderer extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("short", String.class);
grid.addColumn("icon", Resource.class);
grid.addColumn("country", String.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
index 85830f0368..22d8cf5097 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java
@@ -20,14 +20,14 @@ import java.util.Collection;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.v7.data.Validator;
import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Grid;
public class GridWithLabelEditor extends AbstractTestUI {
- public class LabelEditor extends Label implements LegacyField<String> {
+ public class LabelEditor extends Label implements Field<String> {
@Override
public void focus() {
@@ -141,7 +141,7 @@ public class GridWithLabelEditor extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
addComponent(grid);
grid.setEditorEnabled(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
index 3f7249d00f..283989e0b7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithoutRenderer.java
@@ -19,14 +19,14 @@ import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.PersonContainer;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class GridWithoutRenderer extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.setContainerDataSource(PersonContainer.createWithTestData());
addComponent(grid);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java b/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
index 37302d73c1..fe57d0dbbe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/InitialFrozenColumns.java
@@ -17,14 +17,14 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class InitialFrozenColumns extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.setSelectionMode(SelectionMode.NONE);
grid.addColumn("foo").setWidth(200);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
index 65c9894df1..3b864a786e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/IntArrayRenderer.java
@@ -15,7 +15,7 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
public class IntArrayRenderer extends AbstractRenderer<int[]> {
public IntArrayRenderer() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
index 4a92b3d572..628871a824 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptRenderers.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
public class JavaScriptRenderers extends AbstractTestUI {
@@ -66,7 +66,7 @@ public class JavaScriptRenderers extends AbstractTestUI {
item.getItemProperty("string").setValue("string" + i);
}
- LegacyGrid grid = new LegacyGrid(container);
+ Grid grid = new Grid(container);
grid.getColumn("bean").setRenderer(new MyBeanJSRenderer());
grid.getColumn("bean").setWidth(250);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
index 9bcb9d3af7..e0e35f7e7f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/JavaScriptStringRenderer.java
@@ -16,7 +16,7 @@
package com.vaadin.tests.components.grid;
import com.vaadin.annotations.JavaScript;
-import com.vaadin.ui.renderers.AbstractJavaScriptRenderer;
+import com.vaadin.v7.ui.renderers.AbstractJavaScriptRenderer;
@JavaScript("JavaScriptStringRenderer.js")
public class JavaScriptStringRenderer
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
index 494d22e2c5..075d51992f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/MyBeanJSRenderer.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.grid;
import com.vaadin.annotations.JavaScript;
import com.vaadin.tests.components.grid.JavaScriptRenderers.MyBean;
-import com.vaadin.ui.renderers.AbstractJavaScriptRenderer;
+import com.vaadin.v7.ui.renderers.AbstractJavaScriptRenderer;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
index 6f0ac07182..398edfa713 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/NullHeaders.java
@@ -17,13 +17,13 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
public class NullHeaders extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("country", String.class);
grid.addColumn("foo", String.class);
grid.addColumn("bar", Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
index 32934114d2..78fac58fda 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/NullRenderers.java
@@ -18,21 +18,21 @@ package com.vaadin.tests.components.grid;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.Resource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.renderers.ButtonRenderer;
-import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent;
-import com.vaadin.ui.renderers.ClickableRenderer.RendererClickListener;
-import com.vaadin.ui.renderers.DateRenderer;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.ImageRenderer;
-import com.vaadin.ui.renderers.NumberRenderer;
-import com.vaadin.ui.renderers.ProgressBarRenderer;
-import com.vaadin.ui.renderers.TextRenderer;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.renderers.ButtonRenderer;
+import com.vaadin.v7.ui.renderers.ClickableRenderer.RendererClickEvent;
+import com.vaadin.v7.ui.renderers.ClickableRenderer.RendererClickListener;
+import com.vaadin.v7.ui.renderers.DateRenderer;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.ImageRenderer;
+import com.vaadin.v7.ui.renderers.NumberRenderer;
+import com.vaadin.v7.ui.renderers.ProgressBarRenderer;
+import com.vaadin.v7.ui.renderers.TextRenderer;
@SuppressWarnings("all")
public class NullRenderers extends AbstractTestUI {
@@ -56,7 +56,7 @@ public class NullRenderers extends AbstractTestUI {
container.addItem();
- final LegacyGrid gridDefaults = new LegacyGrid(container);
+ final Grid gridDefaults = new Grid(container);
gridDefaults.setId("test-grid-defaults");
gridDefaults.setSelectionMode(SelectionMode.NONE);
@@ -91,7 +91,7 @@ public class NullRenderers extends AbstractTestUI {
addComponent(gridDefaults);
- final LegacyGrid gridNoDefaults = new LegacyGrid(container);
+ final Grid gridNoDefaults = new Grid(container);
gridNoDefaults.setId("test-grid");
gridNoDefaults.setSelectionMode(SelectionMode.NONE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java b/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
index b5b92d5d9e..e5eae89d48 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/PersonTestGrid.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.fieldgroup.ComplexPerson;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Grid;
-public class PersonTestGrid extends LegacyGrid {
+public class PersonTestGrid extends Grid {
public PersonTestGrid(int size) {
BeanItemContainer<ComplexPerson> container = ComplexPerson
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java b/uitest/src/main/java/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java
index 394b66471d..bd0f1ae662 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/ProgrammaticEditorControl.java
@@ -1,25 +1,25 @@
package com.vaadin.tests.components.grid;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
@SuppressWarnings("serial")
// @Push
public class ProgrammaticEditorControl extends AbstractTestUIWithLog {
- private LegacyGrid grid;
+ private Grid grid;
private IndexedContainer container = new IndexedContainer();
@Override
protected void setup(VaadinRequest request) {
container.addContainerProperty("name", String.class, null);
container.addItem("test").getItemProperty("name").setValue("test");
- grid = new LegacyGrid();
+ grid = new Grid();
grid.setContainerDataSource(container);
grid.setEditorEnabled(true);
addComponent(grid);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
index 9958f28517..7aa5fc35fa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/RowAwareRenderer.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.grid;
import com.vaadin.tests.widgetset.client.grid.RowAwareRendererConnector.RowAwareRendererRpc;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid.AbstractRenderer;
+import com.vaadin.v7.ui.Grid.AbstractRenderer;
public class RowAwareRenderer extends AbstractRenderer<Void> {
public RowAwareRenderer(final Label debugLabel) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
index 306907f4c1..a5c7f988cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/SelectDuringInit.java
@@ -17,14 +17,14 @@ package com.vaadin.tests.components.grid;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
public class SelectDuringInit extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.setSelectionMode(SelectionMode.MULTI);
grid.addColumn("value");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
index b7eb564bac..4c711689a5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/SortableHeaderStyles.java
@@ -18,14 +18,14 @@ package com.vaadin.tests.components.grid;
import java.util.Collection;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.PersonContainer;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.OptionGroup;
@Theme("valo")
public class SortableHeaderStyles extends AbstractTestUI {
@@ -45,7 +45,7 @@ public class SortableHeaderStyles extends AbstractTestUI {
sortableSelector.setMultiSelect(true);
sortableSelector.setValue(sortableContainerPropertyIds);
- final LegacyGrid grid = new LegacyGrid(container);
+ final Grid grid = new Grid(container);
sortableSelector.addValueChangeListener(new ValueChangeListener() {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
index 837e18f8f5..476fa98f8b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/WidgetRenderers.java
@@ -15,22 +15,22 @@
*/
package com.vaadin.tests.components.grid;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.renderers.ButtonRenderer;
-import com.vaadin.ui.renderers.ClickableRenderer.RendererClickEvent;
-import com.vaadin.ui.renderers.ClickableRenderer.RendererClickListener;
-import com.vaadin.ui.renderers.ImageRenderer;
-import com.vaadin.ui.renderers.ProgressBarRenderer;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.renderers.ButtonRenderer;
+import com.vaadin.v7.ui.renderers.ClickableRenderer.RendererClickEvent;
+import com.vaadin.v7.ui.renderers.ClickableRenderer.RendererClickListener;
+import com.vaadin.v7.ui.renderers.ImageRenderer;
+import com.vaadin.v7.ui.renderers.ProgressBarRenderer;
@SuppressWarnings("all")
public class WidgetRenderers extends AbstractTestUI {
@@ -57,7 +57,7 @@ public class WidgetRenderers extends AbstractTestUI {
.setValue(new ThemeResource("window/img/close.png"));
item.getItemProperty(PROPERTY_ID).setValue("Click");
- final LegacyGrid grid = new LegacyGrid(container);
+ final Grid grid = new Grid(container);
grid.setId("test-grid");
grid.setSelectionMode(SelectionMode.NONE);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
index 6a2c614d22..844ce73a33 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeatures.java
@@ -28,15 +28,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.Random;
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
import com.vaadin.data.sort.Sort;
import com.vaadin.data.sort.SortOrder;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.event.SelectionEvent;
@@ -53,33 +46,40 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.CellDescriptionGenerator;
-import com.vaadin.ui.LegacyGrid.CellReference;
-import com.vaadin.ui.LegacyGrid.CellStyleGenerator;
-import com.vaadin.ui.LegacyGrid.Column;
-import com.vaadin.ui.LegacyGrid.ColumnReorderEvent;
-import com.vaadin.ui.LegacyGrid.ColumnReorderListener;
-import com.vaadin.ui.LegacyGrid.ColumnResizeEvent;
-import com.vaadin.ui.LegacyGrid.ColumnResizeListener;
-import com.vaadin.ui.LegacyGrid.ColumnVisibilityChangeEvent;
-import com.vaadin.ui.LegacyGrid.ColumnVisibilityChangeListener;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.FooterCell;
-import com.vaadin.ui.LegacyGrid.HeaderCell;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
-import com.vaadin.ui.LegacyGrid.MultiSelectionModel;
-import com.vaadin.ui.LegacyGrid.RowDescriptionGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
-import com.vaadin.ui.LegacyGrid.RowStyleGenerator;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
-import com.vaadin.ui.LegacyGrid.SelectionModel;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.renderers.DateRenderer;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.NumberRenderer;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.CellDescriptionGenerator;
+import com.vaadin.v7.ui.Grid.CellReference;
+import com.vaadin.v7.ui.Grid.CellStyleGenerator;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.ColumnReorderEvent;
+import com.vaadin.v7.ui.Grid.ColumnReorderListener;
+import com.vaadin.v7.ui.Grid.ColumnResizeEvent;
+import com.vaadin.v7.ui.Grid.ColumnResizeListener;
+import com.vaadin.v7.ui.Grid.ColumnVisibilityChangeEvent;
+import com.vaadin.v7.ui.Grid.ColumnVisibilityChangeListener;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.FooterCell;
+import com.vaadin.v7.ui.Grid.HeaderCell;
+import com.vaadin.v7.ui.Grid.HeaderRow;
+import com.vaadin.v7.ui.Grid.MultiSelectionModel;
+import com.vaadin.v7.ui.Grid.RowDescriptionGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
+import com.vaadin.v7.ui.Grid.RowStyleGenerator;
+import com.vaadin.v7.ui.Grid.SelectionMode;
+import com.vaadin.v7.ui.Grid.SelectionModel;
+import com.vaadin.v7.ui.renderers.DateRenderer;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.NumberRenderer;
/**
* Tests the basic features like columns, footers and headers
@@ -87,7 +87,7 @@ import com.vaadin.v7.ui.LegacyField;
* @since
* @author Vaadin Ltd
*/
-public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
+public class GridBasicFeatures extends AbstractComponentTest<Grid> {
public static final String ROW_STYLE_GENERATOR_ROW_NUMBERS_FOR_3_OF_4 = "Row numbers for 3/4";
public static final String ROW_STYLE_GENERATOR_NONE = "None";
@@ -109,7 +109,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
private boolean singleSelectAllowDeselect = true;
private IndexedContainer ds;
- private LegacyGrid grid;
+ private Grid grid;
private SelectionListener selectionListener = new SelectionListener() {
@Override
@@ -247,7 +247,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
@Override
@SuppressWarnings("unchecked")
- protected LegacyGrid constructComponent() {
+ protected Grid constructComponent() {
// Build data source
ds = new IndexedContainer() {
@@ -317,7 +317,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
// Create grid
- LegacyGrid grid = new LegacyGrid(ds);
+ Grid grid = new Grid(ds);
{
int col = grid.getContainerDataSource().getContainerPropertyIds()
@@ -410,9 +410,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
private void addInternalActions() {
createClickAction("Update column order without updating client",
- "Internals", new Command<LegacyGrid, Void>() {
+ "Internals", new Command<Grid, Void>() {
@Override
- public void execute(LegacyGrid grid, Void value, Object data) {
+ public void execute(Grid grid, Void value, Object data) {
List<Column> columns = grid.getColumns();
grid.setColumnOrder(columns.get(1).getPropertyId(),
columns.get(0).getPropertyId());
@@ -423,7 +423,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
private void addFilterActions() {
createBooleanAction("Column 1 starts with \"(23\"", "Filter", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
Filter filter = new Filter() {
@Override
public boolean passesFilter(Object itemId, Item item) {
@@ -438,7 +438,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
};
@Override
- public void execute(LegacyGrid grid, Boolean value, Object data) {
+ public void execute(Grid grid, Boolean value, Object data) {
if (value) {
ds.addContainerFilter(filter);
} else {
@@ -448,7 +448,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
});
createBooleanAction("Impassable filter", "Filter", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
Filter filter = new Filter() {
@Override
public boolean passesFilter(Object itemId, Item item) {
@@ -462,7 +462,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
};
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
if (value) {
ds.addContainerFilter(filter);
} else {
@@ -480,23 +480,23 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
primaryStyleNames.put("my-grid", "my-grid");
createMultiClickAction("Primary style name", "State", primaryStyleNames,
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid grid, String value, Object data) {
+ public void execute(Grid grid, String value, Object data) {
grid.setPrimaryStyleName(value);
}
}, primaryStyleNames.get("v-grid"));
- LinkedHashMap<String, SelectionMode> selectionModes = new LinkedHashMap<String, LegacyGrid.SelectionMode>();
+ LinkedHashMap<String, SelectionMode> selectionModes = new LinkedHashMap<String, Grid.SelectionMode>();
selectionModes.put("single", SelectionMode.SINGLE);
selectionModes.put("multi", SelectionMode.MULTI);
selectionModes.put("none", SelectionMode.NONE);
createSelectAction("Selection mode", "State", selectionModes, "none",
- new Command<LegacyGrid, LegacyGrid.SelectionMode>() {
+ new Command<Grid, Grid.SelectionMode>() {
@Override
- public void execute(LegacyGrid grid, SelectionMode selectionMode,
+ public void execute(Grid grid, SelectionMode selectionMode,
Object data) {
grid.setSelectionMode(selectionMode);
if (selectionMode == SelectionMode.SINGLE) {
@@ -517,9 +517,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
selectionLimits.put("Integer.MAX_VALUE",
Integer.valueOf(Integer.MAX_VALUE));
createSelectAction("Selection limit", "State", selectionLimits, "1000",
- new Command<LegacyGrid, Integer>() {
+ new Command<Grid, Integer>() {
@Override
- public void execute(LegacyGrid grid, Integer limit, Object data) {
+ public void execute(Grid grid, Integer limit, Object data) {
if (!(grid
.getSelectionModel() instanceof MultiSelectionModel)) {
grid.setSelectionMode(SelectionMode.MULTI);
@@ -538,19 +538,19 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
Sort.by(propertyId, SortDirection.DESCENDING).build());
}
createSelectAction("Sort by column", "State", sortableProperties,
- "Column 9, ascending", new Command<LegacyGrid, List<SortOrder>>() {
+ "Column 9, ascending", new Command<Grid, List<SortOrder>>() {
@Override
- public void execute(LegacyGrid grid, List<SortOrder> sortOrder,
+ public void execute(Grid grid, List<SortOrder> sortOrder,
Object data) {
grid.setSortOrder(sortOrder);
}
});
createBooleanAction("Reverse Grid Columns", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
List<Object> ids = new ArrayList<Object>();
ids.addAll(ds.getContainerPropertyIds());
if (!value) {
@@ -647,9 +647,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createSelectAction("Row style generator", "State", rowStyleGenerators,
CELL_STYLE_GENERATOR_NONE,
- new Command<LegacyGrid, RowStyleGenerator>() {
+ new Command<Grid, RowStyleGenerator>() {
@Override
- public void execute(LegacyGrid grid, RowStyleGenerator generator,
+ public void execute(Grid grid, RowStyleGenerator generator,
Object data) {
grid.setRowStyleGenerator(generator);
}
@@ -657,28 +657,28 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createSelectAction("Cell style generator", "State", cellStyleGenerators,
CELL_STYLE_GENERATOR_NONE,
- new Command<LegacyGrid, CellStyleGenerator>() {
+ new Command<Grid, CellStyleGenerator>() {
@Override
- public void execute(LegacyGrid grid, CellStyleGenerator generator,
+ public void execute(Grid grid, CellStyleGenerator generator,
Object data) {
grid.setCellStyleGenerator(generator);
}
});
createBooleanAction("Row description generator", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
c.setRowDescriptionGenerator(
value ? rowDescriptionGenerator : null);
}
});
createBooleanAction("Cell description generator", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
c.setCellDescriptionGenerator(
value ? cellDescriptionGenerator : null);
}
@@ -694,9 +694,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
*/
frozenOptions.put("-1 for unfreezing selection column", -1);
createSelectAction("Frozen column count", "State", frozenOptions, "0",
- new Command<LegacyGrid, Integer>() {
+ new Command<Grid, Integer>() {
@Override
- public void execute(LegacyGrid c, Integer value, Object data) {
+ public void execute(Grid c, Integer value, Object data) {
c.setFrozenColumnCount(value.intValue());
}
});
@@ -708,18 +708,18 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
createSelectAction("Container delay", "State", containerDelayValues,
- "0", new Command<LegacyGrid, Integer>() {
+ "0", new Command<Grid, Integer>() {
@Override
- public void execute(LegacyGrid grid, Integer delay, Object data) {
+ public void execute(Grid grid, Integer delay, Object data) {
containerDelay = delay.intValue();
}
});
createBooleanAction("ItemClickListener", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
if (!value) {
c.removeItemClickListener(itemClickListener);
} else {
@@ -730,10 +730,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
});
createBooleanAction("EditorOpeningItemClickListener", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
if (!value) {
c.removeItemClickListener(
editorOpeningItemClickListener);
@@ -745,11 +745,11 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
});
createBooleanAction("ReactiveValueChanger", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
- LegacyField<?> targetField = grid.getEditorFieldGroup()
+ public void execute(Grid c, Boolean value, Object data) {
+ Field<?> targetField = grid.getEditorFieldGroup()
.getField("Column 0");
if (targetField != null) {
if (!value) {
@@ -764,10 +764,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
});
createBooleanAction("ColumnReorderListener", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid grid, Boolean value, Object data) {
+ public void execute(Grid grid, Boolean value, Object data) {
if (value) {
grid.addColumnReorderListener(
columnReorderListener);
@@ -778,9 +778,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
});
createBooleanAction("ColumnVisibilityChangeListener", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid grid, Boolean value, Object data) {
+ public void execute(Grid grid, Boolean value, Object data) {
if (value) {
grid.addColumnVisibilityChangeListener(
columnVisibilityListener);
@@ -791,9 +791,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
});
createBooleanAction("Single select allow deselect", "State",
- singleSelectAllowDeselect, new Command<LegacyGrid, Boolean>() {
+ singleSelectAllowDeselect, new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
singleSelectAllowDeselect = value.booleanValue();
SelectionModel model = c.getSelectionModel();
@@ -804,17 +804,17 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
});
createBooleanAction("Column Reordering Allowed", "State", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
c.setColumnReorderingAllowed(value);
}
});
- createClickAction("Select all", "State", new Command<LegacyGrid, String>() {
+ createClickAction("Select all", "State", new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
SelectionModel selectionModel = c.getSelectionModel();
if (selectionModel instanceof SelectionModel.Multi) {
((SelectionModel.Multi) selectionModel).selectAll();
@@ -822,9 +822,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
}, null);
- createClickAction("Select none", "State", new Command<LegacyGrid, String>() {
+ createClickAction("Select none", "State", new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
SelectionModel selectionModel = c.getSelectionModel();
if (selectionModel instanceof SelectionModel.Multi) {
((SelectionModel.Multi) selectionModel).deselectAll();
@@ -837,10 +837,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createCategory("Header", null);
createBooleanAction("Visible", "Header", true,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid grid, Boolean value, Object data) {
+ public void execute(Grid grid, Boolean value, Object data) {
grid.setHeaderVisible(value);
}
});
@@ -851,10 +851,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
defaultRows.put("Unset", "Unset");
createMultiClickAction("Default row", "Header", defaultRows,
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid grid, String value, Object data) {
+ public void execute(Grid grid, String value, Object data) {
HeaderRow defaultRow = null;
if (value.equals("Top")) {
defaultRow = grid.getHeaderRow(0);
@@ -867,37 +867,37 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, defaultRows.get("Top"));
- createClickAction("Prepend row", "Header", new Command<LegacyGrid, Object>() {
+ createClickAction("Prepend row", "Header", new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.prependHeaderRow();
}
}, null);
- createClickAction("Append row", "Header", new Command<LegacyGrid, Object>() {
+ createClickAction("Append row", "Header", new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.appendHeaderRow();
}
}, null);
createClickAction("Remove top row", "Header",
- new Command<LegacyGrid, Object>() {
+ new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.removeHeaderRow(0);
}
}, null);
createClickAction("Remove bottom row", "Header",
- new Command<LegacyGrid, Object>() {
+ new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.removeHeaderRow(grid.getHeaderRowCount() - 1);
}
@@ -908,45 +908,45 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createCategory("Footer", null);
createBooleanAction("Visible", "Footer", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid grid, Boolean value, Object data) {
+ public void execute(Grid grid, Boolean value, Object data) {
grid.setFooterVisible(value);
}
});
- createClickAction("Prepend row", "Footer", new Command<LegacyGrid, Object>() {
+ createClickAction("Prepend row", "Footer", new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.prependFooterRow();
}
}, null);
- createClickAction("Append row", "Footer", new Command<LegacyGrid, Object>() {
+ createClickAction("Append row", "Footer", new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.appendFooterRow();
}
}, null);
createClickAction("Remove top row", "Footer",
- new Command<LegacyGrid, Object>() {
+ new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.removeFooterRow(0);
}
}, null);
createClickAction("Remove bottom row", "Footer",
- new Command<LegacyGrid, Object>() {
+ new Command<Grid, Object>() {
@Override
- public void execute(LegacyGrid grid, Object value, Object data) {
+ public void execute(Grid grid, Object value, Object data) {
grid.removeFooterRow(grid.getFooterRowCount() - 1);
}
@@ -961,14 +961,14 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createCategory(getColumnProperty(c), "Columns");
createClickAction("Add / Remove", getColumnProperty(c),
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
boolean wasHidable;
boolean wasHidden;
String wasColumnHidingToggleCaption;
@Override
- public void execute(LegacyGrid grid, String value,
+ public void execute(Grid grid, String value,
Object data) {
String columnProperty = getColumnProperty(
(Integer) data);
@@ -989,10 +989,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
}, null, c);
createClickAction("Move left", getColumnProperty(c),
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid grid, String value,
+ public void execute(Grid grid, String value,
Object data) {
final String columnProperty = getColumnProperty(
(Integer) data);
@@ -1020,10 +1020,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, null, c);
createBooleanAction("Sortable", getColumnProperty(c), true,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid grid, Boolean value,
+ public void execute(Grid grid, Boolean value,
Object columnIndex) {
Object propertyId = getColumnProperty(
(Integer) columnIndex);
@@ -1033,10 +1033,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, c);
createBooleanAction("Resizable", getColumnProperty(c), true,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid grid, Boolean value,
+ public void execute(Grid grid, Boolean value,
Object columnIndex) {
Object propertyId = getColumnProperty(
(Integer) columnIndex);
@@ -1046,28 +1046,28 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, c);
createBooleanAction("Hidable", getColumnProperty(c),
- isColumnHidableByDefault(c), new Command<LegacyGrid, Boolean>() {
+ isColumnHidableByDefault(c), new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean hidable,
+ public void execute(Grid c, Boolean hidable,
Object propertyId) {
grid.getColumn(propertyId).setHidable(hidable);
}
}, getColumnProperty(c));
createBooleanAction("Hidden", getColumnProperty(c),
- isColumnHiddenByDefault(c), new Command<LegacyGrid, Boolean>() {
+ isColumnHiddenByDefault(c), new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean hidden,
+ public void execute(Grid c, Boolean hidden,
Object propertyId) {
grid.getColumn(propertyId).setHidden(hidden);
}
}, getColumnProperty(c));
createClickAction("Change hiding toggle caption",
- getColumnProperty(c), new Command<LegacyGrid, String>() {
+ getColumnProperty(c), new Command<Grid, String>() {
int count = 0;
@Override
- public void execute(LegacyGrid grid, String value,
+ public void execute(Grid grid, String value,
Object data) {
final String columnProperty = getColumnProperty(
(Integer) data);
@@ -1078,11 +1078,11 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, null, c);
createClickAction("Change header caption", getColumnProperty(c),
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
int count = 0;
@Override
- public void execute(LegacyGrid grid, String value,
+ public void execute(Grid grid, String value,
Object data) {
final String columnProperty = getColumnProperty(
(Integer) data);
@@ -1094,10 +1094,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createCategory("Column " + c + " Width", getColumnProperty(c));
createClickAction("Auto", "Column " + c + " Width",
- new Command<LegacyGrid, Integer>() {
+ new Command<Grid, Integer>() {
@Override
- public void execute(LegacyGrid grid, Integer value,
+ public void execute(Grid grid, Integer value,
Object columnIndex) {
Object propertyId = getColumnProperty(
(Integer) columnIndex);
@@ -1107,9 +1107,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, -1, c);
createClickAction("25.5px", "Column " + c + " Width",
- new Command<LegacyGrid, Void>() {
+ new Command<Grid, Void>() {
@Override
- public void execute(LegacyGrid grid, Void value,
+ public void execute(Grid grid, Void value,
Object columnIndex) {
grid.getColumns().get((Integer) columnIndex)
.setWidth(25.5);
@@ -1118,10 +1118,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
for (int w = 50; w < 300; w += 50) {
createClickAction(w + "px", "Column " + c + " Width",
- new Command<LegacyGrid, Integer>() {
+ new Command<Grid, Integer>() {
@Override
- public void execute(LegacyGrid grid, Integer value,
+ public void execute(Grid grid, Integer value,
Object columnIndex) {
Object propertyId = getColumnProperty(
(Integer) columnIndex);
@@ -1137,10 +1137,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
defaultRows.put("Widget Header", GridStaticCellType.WIDGET);
createMultiClickAction("Header Type", getColumnProperty(c),
- defaultRows, new Command<LegacyGrid, GridStaticCellType>() {
+ defaultRows, new Command<Grid, GridStaticCellType>() {
@Override
- public void execute(LegacyGrid grid, GridStaticCellType value,
+ public void execute(Grid grid, GridStaticCellType value,
Object columnIndex) {
final Object propertyId = getColumnProperty(
(Integer) columnIndex);
@@ -1176,10 +1176,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
defaultRows.put("Widget Footer", GridStaticCellType.WIDGET);
createMultiClickAction("Footer Type", getColumnProperty(c),
- defaultRows, new Command<LegacyGrid, GridStaticCellType>() {
+ defaultRows, new Command<Grid, GridStaticCellType>() {
@Override
- public void execute(LegacyGrid grid, GridStaticCellType value,
+ public void execute(Grid grid, GridStaticCellType value,
Object columnIndex) {
final Object propertyId = getColumnProperty(
(Integer) columnIndex);
@@ -1211,10 +1211,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
createClickAction("All columns auto width", "Columns",
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
for (Column col : grid.getColumns()) {
col.setWidthUndefined();
}
@@ -1223,10 +1223,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, null);
createBooleanAction("All columns hidable", "Columns", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
for (Column col : grid.getColumns()) {
col.setHidable(value);
}
@@ -1234,10 +1234,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
});
createBooleanAction("All columns resizable", "Columns", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
for (Column col : grid.getColumns()) {
col.setResizable(value);
}
@@ -1246,10 +1246,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
});
createClickAction("All columns expanding, Col 0 has max width of 30px",
- "Columns", new Command<LegacyGrid, Boolean>() {
+ "Columns", new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
for (Column col : grid.getColumns()) {
col.setWidthUndefined();
}
@@ -1266,11 +1266,11 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createCategory("Properties", null);
createBooleanAction("Prepend property", "Properties", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
private final Object propertyId = new Object();
@Override
- public void execute(LegacyGrid c, Boolean enable, Object data) {
+ public void execute(Grid c, Boolean enable, Object data) {
if (enable.booleanValue()) {
ds.addContainerProperty(propertyId, String.class,
"property value");
@@ -1287,7 +1287,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
protected void createRowActions() {
createCategory("Body rows", null);
- class NewRowCommand implements Command<LegacyGrid, String> {
+ class NewRowCommand implements Command<Grid, String> {
private final int index;
public NewRowCommand() {
@@ -1299,7 +1299,7 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
Item item = ds.addItemAt(index, new Object());
for (int i = 0; i < COLUMNS; i++) {
Class<?> type = ds.getType(getColumnProperty(i));
@@ -1326,9 +1326,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
final NewRowCommand newRowCommand = new NewRowCommand();
createClickAction("Add 18 rows", "Body rows",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
for (int i = 0; i < 18; i++) {
newRowCommand.execute(c, value, data);
}
@@ -1341,18 +1341,18 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
null);
createClickAction("Remove first row", "Body rows",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
Object firstItemId = ds.getIdByIndex(0);
ds.removeItem(firstItemId);
}
}, null);
createClickAction("Remove 18 first rows", "Body rows",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
for (int i = 0; i < 18; i++) {
Object firstItemId = ds.getIdByIndex(0);
ds.removeItem(firstItemId);
@@ -1361,10 +1361,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, null);
createClickAction("Modify first row (getItemProperty)", "Body rows",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@SuppressWarnings("unchecked")
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
Object firstItemId = ds.getIdByIndex(0);
Item item = ds.getItem(firstItemId);
for (int i = 0; i < COLUMNS; i++) {
@@ -1379,10 +1379,10 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, null);
createClickAction("Modify first row (getContainerProperty)",
- "Body rows", new Command<LegacyGrid, String>() {
+ "Body rows", new Command<Grid, String>() {
@SuppressWarnings("unchecked")
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
Object firstItemId = ds.getIdByIndex(0);
for (Object containerPropertyId : ds
.getContainerPropertyIds()) {
@@ -1397,9 +1397,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, null);
createBooleanAction("Select first row", "Body rows", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid grid, Boolean select,
+ public void execute(Grid grid, Boolean select,
Object data) {
final Object firstItemId = grid.getContainerDataSource()
.firstItemId();
@@ -1412,18 +1412,18 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
});
createClickAction("Remove all rows", "Body rows",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@SuppressWarnings("unchecked")
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
ds.removeAllItems();
}
}, null);
createClickAction("Remove selected rows", "Body rows",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
// Usually you'd deselect all the rows before removing
// them. It is done this way to test for #19152
for (Object itemId : c.getSelectedRows()) {
@@ -1436,38 +1436,38 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
protected void createEditorActions() {
createBooleanAction("Enabled", "Editor", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
c.setEditorEnabled(value);
}
});
createBooleanAction("Buffered mode", "Editor", true,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean value, Object data) {
+ public void execute(Grid c, Boolean value, Object data) {
c.setEditorBuffered(value);
}
});
- createClickAction("Edit item 5", "Editor", new Command<LegacyGrid, String>() {
+ createClickAction("Edit item 5", "Editor", new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
c.editItem(5);
}
}, null);
createClickAction("Edit item 100", "Editor",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
c.editItem(100);
}
}, null);
- createClickAction("Save", "Editor", new Command<LegacyGrid, String>() {
+ createClickAction("Save", "Editor", new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
try {
c.saveEditor();
} catch (CommitException e) {
@@ -1476,25 +1476,25 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
}
}, null);
- createClickAction("Cancel edit", "Editor", new Command<LegacyGrid, String>() {
+ createClickAction("Cancel edit", "Editor", new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
c.cancelEditor();
}
}, null);
createClickAction("Change save caption", "Editor",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
c.setEditorSaveCaption("ǝʌɐS");
}
}, null);
createClickAction("Change cancel caption", "Editor",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
c.setEditorCancelCaption("ʃǝɔuɐↃ");
}
}, null);
@@ -1506,9 +1506,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
createCategory("Height by Rows", "Size");
createBooleanAction("HeightMode Row", "Size", false,
- new Command<LegacyGrid, Boolean>() {
+ new Command<Grid, Boolean>() {
@Override
- public void execute(LegacyGrid c, Boolean heightModeByRows,
+ public void execute(Grid c, Boolean heightModeByRows,
Object data) {
c.setHeightMode(heightModeByRows ? HeightMode.ROW
: HeightMode.CSS);
@@ -1524,9 +1524,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
addActionForHeightByRows(i + 2d / 3d);
}
- Command<LegacyGrid, String> sizeCommand = new Command<LegacyGrid, String>() {
+ Command<Grid, String> sizeCommand = new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid grid, String height, Object data) {
+ public void execute(Grid grid, String height, Object data) {
grid.setHeight(height);
}
};
@@ -1544,27 +1544,27 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
private void addActionForHeightByRows(final Double i) {
DecimalFormat df = new DecimalFormat("0.00");
createClickAction(df.format(i) + " rows", "Height by Rows",
- new Command<LegacyGrid, String>() {
+ new Command<Grid, String>() {
@Override
- public void execute(LegacyGrid c, String value, Object data) {
+ public void execute(Grid c, String value, Object data) {
c.setHeightByRows(i);
}
}, null);
}
private void createDetailsActions() {
- Command<LegacyGrid, DetailsGenerator> swapDetailsGenerator = new Command<LegacyGrid, DetailsGenerator>() {
+ Command<Grid, DetailsGenerator> swapDetailsGenerator = new Command<Grid, DetailsGenerator>() {
@Override
- public void execute(LegacyGrid c, DetailsGenerator generator,
+ public void execute(Grid c, DetailsGenerator generator,
Object data) {
grid.setDetailsGenerator(generator);
}
};
- Command<LegacyGrid, Boolean> openOrCloseItemId = new Command<LegacyGrid, Boolean>() {
+ Command<Grid, Boolean> openOrCloseItemId = new Command<Grid, Boolean>() {
@Override
@SuppressWarnings("boxing")
- public void execute(LegacyGrid g, Boolean visible, Object itemId) {
+ public void execute(Grid g, Boolean visible, Object itemId) {
g.setDetailsVisible(itemId, visible);
}
};
@@ -1580,9 +1580,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
persistingDetailsGenerator);
createClickAction("- Change Component", "Generators",
- new Command<LegacyGrid, Void>() {
+ new Command<Grid, Void>() {
@Override
- public void execute(LegacyGrid c, Void value, Object data) {
+ public void execute(Grid c, Void value, Object data) {
for (Object id : detailsMap.keySet()) {
Panel panel = detailsMap.get(id);
Label label = (Label) panel.getContent();
@@ -1596,9 +1596,9 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}, null);
createClickAction("Toggle firstItemId", "Details",
- new Command<LegacyGrid, Void>() {
+ new Command<Grid, Void>() {
@Override
- public void execute(LegacyGrid g, Void value, Object data) {
+ public void execute(Grid g, Void value, Object data) {
Object firstItemId = g.getContainerDataSource()
.firstItemId();
boolean toggle = g.isDetailsVisible(firstItemId);
@@ -1623,8 +1623,8 @@ public class GridBasicFeatures extends AbstractComponentTest<LegacyGrid> {
}
@Override
- protected Class<LegacyGrid> getTestClass() {
- return LegacyGrid.class;
+ protected Class<Grid> getTestClass() {
+ return Grid.class;
}
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
index ef9ed23c31..8dd1b67856 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInit.java
@@ -17,12 +17,12 @@ package com.vaadin.tests.components.grid.basicfeatures;
import com.vaadin.annotations.Theme;
import com.vaadin.annotations.Title;
-import com.vaadin.data.Container;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.grid.HeightMode;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.UI;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.Grid;
@Title("Server Grid height by row on init")
@Theme(ValoTheme.THEME_NAME)
@@ -32,7 +32,7 @@ public class GridHeightByRowOnInit extends UI {
@Override
protected void init(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
Container.Indexed container = grid.getContainerDataSource();
container.addContainerProperty(PROPERTY, String.class, "");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
index f3bcea6c51..6e3559b9aa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/GridSortingIndicators.java
@@ -15,16 +15,16 @@
*/
package com.vaadin.tests.components.grid.basicfeatures;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
import com.vaadin.data.sort.Sort;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.data.sort.SortDirection;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
public class GridSortingIndicators extends AbstractTestUI {
@@ -34,7 +34,7 @@ public class GridSortingIndicators extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid(createContainer());
+ final Grid grid = new Grid(createContainer());
addComponent(grid);
grid.sort(Sort.by("foo").then("bar", SortDirection.DESCENDING)
.then("baz"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
index ecb57f92db..a8c7cb0428 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainer.java
@@ -16,13 +16,13 @@
package com.vaadin.tests.components.grid.basicfeatures.server;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Grid;
/**
* Tests that removing and adding rows doesn't cause an infinite loop in the
@@ -37,7 +37,7 @@ public class GridClearContainer extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
ic = new IndexedContainer();
ic.addContainerProperty("Col 1", String.class, "default");
ic.addItem("Row 1");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
index dec4a761a7..da1e03f15b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCaptionAlignment.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.GridLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class GridLayoutCaptionAlignment extends AbstractTestUI {
@@ -37,7 +37,7 @@ public class GridLayoutCaptionAlignment extends AbstractTestUI {
}
private GridLayout createLayout(Alignment align) {
- LegacyTextField field = new LegacyTextField("Some caption");
+ TextField field = new TextField("Some caption");
GridLayout layout = new GridLayout(3, 3);
layout.setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
index a033023dca..23779a9914 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutRequiredIndicatorLocation.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.Alignment;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Test for grid required indicator location within slots.
@@ -110,7 +110,7 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI {
layout.addComponent(label);
// TODO also test with captions
- LegacyTextField field = new LegacyTextField(
+ TextField field = new TextField(
useCaption ? "caption" : null);
field.setRequired(true);
field.setWidth(width);
@@ -120,7 +120,7 @@ public class GridLayoutRequiredIndicatorLocation extends AbstractTestUI {
private void addLabel(VerticalLayout layout, String width,
Alignment alignment, boolean useCaption) {
- LegacyTextField field = new LegacyTextField(
+ TextField field = new TextField(
useCaption ? "caption" : null);
field.setRequired(true);
field.setWidth(width);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
index 5a1a8e42d8..b1355e8b15 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/UniformGridLayoutUI.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("serial")
public class UniformGridLayoutUI extends UI {
@@ -37,7 +37,7 @@ public class UniformGridLayoutUI extends UI {
grid.addComponent(label1, 0, 0, 10, 0);
grid.setComponentAlignment(label1, Alignment.MIDDLE_LEFT);
- LegacyTextField textField1 = new LegacyTextField();
+ TextField textField1 = new TextField();
textField1.setWidth(100.0F, Unit.PERCENTAGE);
grid.addComponent(textField1, 12, 0, 14, 0);
grid.setComponentAlignment(textField1, Alignment.MIDDLE_LEFT);
@@ -52,7 +52,7 @@ public class UniformGridLayoutUI extends UI {
grid.addComponent(label2, 0, 1, 10, 1);
grid.setComponentAlignment(label2, Alignment.MIDDLE_LEFT);
- LegacyTextField textField2 = new LegacyTextField();
+ TextField textField2 = new TextField();
textField2.setWidth(100.0F, Unit.PERCENTAGE);
grid.addComponent(textField2, 12, 1, 20, 1);
grid.setComponentAlignment(textField2, Alignment.MIDDLE_LEFT);
@@ -67,7 +67,7 @@ public class UniformGridLayoutUI extends UI {
grid.addComponent(label3, 0, 2, 10, 2);
grid.setComponentAlignment(label3, Alignment.MIDDLE_LEFT);
- LegacyTextField textField3 = new LegacyTextField();
+ TextField textField3 = new TextField();
textField3.setWidth(100.0F, Unit.PERCENTAGE);
grid.addComponent(textField3, 12, 2, 29, 2);
grid.setComponentAlignment(textField3, Alignment.MIDDLE_LEFT);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java
index 876d56208b..10bdd40515 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.label;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.util.ObjectProperty;
public class LabelPropertySourceValue extends AbstractTestUI {
private Label label;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
index 5968fccf02..6dbc3398cb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java
@@ -4,10 +4,10 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.AbstractComponentTest;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Property.ValueChangeListener;
public class LabelTest extends AbstractComponentTest<Label>
implements ValueChangeListener {
@@ -93,7 +93,7 @@ public class LabelTest extends AbstractComponentTest<Label>
}
@Override
- public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) {
+ public void valueChange(com.vaadin.v7.data.Property.ValueChangeEvent event) {
Object o = event.getProperty().getValue();
// Distinguish between null and 'null'
diff --git a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
index ce61654d96..270cb93ae9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/layout/EmptySpaceOnPageAfterExpandedComponent.java
@@ -21,9 +21,9 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class EmptySpaceOnPageAfterExpandedComponent extends AbstractTestUI {
@@ -44,7 +44,7 @@ public class EmptySpaceOnPageAfterExpandedComponent extends AbstractTestUI {
GridLayout grid = new GridLayout();
grid.setSpacing(true);
- LegacyTextField text1 = new LegacyTextField();
+ TextField text1 = new TextField();
text1.setCaption("Text1");
text1.setRequired(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java
index 7240037738..dc98df4b92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItems.java
@@ -15,12 +15,12 @@
*/
package com.vaadin.tests.components.listselect;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.ListSelect;
public class ListSelectAddRemoveItems extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
index 4ada4f12ff..ee56f2c5a5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectAllowNewItem.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.listselect;
import java.util.Arrays;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.ListSelect;
public class ListSelectAllowNewItem extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
index 47f6f339ff..9c446befd9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java
@@ -6,10 +6,10 @@ 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.AbstractSelect;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.ListSelect;
public class ListSelectJump extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
index cf7d12781c..98eab80796 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPrimaryStylename.java
@@ -5,7 +5,7 @@ import java.util.Arrays;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.ListSelect;
public class ListSelectPrimaryStylename extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java
index 1df01a4e14..4b80b87877 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChanges.java
@@ -18,14 +18,14 @@ package com.vaadin.tests.components.listselect;
import java.util.Arrays;
import java.util.Collection;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.OptionGroup;
public class ListSelectPushSelectionChanges extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java
index fcd38dfc9c..f42098eb88 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.listselect;
import java.util.LinkedHashMap;
import com.vaadin.tests.components.select.AbstractSelectTestCase;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.ListSelect;
public class ListSelects extends AbstractSelectTestCase<ListSelect> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
index 3a9ce202c7..c65f1a31e5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.loginform;
import com.vaadin.server.LegacyApplication;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.LoginForm;
import com.vaadin.ui.LoginForm.LoginEvent;
import com.vaadin.ui.LoginForm.LoginListener;
+import com.vaadin.v7.ui.LegacyWindow;
@SuppressWarnings("serial")
public class LoginFormWithMultipleWindows extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
index 624c6ee732..c3843bf737 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarInSplitPanel.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.components.menubar;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.MenuBar;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
public class MenuBarInSplitPanel extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
index a6b76eb18f..3e00c78247 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/menubar/MenuBarRunsOutOfBrowser.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.menubar;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Alignment;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
public class MenuBarRunsOutOfBrowser extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectNull.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectNull.java
index fb5914f395..62b6c541fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectNull.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelectNull.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.nativeselect;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.NativeSelect;
public class NativeSelectNull extends AbstractTestUIWithLog {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
index 5a78010d9b..74c1d7c466 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.nativeselect;
import com.vaadin.tests.components.select.AbstractSelectTestCase;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.ui.NativeSelect;
public class NativeSelects extends AbstractSelectTestCase<NativeSelect> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
index 91c886e9ac..2c244377ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/Notifications.java
@@ -5,10 +5,10 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextArea;
public class Notifications extends TestBase implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
index 76ce838571..ba11695c06 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
@@ -7,19 +7,19 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.TextArea;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class NotificationsHtmlAllowed extends TestBase
implements ClickListener {
private TextArea messageField;
private CheckBox htmlAllowedBox;
- private LegacyTextField captionField;
+ private TextField captionField;
@Override
protected void setup() {
- captionField = new LegacyTextField("Caption", "Hello <u>world</u>");
+ captionField = new TextField("Caption", "Hello <u>world</u>");
addComponent(captionField);
captionField.focus();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java
index 0f1e3515df..cc0fcd36b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/notification/NotificationsWaiAria.java
@@ -1,6 +1,5 @@
package com.vaadin.tests.components.notification;
-import com.vaadin.data.Item;
import com.vaadin.server.Page;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.textfield.ValueChangeMode;
@@ -9,14 +8,15 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
import com.vaadin.ui.NotificationConfiguration;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.UI;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextArea;
/**
* Test UI for different roles of Notifications.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
index 0ecf5e6f8d..2cb400670e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java
@@ -5,7 +5,7 @@ import java.util.List;
import com.vaadin.tests.components.ComponentTestCase;
import com.vaadin.ui.Component;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
index 179d1aa5ff..c6c0ac3d90 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java
@@ -5,7 +5,7 @@ import java.util.List;
import com.vaadin.tests.components.ComponentTestCase;
import com.vaadin.ui.Component;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
public class HtmlOptionGroupItems extends ComponentTestCase<OptionGroup> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
index 90bbda9336..aab036753b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.optiongroup;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
public class OptionGroupDisabled extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
index b5267781a2..d430774b91 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.optiongroup;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.OptionGroup;
public class OptionGroupMultipleValueChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
index a6e60b9732..2e5c2e38e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupRetainFocusKeyboardValueChange.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.optiongroup;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.OptionGroup;
/**
* Testcase for #10451
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
index a1c05ad715..ea8893b230 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroups.java
@@ -5,7 +5,7 @@ import java.util.LinkedHashMap;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.select.AbstractSelectTestCase;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
public class OptionGroups extends AbstractSelectTestCase<OptionGroup> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
index 3f321d30f3..8185104ccc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/ReadOnlyOptionGroup.java
@@ -20,7 +20,7 @@ import java.util.Collections;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.OptionGroup;
+import com.vaadin.v7.ui.OptionGroup;
/**
* Test UI for unset read-only flag of Option group with new items allowed.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
index 63322167fc..fe8cafa1a1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java
@@ -5,8 +5,6 @@ import java.util.Arrays;
import com.vaadin.annotations.PreserveOnRefresh;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.LayoutEvents.LayoutClickEvent;
import com.vaadin.event.LayoutEvents.LayoutClickListener;
import com.vaadin.server.ThemeResource;
@@ -24,11 +22,13 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
@Theme("tests-components")
@PreserveOnRefresh
@@ -44,7 +44,7 @@ public class BoxLayoutTest extends AbstractTestUI {
protected NativeSelect componentHeight;
protected NativeSelect componentCaption;
protected NativeSelect componentIcon;
- protected LegacyTextField componentDescription;
+ protected TextField componentDescription;
protected CheckBox componentError;
protected CheckBox componentRequired;
@@ -331,7 +331,7 @@ public class BoxLayoutTest extends AbstractTestUI {
});
component.addComponent(componentIcon);
- componentDescription = new LegacyTextField("Description");
+ componentDescription = new TextField("Description");
componentDescription.setImmediate(true);
componentDescription.setEnabled(false);
componentDescription.addListener(new ValueChangeListener() {
@@ -357,8 +357,8 @@ public class BoxLayoutTest extends AbstractTestUI {
componentRequired.setImmediate(true);
componentRequired.setEnabled(false);
componentRequired.addValueChangeListener(event -> {
- if (target != null && target instanceof LegacyAbstractField) {
- ((LegacyAbstractField<?>) target)
+ if (target != null && target instanceof AbstractField) {
+ ((AbstractField<?>) target)
.setRequired(componentRequired.getValue());
}
});
@@ -404,7 +404,7 @@ public class BoxLayoutTest extends AbstractTestUI {
componentDescription.setEnabled(target != null);
componentError.setEnabled(target != null);
componentRequired.setEnabled(target != null
- && target instanceof LegacyAbstractField);
+ && target instanceof AbstractField);
align.setEnabled(target != null);
expand.setEnabled(target != null);
if (target != null) {
@@ -435,9 +435,9 @@ public class BoxLayoutTest extends AbstractTestUI {
}
componentDescription.setValue(target.getDescription());
componentError.setValue(target.getComponentError() != null);
- if (target instanceof LegacyAbstractField) {
+ if (target instanceof AbstractField) {
componentRequired.setValue(
- ((LegacyAbstractField<?>) target).isRequired());
+ ((AbstractField<?>) target).isRequired());
}
}
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
index cddb5a5ff2..850b6b200a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/CaptionLeak.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.CssLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* HorizontalLayout and VerticalLayout should not leak caption elements via
@@ -55,7 +55,7 @@ public class CaptionLeak extends AbstractTestUI {
try {
ComponentContainer target = targetClass.newInstance();
for (int i = 0; i < 61; i++) {
- target.addComponent(new LegacyTextField("Test"));
+ target.addComponent(new TextField("Test"));
}
parent.setContent(target);
} catch (InstantiationException e) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
index 3889883d67..826b036ba5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ErrorIndicator.java
@@ -23,7 +23,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class ErrorIndicator extends AbstractTestUI {
@@ -37,7 +37,7 @@ public class ErrorIndicator extends AbstractTestUI {
protected void setup(VaadinRequest request) {
VerticalLayout layout = new VerticalLayout();
- LegacyTextField inVertical = new LegacyTextField();
+ TextField inVertical = new TextField();
inVertical.setRequired(true);
inVertical.setRequiredError("Vertical layout tooltip");
inVertical.setCaption("Vertical layout caption");
@@ -47,7 +47,7 @@ public class ErrorIndicator extends AbstractTestUI {
HorizontalLayout horizontalLayout = new HorizontalLayout();
- LegacyTextField inHorizontal = new LegacyTextField();
+ TextField inHorizontal = new TextField();
inHorizontal.setRequired(true);
inHorizontal.setRequiredError("Horizontal layout tooltip");
inHorizontal.setCaption("Horizontal layout caption");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
index 550c93bb6f..35f2f3d34f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/ExpandChangeReattach.java
@@ -21,8 +21,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.TestUtils;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class ExpandChangeReattach extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
index 945454645a..ae2973a5df 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutFullsizeContentWithErrorMsg.java
@@ -8,14 +8,14 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class HorizontalLayoutFullsizeContentWithErrorMsg
extends AbstractTestUI {
static final String FIELD_ID = "f";
static final String BUTTON_ID = "b";
- private LegacyTextField tf;
+ private TextField tf;
@Override
protected Integer getTicketNumber() {
@@ -33,7 +33,7 @@ public class HorizontalLayoutFullsizeContentWithErrorMsg
HorizontalLayout hl = new HorizontalLayout();
hl.setWidth("500px");
- tf = new LegacyTextField();
+ tf = new TextField();
tf.setId(FIELD_ID);
tf.setWidth("100%");
hl.addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
index 4dc9d8129e..842a03aee4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class HorizontalLayoutVerticalAlign extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java
index dbec70176c..39a7d469b3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeChildren.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.orderedlayout;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class HorizontalRelativeChildren extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
index 2b050a9c9a..35ad29c1d2 100755
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.orderedlayout;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Tree;
public class HorizontalRelativeSizeWithoutExpand extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java
index 5a57bedcc3..58dd3b2e41 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/InsertComponentInHorizontalLayout.java
@@ -20,10 +20,10 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ComboBox;
public class InsertComponentInHorizontalLayout extends AbstractTestUI {
private VerticalLayout layout;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
index 8fe684cba1..6179694686 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java
@@ -10,10 +10,10 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
-import com.vaadin.ui.Select;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.TextField;
public class LayoutClickListenerTest extends TestBase {
@@ -27,7 +27,7 @@ public class LayoutClickListenerTest extends TestBase {
layout.setSizeFull();
// Add some components to the layout
- layout.addComponent(new LegacyTextField(null, "Click here"));
+ layout.addComponent(new TextField(null, "Click here"));
layout.addComponent(new Link("Click here", null));
Select select = new Select(null, Arrays.asList("Click here"));
@@ -38,7 +38,7 @@ public class LayoutClickListenerTest extends TestBase {
VerticalLayout l1 = new VerticalLayout();
l1.setMargin(true);
l1.addComponent(new Label("This is a label."));
- l1.addComponent(new LegacyTextField(null, "Click here"));
+ l1.addComponent(new TextField(null, "Click here"));
l1.addComponent(new Link("Click here", null));
TabSheet t = new TabSheet();
@@ -48,7 +48,7 @@ public class LayoutClickListenerTest extends TestBase {
VerticalLayout nestedLayout = new VerticalLayout();
nestedLayout.addComponent(new Label("This is a label."));
- nestedLayout.addComponent(new LegacyTextField(null, "Click here"));
+ nestedLayout.addComponent(new TextField(null, "Click here"));
nestedLayout.addComponent(new Link("Click here", null));
HorizontalLayout nestedLayout2 = new HorizontalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
index 5fef63ce86..70d9e2dcc5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java
@@ -6,9 +6,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.LegacyWindow;
public class LayoutRenderTimeTest extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
index aa945ce04f..931ebfa5e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java
@@ -10,10 +10,10 @@ import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.Table;
public class LayoutResizeTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index 520e2d10d8..e714e0dbd4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
@@ -6,8 +6,6 @@ import java.util.Arrays;
import java.util.List;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.TestUtils;
@@ -18,8 +16,10 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.NativeSelect;
@Theme("tests-components")
public class OrderedLayoutCases extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
index 874e40b5be..f00d585f1c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/TooltipOnRequiredIndicator.java
@@ -23,7 +23,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TooltipOnRequiredIndicator extends AbstractTestUI {
@@ -37,7 +37,7 @@ public class TooltipOnRequiredIndicator extends AbstractTestUI {
protected void setup(VaadinRequest request) {
VerticalLayout layout = new VerticalLayout();
- LegacyTextField inVertical = new LegacyTextField();
+ TextField inVertical = new TextField();
inVertical.setRequired(true);
inVertical.setRequiredError("Vertical layout tooltip");
inVertical.setCaption("Vertical layout caption");
@@ -48,7 +48,7 @@ public class TooltipOnRequiredIndicator extends AbstractTestUI {
HorizontalLayout horizontalLayout = new HorizontalLayout();
- LegacyTextField inHorizontal = new LegacyTextField();
+ TextField inHorizontal = new TextField();
inHorizontal.setRequired(true);
inHorizontal.setRequiredError("Horizontal layout tooltip");
inHorizontal.setCaption("Horizontal layout caption");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
index 70f17600c3..1c9047a74b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java
@@ -9,16 +9,16 @@ import com.vaadin.shared.ui.slider.SliderOrientation;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.Slider;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.Table;
@Theme("tests-components")
public class VaadinTunesLayout extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
index 7aad8a2f8b..0ab03acbfb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChanges.java
@@ -15,20 +15,20 @@
*/
package com.vaadin.tests.components.orderedlayout;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
public class VerticalLayoutFocusWithDOMChanges extends AbstractTestUI
implements ValueChangeListener {
Button dummyButton = new Button("Just a button");
- LegacyTextField listenedTextField = new LegacyTextField();
- LegacyTextField changingTextField = new LegacyTextField();
+ TextField listenedTextField = new TextField();
+ TextField changingTextField = new TextField();
@Override
protected void setup(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
index ea60c2ca67..e5c3b1c8b6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java
@@ -4,10 +4,10 @@ import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.TextField;
public class VerticalLayoutWidthCalculation extends AbstractTestCase {
@Override
@@ -24,14 +24,14 @@ public class VerticalLayoutWidthCalculation extends AbstractTestCase {
VerticalLayout vlTF1 = new VerticalLayout();
vlTF1.setSizeUndefined();
- final LegacyTextField tf1 = new LegacyTextField("Text1");
+ final TextField tf1 = new TextField("Text1");
tf1.setSizeUndefined();
vlTF1.addComponent(tf1);
hl.addComponent(vlTF1);
VerticalLayout vlTF2 = new VerticalLayout();
vlTF2.setSizeUndefined();
- final LegacyTextField tf2 = new LegacyTextField("Text2");
+ final TextField tf2 = new TextField("Text2");
tf2.setVisible(false);
tf2.setSizeUndefined();
vlTF2.addComponent(tf2);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
index 4205704666..bb52813fe4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutWithEmptyLabel.java
@@ -11,10 +11,10 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class VerticalLayoutWithEmptyLabel extends AbstractTestUI {
@@ -119,9 +119,9 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI {
private final Table table;
private final Label myLabel = new Label("");
- private final LegacyTextField filterPhoneField = new LegacyTextField(
+ private final TextField filterPhoneField = new TextField(
"Foobar Number");
- private final LegacyTextField filterFoobarField = new LegacyTextField(
+ private final TextField filterFoobarField = new TextField(
"Foobar ID");
private final CheckBox incomingOnlyField = new CheckBox(
"Incoming foobar only");
@@ -147,7 +147,7 @@ public class VerticalLayoutWithEmptyLabel extends AbstractTestUI {
this.addComponent(topLayout);
// Foobar phone #
- final LegacyTextField smsNumber = new LegacyTextField(
+ final TextField smsNumber = new TextField(
"Foobar Phone #");
smsNumber.setSizeUndefined();
smsNumber.setColumns(12);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java
index 260bfb02a4..b972edeb07 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeChildren.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.orderedlayout;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Alignment;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TextArea;
public class VerticalRelativeChildren extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
index 3f22cb5e12..4d8f2f94fc 100755
--- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.orderedlayout;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Tree;
/**
* The Application's "main" class
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
index 096baad188..c2ca47ae79 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/BasicPanelTest.java
@@ -8,9 +8,9 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.TextArea;
public class BasicPanelTest extends TestBase {
private final Label scrollPosition = new Label();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
index f631583fd6..e32347ab43 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class PanelShouldRemoveActionHandler extends TestBase {
@@ -33,7 +33,7 @@ public class PanelShouldRemoveActionHandler extends TestBase {
VerticalLayout layout = new VerticalLayout();
layout.setMargin(true);
panel = new Panel("A panel", layout);
- layout.addComponent(new LegacyTextField());
+ layout.addComponent(new TextField());
Button add = new Button("Add an action handler",
new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
index e4109f6c43..7754d982c2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/UndefinedSizeScrollbars.java
@@ -18,11 +18,11 @@ package com.vaadin.tests.components.panel;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
public class UndefinedSizeScrollbars extends AbstractTestUI {
@@ -36,11 +36,11 @@ public class UndefinedSizeScrollbars extends AbstractTestUI {
GridLayout grid = new GridLayout();
grid.setSpacing(true);
- LegacyTextField text1 = new LegacyTextField();
+ TextField text1 = new TextField();
text1.setCaption("Text1");
text1.setRequired(true);
- LegacyTextField text2 = new LegacyTextField();
+ TextField text2 = new TextField();
text2.setCaption("Text2");
text2.setRequired(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
index 4e1df730f5..2fc39647d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/panel/WebkitScrollbarTest.java
@@ -19,9 +19,9 @@ package com.vaadin.tests.components.panel;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ListSelect;
@SuppressWarnings("serial")
public class WebkitScrollbarTest extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
index 36cb42390f..15933e1060 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
@@ -2,15 +2,15 @@ package com.vaadin.tests.components.passwordfield;
import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
-import com.vaadin.v7.ui.LegacyPasswordField;
+import com.vaadin.v7.ui.PasswordField;
public class PasswordFieldTest
- extends LegacyAbstractTextFieldTest<LegacyPasswordField>
+ extends LegacyAbstractTextFieldTest<PasswordField>
implements TextChangeListener {
@Override
- protected Class<LegacyPasswordField> getTestClass() {
- return LegacyPasswordField.class;
+ protected Class<PasswordField> getTestClass() {
+ return PasswordField.class;
}
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
index 24b32a9c96..a69c70c893 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java
@@ -9,9 +9,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.Layout;
import com.vaadin.ui.PopupView;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.Table;
public class PopupViewClickShortcut extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
index e9659f3457..0ac0e8e433 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewNullValues.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Notification;
import com.vaadin.ui.PopupView;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class PopupViewNullValues extends TestBase {
@@ -34,7 +34,7 @@ public class PopupViewNullValues extends TestBase {
try {
pv[1] = new PopupView(null,
- new LegacyTextField("Empty html, contains component"));
+ new TextField("Empty html, contains component"));
addComponent(pv[1]);
b[1] = new Button("Open popupview 2", new ClickListener() {
@@ -68,7 +68,7 @@ public class PopupViewNullValues extends TestBase {
}
try {
pv[3] = new PopupView("Popupview 4 - has component",
- new LegacyTextField("This is the content of popupview 4"));
+ new TextField("This is the content of popupview 4"));
addComponent(pv[3]);
b[3] = new Button("Open popupview 4", new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
index f317c44cf5..f947220aa7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandler.java
@@ -22,7 +22,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.PopupView;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Test UI to check availability of shortcut action listener in the popup view
@@ -57,7 +57,7 @@ public class PopupViewShortcutActionHandler extends AbstractTestUI {
@Override
public Component getPopupComponent() {
- LegacyTextField field = new LegacyTextField("Enter text");
+ TextField field = new TextField("Enter text");
field.setImmediate(true);
field.addShortcutListener(new ShortcutListener("SearchAction",
ShortcutAction.KeyCode.ENTER, null) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
index e4c91150c3..8b18968968 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.PopupView;
import com.vaadin.ui.PopupView.Content;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("serial")
public class PopupViewShouldCloseOnTabOut extends TestBase {
@@ -32,11 +32,11 @@ public class PopupViewShouldCloseOnTabOut extends TestBase {
@Override
public Component getPopupComponent() {
VerticalLayout vl = new VerticalLayout();
- LegacyTextField field1 = new LegacyTextField();
+ TextField field1 = new TextField();
field1.setValue("one");
field1.focus();
vl.addComponent(field1);
- LegacyTextField field2 = new LegacyTextField();
+ TextField field2 = new TextField();
field2.setValue("two");
vl.addComponent(field2);
vl.setWidth("600px");
@@ -44,10 +44,10 @@ public class PopupViewShouldCloseOnTabOut extends TestBase {
}
});
addComponent(pv);
- LegacyTextField main = new LegacyTextField();
+ TextField main = new TextField();
main.setValue("main");
addComponent(main);
- LegacyTextField main2 = new LegacyTextField();
+ TextField main2 = new TextField();
main2.setValue("main2");
addComponent(main2);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
index 069ccef2bb..200bc94be6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewWithRTE.java
@@ -4,8 +4,8 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.PopupView;
import com.vaadin.ui.PopupView.Content;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.RichTextArea;
public class PopupViewWithRTE extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
index 01dc10220f..17a8c2ea51 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.RichTextArea;
+import com.vaadin.v7.ui.RichTextArea;
public class RichTextAreaEmptyString extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
index 17358cb424..af5b3a1253 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaRelativeHeightResize.java
@@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.RichTextArea;
public class RichTextAreaRelativeHeightResize extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
index 66b5a9e08a..f3a16636b7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.richtextarea;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.RichTextArea;
public class RichTextAreaScrolling extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
index 934f2ed2dd..3884f1d3d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaSize.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.richtextarea;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.RichTextArea;
public class RichTextAreaSize extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
index 72361ca82a..178bc28da8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.richtextarea;
import java.util.LinkedHashMap;
import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
-import com.vaadin.ui.RichTextArea;
+import com.vaadin.v7.ui.RichTextArea;
public class RichTextAreaTest extends LegacyAbstractFieldTest<RichTextArea> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
index 5af27a2559..bc05f88235 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaUpdateWhileTyping.java
@@ -4,7 +4,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.ProgressIndicator;
-import com.vaadin.ui.RichTextArea;
+import com.vaadin.v7.ui.RichTextArea;
public class RichTextAreaUpdateWhileTyping extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
index a4aceadbc0..481ea55267 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java
@@ -8,10 +8,10 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyAbstractField;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.RichTextArea;
@SuppressWarnings("serial")
public class RichTextAreaWithKeyboardShortcuts extends TestBase {
@@ -27,7 +27,7 @@ public class RichTextAreaWithKeyboardShortcuts extends TestBase {
msg += " From : " + sender.getClass().getSimpleName() + " '"
+ ((Component) sender).getCaption() + "'";
- LegacyAbstractField<String> f = (LegacyAbstractField<String>) target;
+ AbstractField<String> f = (AbstractField<String>) target;
msg += " Target:" + target.getClass().getSimpleName() + " '"
+ f.getCaption() + "'";
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreas.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreas.java
index 8585d19bc2..37b9283eb4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreas.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreas.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.richtextarea;
import com.vaadin.tests.components.ComponentTestCase;
-import com.vaadin.ui.RichTextArea;
+import com.vaadin.v7.ui.RichTextArea;
public class RichTextAreas extends ComponentTestCase<RichTextArea> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index cd9abc369e..3862542a19 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
@@ -4,16 +4,16 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.Action;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.event.ItemClickEvent.ItemClickNotifier;
import com.vaadin.server.Resource;
import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
-import com.vaadin.ui.AbstractSelect;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect;
public abstract class AbstractSelectTestCase<T extends AbstractSelect>
extends LegacyAbstractFieldTest<T> implements ItemClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
index 9004e9feaf..97dd15f4b4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
/**
* TODO can't reproduce the issue with this test case, possibly need some
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
index a649cd8732..93908bf015 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/EnumSelect.java
@@ -20,9 +20,9 @@ import java.util.Locale;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.Tree;
public class EnumSelect extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java b/uitest/src/main/java/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
index e5d4b33a04..bb84b9df2f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.select;
import com.vaadin.event.FieldEvents;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.ui.ComboBox;
public class FocusListenerBreaksDropdownMenu extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/NativeSelects.java
index 75a3f1b751..8c77cfd465 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/NativeSelects.java
@@ -4,7 +4,7 @@ import java.util.List;
import com.vaadin.tests.components.ComponentTestCase;
import com.vaadin.ui.Component;
-import com.vaadin.ui.NativeSelect;
+import com.vaadin.v7.ui.NativeSelect;
public class NativeSelects extends ComponentTestCase<NativeSelect> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/NullSelectionItemId.java b/uitest/src/main/java/com/vaadin/tests/components/select/NullSelectionItemId.java
index 984bab5b34..6f7a837057 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/NullSelectionItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/NullSelectionItemId.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.Select;
public class NullSelectionItemId extends TestBase implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
index 64714cba70..1d05753815 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/OptionGroupBaseSelects.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.select;
import com.vaadin.tests.components.ComponentTestCase;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.TwinColSelect;
public class OptionGroupBaseSelects
extends ComponentTestCase<HorizontalLayout> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
index a7752f6033..54db9f4977 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectDisplaysOldValue.java
@@ -5,12 +5,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Select;
public class SelectDisplaysOldValue extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
index 07d32311d0..a7780202b2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectItemCaptionRefresh.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.Select;
public class SelectItemCaptionRefresh extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectTest.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectTest.java
index f19e7ecad2..95c651e401 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectTest.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.select;
import com.vaadin.tests.components.combobox.ComboBoxes2;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.Select;
public class SelectTest extends ComboBoxes2<Select> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
index 76edfec5af..1aa4e66dbf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/SelectWithIntegers.java
@@ -20,9 +20,9 @@ import java.util.List;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
-import com.vaadin.ui.ListSelect;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.v7.ui.ListSelect;
public class SelectWithIntegers extends AbstractTestUI {
private final List<Integer> years = Arrays.asList(2014, 2015, 2016);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
index baa06b86a8..9b63326e27 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/StylingPopupOpener.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.TestUtils;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Select;
+import com.vaadin.v7.ui.Select;
public class StylingPopupOpener extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
index 789174260f..563e730681 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.select;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.TwinColSelect;
public class TwinColSelectCaptionStyles extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java
index de92ba9e81..411cb361a3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.select;
import java.util.LinkedHashMap;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.TwinColSelect;
public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelects.java b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelects.java
index 64b3d37c0d..7a769de843 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelects.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.select;
import com.vaadin.tests.components.ComponentTestCase;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.TwinColSelect;
public class TwinColSelects extends ComponentTestCase<TwinColSelect> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
index 34913128f7..93787c60b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/HiddenSliderHandle.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.slider;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Slider;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class HiddenSliderHandle extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
index 6b7a629a6d..81997b24f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderValueFromDataSource.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.slider;
import com.vaadin.data.Binder;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.ProgressBar;
import com.vaadin.ui.Slider;
+import com.vaadin.v7.data.util.BeanItem;
public class SliderValueFromDataSource extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
index 3025da57e7..ce4ff734a4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.NativeButton;
+import com.vaadin.v7.ui.LegacyWindow;
public class SplitPanelExtraScrollbars extends AbstractTestCase
implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
index 18ea015d01..88654b8ffc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java
@@ -8,8 +8,8 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.ui.TextArea;
public class SplitPanelReversePosition extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
index f6da858ca7..b4ad8ffd5c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWidthOnResize.java
@@ -4,10 +4,10 @@ import com.vaadin.server.Sizeable;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalSplitPanel;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.TextField;
public class SplitPanelWidthOnResize extends AbstractTestCase {
@@ -20,7 +20,7 @@ public class SplitPanelWidthOnResize extends AbstractTestCase {
HorizontalSplitPanel splitPanel = new HorizontalSplitPanel();
Button button = new NativeButton("A huge button");
button.setSizeFull();
- LegacyTextField textField = new LegacyTextField("A small textfield");
+ TextField textField = new TextField("A small textfield");
splitPanel.setFirstComponent(button);
splitPanel.setSecondComponent(textField);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
index 6b17319509..6bd2eb838e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/splitpanel/SplitPanelWithRichTextArea.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.splitpanel;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.ui.RichTextArea;
public class SplitPanelWithRichTextArea extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java
index fa981aebe9..8f1c70fff6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddItemToEmptyTable.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class AddItemToEmptyTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AddNonRenderedRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddNonRenderedRow.java
index 741c5f6cec..b73e71bc45 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/AddNonRenderedRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddNonRenderedRow.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class AddNonRenderedRow extends TestBase {
int index = 0;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
index a4981e6ccb..9fe387271b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
@@ -22,8 +22,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
/**
* Test to see if selecting and deselecting a table row after select range has
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
index 98b3ddb5d5..f61829469e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/AsyncPushUpdates.java
@@ -16,12 +16,12 @@
package com.vaadin.tests.components.table;
import com.vaadin.annotations.Push;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
/**
* Test to see if VScrollTable handles Push updates correctly.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
index 84824718b9..27cb2d72d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.TestUtils;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.CellStyleGenerator;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.CellStyleGenerator;
@SuppressWarnings("serial")
public class CellStyleGeneratorTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
index 54a68ce998..963ddb6e00 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ClippedComponentsInTable.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class ClippedComponentsInTable extends TestBase {
@@ -23,12 +23,12 @@ public class ClippedComponentsInTable extends TestBase {
Table t = new Table();
addComponent(t);
- t.addContainerProperty("Name", LegacyTextField.class, null);
+ t.addContainerProperty("Name", TextField.class, null);
t.addContainerProperty("Button", Button.class, null);
for (int i = 0; i < 3; i++) {
Item item = t.addItem(i);
- LegacyTextField tf = new LegacyTextField("", String.valueOf(i + 1));
+ TextField tf = new TextField("", String.valueOf(i + 1));
tf.setColumns(10);
item.getItemProperty("Name").setValue(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java b/uitest/src/main/java/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
index 267b61854f..7f3c4d3cd2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/CollapseIndicatorOverlapsColumn.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class CollapseIndicatorOverlapsColumn extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
index 769f988c15..3d4eaa8c6a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
@@ -8,9 +8,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnCollapseEvent;
-import com.vaadin.ui.Table.ColumnCollapseListener;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnCollapseEvent;
+import com.vaadin.v7.ui.Table.ColumnCollapseListener;
public class ColumnCollapsingAndColumnExpansion extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandRatio.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandRatio.java
index be176d83fa..e3595e2bb5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandRatio.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandRatio.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class ColumnExpandRatio extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
index 78b6c0982c..66483956dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class ColumnExpandWithFixedColumns extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
index 2898750113..9e4dadadf9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class ColumnGeneratorAddingOrder extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
index 1330475e07..3360927310 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnHeaderAlignments.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Select;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class ColumnHeaderAlignments extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderEvent.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderEvent.java
index f32633eece..d6d4fc85b0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderEvent.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class ColumnReorderEvent extends TestBase {
@@ -85,7 +85,7 @@ public class ColumnReorderEvent extends TestBase {
table.addListener(new Table.ColumnReorderListener() {
@Override
public void columnReorder(
- com.vaadin.ui.Table.ColumnReorderEvent event) {
+ com.vaadin.v7.ui.Table.ColumnReorderEvent event) {
order.setValue(aToString(table.getVisibleColumns()));
}
});
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java
index aeebd299ff..965b137686 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java
@@ -17,7 +17,7 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class ColumnReorderingWithManyColumns extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
index 77d490ea7d..63c85779fc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnResizeEvent.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnResizeListener;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnResizeListener;
@SuppressWarnings("serial")
public class ColumnResizeEvent extends TestBase {
@@ -86,7 +86,7 @@ public class ColumnResizeEvent extends TestBase {
table.addListener(new ColumnResizeListener() {
@Override
public void columnResize(
- com.vaadin.ui.Table.ColumnResizeEvent event) {
+ com.vaadin.v7.ui.Table.ColumnResizeEvent event) {
if (event.getPropertyId().equals("firstname")) {
column1Width.setValue(
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidths.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidths.java
index 9fe7a98179..a5344d6300 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidths.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidths.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class ColumnWidths extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
index 27d2d82113..1d962edafe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ColumnWidthsAfterChangeTableColumnsCountOrOrder.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.components.table;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
public class ColumnWidthsAfterChangeTableColumnsCountOrOrder
extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
index c76edca40d..555ba7eaab 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class ContainerChangeWithPartlySamePropertyIds extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChange.java
index c24be6de96..a8781a861c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChange.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class ContainerSizeChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
index 5c439b2877..28a0bb0ac8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContainerSizeChangeDuringTablePaint.java
@@ -18,16 +18,16 @@ package com.vaadin.tests.components.table;
import java.util.Iterator;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.PaintException;
import com.vaadin.server.PaintTarget;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class ContainerSizeChangeDuringTablePaint extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
index 94c0c9beb8..da04a1aac1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ContextMenuSize.java
@@ -15,12 +15,12 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
/**
* Test UI for table context menu position and size.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
index b9e23930e4..1713dddde5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
@SuppressWarnings("serial")
public class CtrlShiftMultiselect extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java b/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
index 2a6f09526a..bfa0bda516 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DelayedColumnLayouting.java
@@ -19,9 +19,9 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
/**
* For tables that are contained in a layout, a delayed column layouting should
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java
index 6dc68de509..3062e1ef6d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledSortingTable.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class DisabledSortingTable extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
index ec888c2699..b5b271ce9c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableKeyboardNavigation.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class DisabledTableKeyboardNavigation extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
index c52f57358c..0af01b4057 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalSplitPanel;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class DisabledTableShouldNotSendPageLengthUpdates extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
index 48fe6b19df..e4b7d16ff6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndEmptyTable.java
@@ -24,7 +24,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
* Test UI for empty table: empty table (without any data) throws client side
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
index bedfb6839a..0f64f4772b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DndTableTargetDetails.java
@@ -15,7 +15,6 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.TargetDetailsImpl;
@@ -25,9 +24,10 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.MouseEventDetails;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
/**
* Test UI for table as a drop target: AbstractSelectTargetDetails should
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
index c0abdfb55b..e68ce97fa4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/DoublesInTable.java
@@ -5,9 +5,6 @@ import java.text.NumberFormat;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.data.bean.Address;
import com.vaadin.tests.data.bean.Country;
@@ -15,10 +12,13 @@ import com.vaadin.tests.data.bean.Person;
import com.vaadin.tests.data.bean.Sex;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.StringToDoubleConverter;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Table;
public class DoublesInTable extends TestBase {
BeanItemContainer<Person> personBeanItemContainer = new BeanItemContainer<Person>(
@@ -135,12 +135,12 @@ public class DoublesInTable extends TestBase {
}
private void addConverters(Table t) {
- t.setConverter("sex", new LegacyConverter<String, Sex>() {
+ t.setConverter("sex", new Converter<String, Sex>() {
@Override
public Sex convertToModel(String value,
Class<? extends Sex> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
// not used in this test - Table only converts to presentation
return null;
}
@@ -148,7 +148,7 @@ public class DoublesInTable extends TestBase {
@Override
public String convertToPresentation(Sex value,
Class<? extends String> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
if (value == null) {
value = Sex.UNKNOWN;
}
@@ -165,7 +165,7 @@ public class DoublesInTable extends TestBase {
return String.class;
}
});
- t.setConverter("deceased", new LegacyConverter<String, Boolean>() {
+ t.setConverter("deceased", new Converter<String, Boolean>() {
@Override
public Boolean convertToModel(String value,
@@ -195,12 +195,12 @@ public class DoublesInTable extends TestBase {
return String.class;
}
});
- t.setConverter("age", new LegacyConverter<String, Integer>() {
+ t.setConverter("age", new Converter<String, Integer>() {
@Override
public Integer convertToModel(String value,
Class<? extends Integer> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
// not used in this test - Table only converts from source to
// target
return null;
@@ -209,7 +209,7 @@ public class DoublesInTable extends TestBase {
@Override
public String convertToPresentation(Integer value,
Class<? extends String> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
if (value == null) {
return null;
}
@@ -234,7 +234,7 @@ public class DoublesInTable extends TestBase {
return String.class;
}
});
- t.setConverter("address", new LegacyConverter<String, Address>() {
+ t.setConverter("address", new Converter<String, Address>() {
@Override
public Address convertToModel(String value,
@@ -264,7 +264,7 @@ public class DoublesInTable extends TestBase {
});
- t.setConverter("rent", new LegacyStringToDoubleConverter() {
+ t.setConverter("rent", new StringToDoubleConverter() {
@Override
protected NumberFormat getFormat(Locale locale) {
return NumberFormat.getCurrencyInstance(locale);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
index bc51e1f051..44299df643 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableModeChange.java
@@ -5,15 +5,15 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.Container;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Component;
-import com.vaadin.ui.DefaultFieldFactory;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TableFieldFactory;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.DefaultFieldFactory;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TableFieldFactory;
public class EditableModeChange extends AbstractTestUI {
@@ -77,7 +77,7 @@ public class EditableModeChange extends AbstractTestUI {
private class ItemFieldFactory extends DefaultFieldFactory {
@Override
- public LegacyField<?> createField(Container container, Object itemId,
+ public Field<?> createField(Container container, Object itemId,
Object propertyId, Component uiContext) {
if (selectionEvent != null) {
if ((selectionEvent.getItemId().equals(itemId))
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableFocus.java
index 7686549709..9054966c46 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableFocus.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class EditableTableFocus extends TestBase {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
index 33836dd98d..ae4c83e789 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java
@@ -6,7 +6,6 @@ import java.io.OutputStream;
import java.io.Serializable;
import java.util.HashMap;
-import com.vaadin.data.Container;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.TestUtils;
@@ -15,10 +14,11 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
-import com.vaadin.ui.DefaultFieldFactory;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.DefaultFieldFactory;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Table;
public class EditableTableLeak extends TestBase {
private final Table table = new Table("ISO-3166 Country Codes and flags");
@@ -58,10 +58,10 @@ public class EditableTableLeak extends TestBase {
}
private static class CachingFieldFactory extends DefaultFieldFactory {
- private final HashMap<Object, HashMap<Object, LegacyField<?>>> cache = new HashMap<Object, HashMap<Object, LegacyField<?>>>();
+ private final HashMap<Object, HashMap<Object, Field<?>>> cache = new HashMap<Object, HashMap<Object, Field<?>>>();
@Override
- public LegacyField<?> createField(Container container, Object itemId,
+ public Field<?> createField(Container container, Object itemId,
Object propertyId, Component uiContext) {
if (cache.containsKey(itemId)) {
if (cache.get(itemId) != null
@@ -69,10 +69,10 @@ public class EditableTableLeak extends TestBase {
return cache.get(itemId).get(propertyId);
}
}
- LegacyField<?> f = super.createField(container, itemId, propertyId,
+ Field<?> f = super.createField(container, itemId, propertyId,
uiContext);
if (!cache.containsKey(itemId)) {
- cache.put(itemId, new HashMap<Object, LegacyField<?>>());
+ cache.put(itemId, new HashMap<Object, Field<?>>());
}
cache.get(itemId).put(propertyId, f);
return f;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
index a19b73f22b..9bc61690f3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyRowsWhenScrolling.java
@@ -3,7 +3,6 @@ package com.vaadin.tests.components.table;
import java.util.Random;
import com.vaadin.annotations.AutoGenerated;
-import com.vaadin.data.util.BeanContainer;
import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.server.ClassResource;
import com.vaadin.server.Resource;
@@ -17,10 +16,11 @@ import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
/**
* This test cannot be automated. http://dev.vaadin.com/ticket/6160, base code
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
index 56060c998d..d543ac8ff7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/EmptyTable.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class EmptyTable extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
index 532c03b91a..af1e7b4e7a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainer.java
@@ -6,14 +6,14 @@ import java.util.Collection;
import java.util.List;
import java.util.logging.Logger;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.AbstractContainer;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinSession;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.AbstractContainer;
+import com.vaadin.v7.data.util.BeanItem;
@SuppressWarnings("serial")
public class ExpandingContainer extends AbstractContainer implements
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java
index 8ad2d7f9c7..bf98b8ea75 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ExpandingContainerVisibleRowRaceCondition.java
@@ -4,9 +4,9 @@ import java.util.Map;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class ExpandingContainerVisibleRowRaceCondition extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/FixedHeightTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/FixedHeightTable.java
index 22d6846dea..a751f4fa7c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/FixedHeightTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FixedHeightTable.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class FixedHeightTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
index e2df62d029..57aefda89d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FocusOnSelectedItem.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
* Test to see if the correct row gets the focus when the row is selected from
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
index 86e1a1f5cf..e4022b0897 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Footer.java
@@ -1,17 +1,17 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class Footer extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
index 173aeece33..fbd632dc85 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/FooterClick.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.FooterClickEvent;
import com.vaadin.ui.TextField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.FooterClickEvent;
public class FooterClick extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
index d89cdff4de..db79287433 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderClick.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.HeaderClickEvent;
import com.vaadin.ui.TextField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.HeaderClickEvent;
public class HeaderClick extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
index 7c3220dced..84ff51ae99 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java
@@ -1,18 +1,18 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
import com.vaadin.data.HasValue;
import com.vaadin.data.HasValue.ValueChange;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.FooterClickEvent;
-import com.vaadin.ui.Table.FooterClickListener;
-import com.vaadin.ui.Table.HeaderClickEvent;
-import com.vaadin.ui.Table.HeaderClickListener;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.FooterClickEvent;
+import com.vaadin.v7.ui.Table.FooterClickListener;
+import com.vaadin.v7.ui.Table.HeaderClickEvent;
+import com.vaadin.v7.ui.Table.HeaderClickListener;
public class HeaderFooterClickLeftRightMiddle extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
index fc2b1ae49a..49ce5e20bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderPositionWhenSorting.java
@@ -1,6 +1,5 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
@@ -11,7 +10,8 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.Link;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class HeaderPositionWhenSorting extends AbstractTestUI
implements Action.Handler, ItemClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
index 7642ac2bc8..c6cba16f91 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.MouseEventDetails;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
public class HeaderRightClickAfterDrag extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java
index 5fe4d4c733..3d14cdcdae 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderSyncOnScroll.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class HeaderSyncOnScroll extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
index 40f2f30055..a612c67827 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.table;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnHeaderMode;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnHeaderMode;
public class HeaderUpdateWhenNoRows extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
index e4d894057a..4f949e14d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.components.table;
import java.util.Random;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class HiddenColumnsExpandRatios extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
index dde9e2b70f..b0615abb6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HiddenComponentCells.java
@@ -19,11 +19,11 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java b/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
index 149d788fd0..dd0f1065f5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/HugeRowCount.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class HugeRowCount extends TestBase {
@@ -19,7 +19,7 @@ public class HugeRowCount extends TestBase {
container = new MockupContainer();
container.setSize(100000);
- final LegacyTextField tf = new LegacyTextField("Rows");
+ final TextField tf = new TextField("Rows");
tf.setValue(String.valueOf(100000));
tf.addListener(new Property.ValueChangeListener() {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
index 5018ca5e4e..17096bf917 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ItemClickEvents.java
@@ -1,19 +1,19 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.server.ExternalResource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.Log;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Tree;
public class ItemClickEvents extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
index 6611cef707..dcc83878bf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyControl.java
@@ -2,15 +2,15 @@ package com.vaadin.tests.components.table;
import java.util.Set;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class KeyControl extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
index fe678f7980..98b8c0151f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java
@@ -2,13 +2,13 @@ package com.vaadin.tests.components.table;
import java.util.Arrays;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.Sizeable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class KeyboardNavigationWithChangingContent extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index ada685960d..af985598c7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
@@ -1,6 +1,5 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.server.ThemeResource;
@@ -10,7 +9,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Component;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class LabelEmbeddedClickThroughForTable extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
index 715ace04eb..58ec0f765d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LargeSelectionCausesNPE.java
@@ -4,19 +4,19 @@ import java.util.HashSet;
import java.util.Set;
import com.vaadin.annotations.AutoGenerated;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
-import com.vaadin.ui.Table.ColumnGenerator;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
public class LargeSelectionCausesNPE extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
index c230a1b257..ea9d05d34e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LastColumnNegative.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class LastColumnNegative extends TestBase {
Table table = setupTable();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
index 32a27e927a..bd99a2d5dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LeftColumnAlignment.java
@@ -16,13 +16,13 @@
package com.vaadin.tests.components.table;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
/**
* Test UI for issue #13399 : Left alignment should not be set explicitly
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
index a5e3a4f472..de48085683 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/LongMultiselect.java
@@ -2,11 +2,11 @@ package com.vaadin.tests.components.table;
import java.util.Collection;
-import com.vaadin.data.Property;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.Table;
public class LongMultiselect extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java
index 0a2ad68738..7c60a347b4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MemoryLeakTable.java
@@ -15,13 +15,13 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
/**
* Test UI Class for testing memory leak in table (#14159).
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java b/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
index e51cec2a6d..efeeb76751 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MissingScrollbar.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.components.table;
import java.io.Serializable;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class MissingScrollbar extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
index c888fd98d0..a21774cce6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ModifyContainerProperty.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class ModifyContainerProperty extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
index 0e440a95d0..90d55da8d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class MultiClickingItemThatDetachesTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
index 06deb98f7f..acc7414ed3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class MultiSelectWithNotIdentityEqualIds extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
index a7058b41e3..783889c224 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.components.table;
import java.util.Arrays;
import java.util.Collection;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class MultiSelectWithRemovedRow extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/NotselectablePaintSelections.java b/uitest/src/main/java/com/vaadin/tests/components/table/NotselectablePaintSelections.java
index cb609b856b..85eafb9333 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/NotselectablePaintSelections.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/NotselectablePaintSelections.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.table;
import java.util.HashSet;
import java.util.Set;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class NotselectablePaintSelections extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
index 6763fdb29d..ca72c4e7c7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/OddEvenRowStyling.java
@@ -16,7 +16,7 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
* @author jonatan
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
index 9a118ab979..ecb1bca226 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PopupViewInTable.java
@@ -21,8 +21,8 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.PopupView;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class PopupViewInTable extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java b/uitest/src/main/java/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
index 0b5b1d139c..d5c6836760 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.Table;
public class ProgrammaticUnselectInRange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
index 3b8cfac1b3..4c4da64495 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/PropertyValueChange.java
@@ -1,21 +1,21 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.NewItemHandler;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
-import com.vaadin.ui.DefaultFieldFactory;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.ui.TableFieldFactory;
-import com.vaadin.v7.ui.LegacyField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect.NewItemHandler;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.DefaultFieldFactory;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.TableFieldFactory;
public class PropertyValueChange extends TestBase {
@@ -138,7 +138,7 @@ class MyFieldFactory extends DefaultFieldFactory {
}
@Override
- public LegacyField<?> createField(Container container, Object itemId,
+ public Field<?> createField(Container container, Object itemId,
Object propertyId, Component uiContext) {
if (propertyId.equals("text")) {
// replace text fields with comboboxes
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
index 6e7196422e..0abb70dcc4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
@@ -21,8 +21,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
/**
* There shouldn't be any attempts to refresh table's cells if the table isn't
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
index 77acb153b8..525e2f2ecf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ReloadWidgets.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class ReloadWidgets extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java b/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java
index df6c577a4d..397b46fec9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RemoveItemOnClick.java
@@ -15,14 +15,14 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class RemoveItemOnClick extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
index 3645f88a69..7d323b979a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowAdditionTest.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class RowAdditionTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowGenerators.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowGenerators.java
index c3bf46c12d..99e2581003 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RowGenerators.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowGenerators.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.GeneratedRow;
-import com.vaadin.ui.Table.RowGenerator;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.GeneratedRow;
+import com.vaadin.v7.ui.Table.RowGenerator;
public class RowGenerators extends TestBase implements RowGenerator {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
index 0f8d590909..58b535ef21 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.Action;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.ProgressIndicator;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class RowUpdateShouldRetainContextMenu extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/uitest/src/main/java/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
index b1dd628bf2..8e46f8f7c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.Sizeable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class SafariRenderingBugWhiteSpace extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
index 007f3bbc2b..f7f1dc1a78 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.components.table;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.tests.util.Person;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class ScrollCausesRequestLoop extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
index 9423968ecf..14ec0e6412 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ScrollDetachSynchronization.java
@@ -5,8 +5,8 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class ScrollDetachSynchronization extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
index d9153c02f6..eafe1b1ecf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllConstantViewport.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.CssLayout;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
index 7b84190910..3818cc5c11 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectAllRows.java
@@ -21,7 +21,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class SelectAllRows extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SelectableEditable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectableEditable.java
index 2b33c71d2a..a198c05fa8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectableEditable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectableEditable.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class SelectableEditable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SelectingItemScrollsRight.java b/uitest/src/main/java/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
index d9401c21b4..17518315c9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SelectingItemScrollsRight.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class SelectingItemScrollsRight extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
index 22e60406a6..12f677d60d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java
@@ -4,8 +4,8 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class SetCurrentPageFirstItemId extends TestBase {
int index = 0;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
index d69b80613e..69ca7efcdf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndex.java
@@ -23,10 +23,10 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.ui.Table.ColumnHeaderMode;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.Table.ColumnHeaderMode;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
index 5749912f43..de5e4fef29 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java
@@ -4,14 +4,14 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.CacheUpdateException;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.CacheUpdateException;
public class SetDataSourceWithPropertyIds extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
index fa328f742a..8939014077 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SetPageFirstItemLoadsNeededRowsOnly.java
@@ -18,12 +18,12 @@ package com.vaadin.tests.components.table;
import java.io.Serializable;
import java.util.List;
-import com.vaadin.data.util.BeanContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanContainer;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
index d73aa7a4f3..e882f39477 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ShowLastItem.java
@@ -4,7 +4,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class ShowLastItem extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
index 47760349b9..d0e592c018 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class SortLabelsInTable extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
index edad05e191..e36d33005f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLongTable.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.AbstractTestCase;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class SortLongTable extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
index f781bb7be3..dc440f0fe8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortableHeaderStyles.java
@@ -17,13 +17,13 @@ package com.vaadin.tests.components.table;
import java.util.Collection;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.PersonContainer;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.Table;
public class SortableHeaderStyles extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
index 16c0345339..791ab08d5f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAfterRemovingExpandRatios.java
@@ -27,7 +27,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableAfterRemovingExpandRatios extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
index 92250090f5..5578b89327 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java
@@ -1,6 +1,5 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.event.Action;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
@@ -9,7 +8,8 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.Link;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class TableAndBrowserContextMenu extends TestBase
implements Action.Handler, ItemClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
index 6a0cb765b3..a7adb0c803 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableBlurFocus.java
@@ -28,7 +28,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
* Tests that previously focused component's blur event happens before any
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
index 75f2679234..8f4a202dcf 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.Table;
public class TableCacheBuildEfficiency extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java
index 745f2344a3..fe4fdc4f68 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableCacheMinimizingOnFetchRows.java
@@ -3,12 +3,12 @@ package com.vaadin.tests.components.table;
import java.io.Serializable;
import java.util.List;
-import com.vaadin.data.util.BeanContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanContainer;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class TableCacheMinimizingOnFetchRows extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
index 873cc24566..8b4338187e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableChildMeasurementHint.java
@@ -6,14 +6,14 @@ 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.ui.ComboBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HasChildMeasurementHint.ChildMeasurementHint;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TableChildMeasurementHint extends AbstractTestUI {
@@ -143,7 +143,7 @@ public class TableChildMeasurementHint extends AbstractTestUI {
table.addGeneratedColumn("First_Name" + 3, new Table.ColumnGenerator() {
@Override
public Object generateCell(Table components, Object o, Object o2) {
- LegacyTextField b = new LegacyTextField("Textfield");
+ TextField b = new TextField("Textfield");
b.setWidthUndefined();
return b;
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
index 80b4ba26c3..d57d8d0c3a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java
@@ -1,7 +1,5 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
@@ -11,15 +9,17 @@ import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
import com.vaadin.ui.Component;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.ui.Table.RowHeaderMode;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.TextField;
public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
@@ -60,7 +60,7 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
public Component generateCell(Table source, Object itemId,
Object columnId) {
Item item = source.getItem(itemId);
- LegacyTextField textfield = new LegacyTextField();
+ TextField textfield = new TextField();
textfield.setValue(
String.valueOf(item.getItemProperty("foo").getValue()));
return textfield;
@@ -74,7 +74,7 @@ public class TableClickAndDragOnIconAndComponents extends AbstractTestUI {
public Component generateCell(Table source, Object itemId,
Object columnId) {
Item item = source.getItem(itemId);
- LegacyTextField textfield = new LegacyTextField();
+ TextField textfield = new TextField();
textfield.setValue(
String.valueOf(item.getItemProperty("foo").getValue()));
textfield.setReadOnly(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
index f50a5c6a04..422dcdded7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java
@@ -1,7 +1,5 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.tests.components.TestBase;
@@ -9,8 +7,10 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class TableClickValueChangeInteraction extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
index 371cb5fc19..fa1ae35b87 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnAddAndResize.java
@@ -20,8 +20,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class TableColumnAddAndResize extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
index 547a164bb7..f3afb3f4d9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java
@@ -4,9 +4,9 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.TextField;
public class TableColumnResizeContentsWidth extends AbstractTestUI {
@@ -19,7 +19,7 @@ public class TableColumnResizeContentsWidth extends AbstractTestUI {
@Override
public Object generateCell(Table source, Object itemId,
Object columnId) {
- LegacyTextField textField = new LegacyTextField();
+ TextField textField = new TextField();
textField.setWidth("100%");
return textField;
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java
index b1ecb3fc10..a8a57b2f1c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndExpandRatios.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableColumnWidthsAndExpandRatios extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
index ab68915046..0af0d0fda1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableColumnWidthsAndSorting.java
@@ -22,7 +22,7 @@ import com.vaadin.tests.fieldgroup.ComplexPerson;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
@Theme("valo")
public class TableColumnWidthsAndSorting extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
index 1cfb28c793..f5e6f42e92 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenu.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.event.Action;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableContextMenu extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
index ea2dccf1df..185a7e3d67 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuOnField.java
@@ -7,9 +7,9 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
import com.vaadin.ui.Link;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TableContextMenuOnField extends TestBase {
@@ -42,7 +42,7 @@ public class TableContextMenuOnField extends TestBase {
Object columnId) {
VerticalLayout layout = new VerticalLayout();
- layout.addComponent(new LegacyTextField());
+ layout.addComponent(new TextField());
layout.addListener(new LayoutClickListener() {
@@ -61,7 +61,7 @@ public class TableContextMenuOnField extends TestBase {
@Override
public Component generateCell(Table source, Object itemId,
Object columnId) {
- return new LegacyTextField();
+ return new TextField();
}
});
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
index 4c04cee540..a3f86325de 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableContextMenuTouch.java
@@ -6,8 +6,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
/*
* Differs from TableContextMenu by number of items, their numbering and
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java
index e3848bb152..4cc40621d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableDropIndicatorValo.java
@@ -7,7 +7,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
@Theme("valo")
@SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
index 00f3bb3463..01d246db14 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableExtraScrollbars.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.AbstractTestCase;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class TableExtraScrollbars extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
index 3f3255f525..38e3fae34c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFirstRowFlicker.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.LegacyApplication;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.ProgressIndicator;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class TableFirstRowFlicker extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
index a4bd11cf9c..ba05c6e036 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableFocusOnRefreshRowCache.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableFocusOnRefreshRowCache extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderShifting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderShifting.java
index 9dc641ddc4..26ea04461b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderShifting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderShifting.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableHeaderShifting extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
index 95952cb8e7..64faa43733 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeaderZoom.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.CssLayout;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class TableHeaderZoom extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
index af1acb7d89..1863bd6cc6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
/**
* Setting table height and setting column header mode as hidden leaves the body
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java
index c0c8876fca..202593a526 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInSubWindowMemoryLeak.java
@@ -5,11 +5,11 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.Window;
import com.vaadin.ui.Window.CloseEvent;
import com.vaadin.ui.Window.CloseListener;
+import com.vaadin.v7.ui.Table;
public class TableInSubWindowMemoryLeak extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
index ee9609bb96..cb6509c110 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java
@@ -9,10 +9,10 @@ import com.vaadin.ui.AbsoluteLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
public class TableInTabsheet extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
index 33b51398ec..0046e59a2c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUI.java
@@ -1,16 +1,16 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect.ItemDescriptionGenerator;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TableItemDescriptionGeneratorUI extends AbstractTestUI {
@@ -67,7 +67,7 @@ public class TableItemDescriptionGeneratorUI extends AbstractTestUI {
@Override
public Component generateCell(Table source, Object itemId,
Object columnId) {
- LegacyTextField lbl = new LegacyTextField();
+ TextField lbl = new TextField();
if (componentDescription.getValue()) {
lbl.setDescription("Textfield's own description");
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemIcon.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemIcon.java
index 1faa9667c2..a96848d836 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableItemIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableItemIcon.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.server.ClassResource;
import com.vaadin.server.Resource;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class TableItemIcon extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
index 68480788c1..dc824c60ec 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableJumpUI.java
@@ -16,7 +16,6 @@
package com.vaadin.tests.components.table;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.FieldEvents.BlurEvent;
import com.vaadin.event.FieldEvents.BlurListener;
import com.vaadin.event.FieldEvents.FocusEvent;
@@ -25,9 +24,10 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
/**
* Test for ensuring page doesn't jump up to the Table selection on IE with
@@ -68,7 +68,7 @@ public class TableJumpUI extends AbstractTestUIWithLog {
// After the table we have a lot of textfields so that we have to scroll
// down to the button
for (int i = 0; i < 40; i++) {
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
tf.setValue(String.valueOf(i));
final int j = i;
tf.addFocusListener(new FocusListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
index 453424606a..7a444e1c46 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableLastRowMissing.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TableLastRowMissing extends TestBase {
@@ -22,11 +22,11 @@ public class TableLastRowMissing extends TestBase {
Table t = new Table();
addComponent(t);
- t.addContainerProperty("Name", LegacyTextField.class, null);
+ t.addContainerProperty("Name", TextField.class, null);
for (int i = 0; i < 3; i++) {
Item item = t.addItem(i);
- LegacyTextField tf = new LegacyTextField("", String.valueOf(i + 1));
+ TextField tf = new TextField("", String.valueOf(i + 1));
tf.setColumns(10);
item.getItemProperty("Name").setValue(tf);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
index e5adaaf4c2..267e8a5b03 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java
@@ -1,6 +1,5 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.AbstractTestUI;
@@ -9,8 +8,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
index 74a5089a84..6750b152aa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableModifcationsWhenScrolledRight extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
index 8a5703aece..4c3a599704 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMoveFocusWithSelection.java
@@ -26,8 +26,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class TableMoveFocusWithSelection extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
index 58506e83a9..81a2b9a43a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMultiSelectSimple.java
@@ -3,14 +3,14 @@ package com.vaadin.tests.components.table;
import java.util.Set;
import java.util.TreeSet;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.shared.ui.MultiSelectMode;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class TableMultiSelectSimple extends TestBase {
Log log = new Log(3);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
index 0deb903460..5e81bb7bce 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableNavigationPageDown.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableNavigationPageDown extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthCalculation.java
index e56f686218..b1ee256c23 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthCalculation.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.Table;
public class TablePageLengthCalculation extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
index aec3946265..e0b99dd367 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TablePageLengthUpdate.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.MethodProperty;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.MethodProperty;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TablePageLengthUpdate extends TestBase {
@@ -54,7 +54,7 @@ public class TablePageLengthUpdate extends TestBase {
});
addComponent(updateButton);
- LegacyTextField tableHeight = new LegacyTextField("Table height",
+ TextField tableHeight = new TextField("Table height",
new MethodProperty<String>(this, "tableHeight"));
tableHeight.setImmediate(true);
addComponent(tableHeight);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
index 94c9b27383..a4932d9bf5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableParentEnabledStateChange.java
@@ -15,7 +15,6 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
@@ -23,7 +22,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class TableParentEnabledStateChange extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
index a7012976c0..0439d15fe2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableReduceContainerSize.java
@@ -4,15 +4,15 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import com.vaadin.data.Container.Filter;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container.Filter;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
/**
* Test for #8291 and #7666: NegativeArraySizeException when Table scrolled to
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
index 897c9e58b5..8850dc2072 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRemovedQuicklySendsInvalidRpcCalls.java
@@ -27,7 +27,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.ConnectorTracker;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
import elemental.json.JsonObject;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
index 2b02e89c80..739bf9e6d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableRepaintWhenMadeVisibile extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
index acb2d8eb8e..a1177b7db3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRows.java
@@ -4,12 +4,12 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
/**
* Scroll position should be restored when removing and re-adding all rows in
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
index fe1b4c360b..2a99bef580 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRequiredIndicator.java
@@ -15,12 +15,12 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class TableRequiredIndicator extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
index d752364c38..ecee9b908f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
public class TableRowHeight extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
index c612af6194..124450d4bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight2.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.table;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.themes.BaseTheme;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
@Theme("tests-tickets")
public class TableRowHeight2 extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
index 5acc9713f3..f079380159 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowHeight3.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.themes.BaseTheme;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
public class TableRowHeight3 extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
index 0574a1de6c..963038661a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java
@@ -5,7 +5,7 @@ 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.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableRowScrolledBottom extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
index 70985ecd1b..89fead9272 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollAfterAddRow.java
@@ -15,19 +15,15 @@
*/
package com.vaadin.tests.components.table;
-/**
- *
- * @author Vaadin Ltd
- */
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
/*
* Copyright 2000-2016 Vaadin Ltd.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollOnFocus.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollOnFocus.java
index f9cac0e1f8..d289798c3d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollOnFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollOnFocus.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableScrollOnFocus extends TestBase {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
index 8ab3ea745c..d97603c6bd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollUpOnSelect.java
@@ -15,14 +15,14 @@
*/
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
/**
* Test to see if Table appears to scroll up under an obscure set of conditions
@@ -32,11 +32,11 @@ import com.vaadin.v7.ui.LegacyTextField;
* @author Vaadin Ltd
*/
public class TableScrollUpOnSelect extends AbstractTestUI {
- public LegacyTextField text = null;
+ public TextField text = null;
@Override
protected void setup(VaadinRequest request) {
- text = new LegacyTextField();
+ text = new TextField();
text.setImmediate(true);
final Table table = new Table(null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
index 29fd306aca..d36f0c5dfa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollingWithSQLContainer.java
@@ -4,19 +4,19 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.QueryDelegate;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
-import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class TableScrollingWithSQLContainer extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java
index 104cd0ab3b..f42a65b2cc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableScrollsOnSelection.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class TableScrollsOnSelection extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
index e9ddd2d20e..d173c7f5c7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSelectPagingOff.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.table;
import java.util.Arrays;
import java.util.Collection;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
public class TableSelectPagingOff extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
index 7a857995df..3d9e9a25d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSetUndefinedSize.java
@@ -4,7 +4,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableSetUndefinedSize extends AbstractTestUI {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
index ead6d3d17d..6be49f5ac8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java
@@ -4,9 +4,9 @@ import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.TextField;
public class TableShouldNotEatValueChanges extends TestBase {
@@ -23,7 +23,7 @@ public class TableShouldNotEatValueChanges extends TestBase {
t.setTabIndex(4);
// t.setSelectable(true);
- final LegacyTextField tf = new LegacyTextField();
+ final TextField tf = new TextField();
tf.setTabIndex(1);
ItemClickListener l = new ItemClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSingleSelect.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSingleSelect.java
index 92a1491c56..caf4c22d94 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSingleSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSingleSelect.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class TableSingleSelect extends TestBase {
Log log = new Log(3);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
index 378b85fadd..954e481e9a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSizeInTabsheet.java
@@ -21,8 +21,8 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Layout;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
@SuppressWarnings("serial")
public class TableSizeInTabsheet extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
index 48b98987ad..995ab7e211 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSorting.java
@@ -2,12 +2,12 @@ package com.vaadin.tests.components.table;
import java.io.Serializable;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
public class TableSorting extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
index a032cd142c..31e8c262fb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingIndicator.java
@@ -17,14 +17,14 @@ package com.vaadin.tests.components.table;
import java.util.Random;
-import com.vaadin.data.Container;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
/**
* Test if the table sorting indicators update correctly when the table is
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java
index 23d0581e5a..a319cbe7ea 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSortingStopsWorkingOnChrome.java
@@ -3,19 +3,19 @@ package com.vaadin.tests.components.table;
import java.io.Serializable;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptAll;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnReorderEvent;
-import com.vaadin.ui.Table.ColumnReorderListener;
-import com.vaadin.ui.Table.HeaderClickEvent;
-import com.vaadin.ui.Table.HeaderClickListener;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnReorderEvent;
+import com.vaadin.v7.ui.Table.ColumnReorderListener;
+import com.vaadin.v7.ui.Table.HeaderClickEvent;
+import com.vaadin.v7.ui.Table.HeaderClickListener;
@Theme("valo")
@SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
index ba78372e29..86c84a1814 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableSqlContainer.java
@@ -5,18 +5,18 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Locale;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.ui.Table;
public class TableSqlContainer extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
index 77ac5886f4..3424e5c659 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibility.java
@@ -21,8 +21,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
/**
* Test that toggling column visibility does not change custom header, icon,
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
index cf34aa0953..1c808ddfeb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityWidth.java
@@ -20,8 +20,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
/**
* Test that column width is restored after restoring column visibility
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
index 856d9e04fd..827f380125 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableToggleVisibility.java
@@ -7,9 +7,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class TableToggleVisibility extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
index 53af105a6a..ec3505eaef 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableTooManyColumns.java
@@ -17,8 +17,8 @@ package com.vaadin.tests.components.table;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
public class TableTooManyColumns extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
index ec6b58fbac..4b68467091 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUndefinedSize.java
@@ -2,18 +2,18 @@ package com.vaadin.tests.components.table;
import java.util.Arrays;
-import com.vaadin.data.Container;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.Table;
public class TableUndefinedSize extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
index 35d1a5ecda..b3766d4ac4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableUnregisterComponent.java
@@ -1,20 +1,20 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
-import com.vaadin.ui.DefaultFieldFactory;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.DefaultFieldFactory;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TableUnregisterComponent extends TestBase {
@@ -26,13 +26,13 @@ public class TableUnregisterComponent extends TestBase {
final Log log = new Log(5);
IndexedContainer container = new IndexedContainer();
- container.addContainerProperty(COL_A, LegacyTextField.class, null);
+ container.addContainerProperty(COL_A, TextField.class, null);
container.addContainerProperty(COL_B, String.class, "");
Item it = container.addItem("a");
final ObjectProperty<String> valA = new ObjectProperty<String>(
"orgVal");
- final LegacyTextField fieldA = new LegacyTextField(valA) {
+ final TextField fieldA = new TextField(valA) {
@Override
public void setPropertyDataSource(Property newDataSource) {
super.setPropertyDataSource(newDataSource);
@@ -50,10 +50,10 @@ public class TableUnregisterComponent extends TestBase {
table.setColumnCollapsingAllowed(true);
table.setTableFieldFactory(new DefaultFieldFactory() {
@Override
- public LegacyField<?> createField(Container container,
+ public Field<?> createField(Container container,
Object itemId, Object propertyId, Component uiContext) {
if (COL_B.equals(propertyId)) {
- LegacyField<String> field = new LegacyTextField() {
+ Field<String> field = new TextField() {
@Override
public void setPropertyDataSource(
Property newDataSource) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
index b24c560bfe..53c7684ea1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableVisibleColumnsUpdate extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
index 2b7fe48536..a8416e803e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWidthItemRemove.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
* Test whether adding the first item to a table calculates the table width
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
index 9dd26c560d..632facee44 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.java
@@ -17,9 +17,6 @@ package com.vaadin.tests.components.table;
import java.lang.reflect.InvocationTargetException;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.ListenerMethod.MethodException;
import com.vaadin.server.ErrorEvent;
import com.vaadin.server.ErrorHandler;
@@ -30,9 +27,12 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.CacheUpdateException;
-import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.CacheUpdateException;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
public class TableWithBrokenGeneratorAndContainer extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
index cfec94e6c3..3babf8f2a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithChildComponents.java
@@ -1,6 +1,5 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
@@ -8,8 +7,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
public class TableWithChildComponents extends TestBase
implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
index 3d2ead9fe9..41c951e61b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java
@@ -2,16 +2,16 @@ package com.vaadin.tests.components.table;
import java.util.Date;
-import com.vaadin.data.util.BeanContainer;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.data.util.BeanContainer;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.Table;
public class TableWithContainerRequiringEqualsForItemId extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
index ed6144cae7..da8284a0e6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithCustomConverterFactory.java
@@ -19,19 +19,19 @@ import java.util.Locale;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.DefaultConverterFactory;
+import com.vaadin.v7.ui.Table;
public class TableWithCustomConverterFactory extends AbstractTestUI {
public static class MyIntegerConverter
- implements LegacyConverter<String, Integer> {
+ implements Converter<String, Integer> {
@Override
public Integer convertToModel(String value,
Class<? extends Integer> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
// TODO Auto-generated method stub
return null;
}
@@ -39,7 +39,7 @@ public class TableWithCustomConverterFactory extends AbstractTestUI {
@Override
public String convertToPresentation(Integer value,
Class<? extends String> targetType, Locale locale)
- throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException {
+ throws com.vaadin.v7.data.util.converter.Converter.ConversionException {
return "Integer: " + value;
}
@@ -56,9 +56,9 @@ public class TableWithCustomConverterFactory extends AbstractTestUI {
}
public static class MyConverterFactory
- extends LegacyDefaultConverterFactory {
+ extends DefaultConverterFactory {
@Override
- protected LegacyConverter<String, ?> createStringConverter(
+ protected Converter<String, ?> createStringConverter(
Class<?> sourceType) {
if (Integer.class.isAssignableFrom(sourceType)) {
return new MyIntegerConverter();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithManyColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithManyColumns.java
index c73409838a..a3361827f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithManyColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithManyColumns.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.ui.Table;
public class TableWithManyColumns extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
index 6cd5995296..482c230124 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class TableWithNoncollapsibleColumns extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
index a774cc8f03..fc75b813e6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableWithPolling.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TableWithPolling extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
index f6dfc6de4b..56543d5c53 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java
@@ -16,20 +16,20 @@ import com.vaadin.shared.ui.table.TableConstants;
import com.vaadin.tests.components.select.AbstractSelectTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
-import com.vaadin.ui.Table.CellStyleGenerator;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.ui.Table.ColumnHeaderMode;
-import com.vaadin.ui.Table.ColumnResizeEvent;
-import com.vaadin.ui.Table.ColumnResizeListener;
-import com.vaadin.ui.Table.FooterClickEvent;
-import com.vaadin.ui.Table.FooterClickListener;
-import com.vaadin.ui.Table.GeneratedRow;
-import com.vaadin.ui.Table.HeaderClickEvent;
-import com.vaadin.ui.Table.HeaderClickListener;
-import com.vaadin.ui.Table.RowGenerator;
-import com.vaadin.ui.Table.RowHeaderMode;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
+import com.vaadin.v7.ui.Table.CellStyleGenerator;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.Table.ColumnHeaderMode;
+import com.vaadin.v7.ui.Table.ColumnResizeEvent;
+import com.vaadin.v7.ui.Table.ColumnResizeListener;
+import com.vaadin.v7.ui.Table.FooterClickEvent;
+import com.vaadin.v7.ui.Table.FooterClickListener;
+import com.vaadin.v7.ui.Table.GeneratedRow;
+import com.vaadin.v7.ui.Table.HeaderClickEvent;
+import com.vaadin.v7.ui.Table.HeaderClickListener;
+import com.vaadin.v7.ui.Table.RowGenerator;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
public class Tables<T extends Table> extends AbstractSelectTestCase<T>
implements ItemClickListener, HeaderClickListener, FooterClickListener,
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
index 43ffc9af21..288c417cf2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TabletContextMenu.java
@@ -21,7 +21,7 @@ import com.vaadin.event.ShortcutAction;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
* A test UI for context menus on different parts of a VSCrollTable.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
index 3891fb8212..d0cc0be938 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class TestCurrentPageFirstItem extends TestBase
implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
index a1d4f890cc..51b4eb9fe1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldRelativeWidth.java
@@ -1,20 +1,20 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TextFieldRelativeWidth extends AbstractTestUI {
@Override
public void setup(VaadinRequest request) {
- LegacyTextField tf = new LegacyTextField("test", "testing");
+ TextField tf = new TextField("test", "testing");
tf.setWidth("100%");
EditTable t = new EditTable();
@@ -56,7 +56,7 @@ public class TextFieldRelativeWidth extends AbstractTestUI {
int size = idc.size();
Object itemId = idc.addItemAt(size - 1);
Item newItem = idc.getItem(itemId);
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
if (inputPrompt != null && inputPrompt.length() > 0) {
tf.setInputPrompt(inputPrompt);
}
@@ -69,7 +69,7 @@ public class TextFieldRelativeWidth extends AbstractTestUI {
itemId = idc.addItemAt(size);
newItem = idc.getItem(itemId);
- tf = new LegacyTextField();
+ tf = new TextField();
if (inputPromptChild != null && inputPromptChild.length() > 0) {
tf.setInputPrompt(inputPromptChild);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
index 89c9050361..ff1ef2ca68 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java
@@ -5,9 +5,9 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class TextFieldValueGoesMissing extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java b/uitest/src/main/java/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java
index 30921392e8..2b072bc5f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/TooManySetColumnCollapsedCalls.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class TooManySetColumnCollapsedCalls extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java b/uitest/src/main/java/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
index 8e623499cf..76360c74b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class UncollapsedCollumnWidth extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
index e63d5d8ed7..2905f95504 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/UnnecessaryScrollbarWhenZooming.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.table;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class UnnecessaryScrollbarWhenZooming extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java b/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java
index 231375c2ea..b1c1f74a02 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocused.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class UpdateTableWhenUnfocused extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
index d21a09838a..71775c0ad9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ValueAfterClearingContainer.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class ValueAfterClearingContainer extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java b/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
index de32ea1fc0..6802248ef6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/ViewPortCalculation.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.table;
-import com.vaadin.data.Item;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.CellStyleGenerator;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.CellStyleGenerator;
public class ViewPortCalculation extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/WideSelectableTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/WideSelectableTable.java
index 60e7db5c0d..2b2107a760 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/table/WideSelectableTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/table/WideSelectableTable.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.components.table;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table;
public class WideSelectableTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
index 019e94a938..55b4d59f80 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/ScrollbarsInNestedTabsheets.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("serial")
public class ScrollbarsInNestedTabsheets extends TestBase {
@@ -40,7 +40,7 @@ public class ScrollbarsInNestedTabsheets extends TestBase {
private Layout getDummyLayout2() {
final VerticalLayout l = new VerticalLayout();
l.addComponent(new DateField("Date"));
- l.addComponent(new LegacyTextField("TextField"));
+ l.addComponent(new TextField("TextField"));
return l;
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
index c6ce5418b4..0f08b19318 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java
@@ -18,7 +18,7 @@ import com.vaadin.ui.Layout;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.TabSheet.Tab;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Test if the click and key tab selection in a tabsheet generate the correct
@@ -75,11 +75,11 @@ public class TabKeyboardNavigation extends AbstractTestUI {
addComponent(addTab);
addComponent(focus);
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
addComponent(tf);
addComponent(focusblur);
addComponent(ts);
- tf = new LegacyTextField();
+ tf = new TextField();
addComponent(tf);
}
@@ -105,7 +105,7 @@ public class TabKeyboardNavigation extends AbstractTestUI {
Label label = new Label("Tab " + index);
label.setId(labelID(index));
content.addComponent(label);
- content.addComponent(new LegacyTextField());
+ content.addComponent(new TextField());
Tab tab = ts.addTab(content, "Tab " + index, null);
if (index == 2) {
tab.setClosable(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
index a1e060fbd6..7f1792474e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabKeyboardNavigationWaiAria.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.Layout;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.TabSheet.Tab;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TabKeyboardNavigationWaiAria extends AbstractTestUI {
@@ -62,7 +62,7 @@ public class TabKeyboardNavigationWaiAria extends AbstractTestUI {
Layout content = new VerticalLayout();
tabs.add(content);
- LegacyTextField field = new LegacyTextField("Tab " + index + " label");
+ TextField field = new TextField("Tab " + index + " label");
content.addComponent(field);
Tab tab = ts.addTab(content, "Tab " + index, null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
index c79abdb2b2..146397a7e0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TabSheetDiscardsMovedComponents extends TestBase {
@@ -20,7 +20,7 @@ public class TabSheetDiscardsMovedComponents extends TestBase {
tabSheet.setSizeUndefined();
grid.setColumns(2);
- LegacyTextField textField = new LegacyTextField("Text field");
+ TextField textField = new TextField("Text field");
textField.setValue("Text");
addTestComponent(textField);
addTestComponent(new Button("Button"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
index 92d6591424..dfd871dfc5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetIcons.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TabSheetIcons extends TestBase {
@@ -39,7 +39,7 @@ public class TabSheetIcons extends TestBase {
tab[0] = new Label("This is tab 1");
tab[0].setIcon(new ThemeResource("../runo/icons/32/folder-add.png"));
tab[0].setCaption("tab number 1");
- tab[1] = new LegacyTextField("This is tab 2",
+ tab[1] = new TextField("This is tab 2",
"Contents of tab 2 textfield");
tab[2] = new Label("This is tab 3");
tab[2].setIcon(new ThemeResource("../runo/icons/16/folder-add.png"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
index b242e192b0..c7e6b1adfd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabSheetWithHasComponent.java
@@ -15,7 +15,6 @@
*/
package com.vaadin.tests.components.tabsheet;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
@@ -27,9 +26,10 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.PopupView;
import com.vaadin.ui.PopupView.Content;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
public class TabSheetWithHasComponent extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
index 0aa10662fa..a016f481e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetNPE.java
@@ -5,10 +5,10 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.TabSheet.Tab;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
public class TabsheetNPE extends AbstractTestCase implements ClickListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
index a0f65129f0..22e27e3111 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/TabsheetShouldUpdateHeight.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TabsheetShouldUpdateHeight extends TestBase {
@@ -44,7 +44,7 @@ public class TabsheetShouldUpdateHeight extends TestBase {
v.setSpacing(true);
v.setMargin(true);
for (int i = 0; i < inAmount; i++) {
- v.addComponent(new LegacyTextField("Text field:"));
+ v.addComponent(new TextField("Text field:"));
}
return v;
}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
index 531c0f73d0..e82a6ce523 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.tabsheet;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class VerticalScrollbarPosition extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
index d3e9f528ef..f61dbb303b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/ScrollCursor.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
/**
* @author denis
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
index 44c0aea24e..ef7a13befe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
@@ -5,15 +5,15 @@ import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
-import com.vaadin.ui.TextArea;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyAbstractTextField;
-import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.AbstractTextField;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class TextAreaCursorPosition extends TestBase {
- private LegacyTextField cursorPosition = new LegacyTextField(
+ private TextField cursorPosition = new TextField(
"Cursor position");
@Override
@@ -29,14 +29,14 @@ public class TextAreaCursorPosition extends TestBase {
addComponent(new Button("Force position update"));
}
- public void addListener(LegacyAbstractField newField) {
- LegacyAbstractTextField newTextField = (LegacyAbstractTextField) newField;
+ public void addListener(AbstractField newField) {
+ AbstractTextField newTextField = (AbstractTextField) newField;
newTextField.setTextChangeEventMode(TextChangeEventMode.EAGER);
newTextField.addTextChangeListener(new TextChangeListener() {
@Override
public void textChange(TextChangeEvent event) {
- LegacyAbstractTextField component = (LegacyAbstractTextField) event
+ AbstractTextField component = (AbstractTextField) event
.getComponent();
cursorPosition.setValue(
String.valueOf(component.getCursorPosition()));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
index a3bf8b3555..5fe4a4bfa6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaSizeResetted.java
@@ -24,8 +24,8 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
+import com.vaadin.v7.ui.TextArea;
/**
* Ticket #14080
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
index 81f0111a9d..74a6e3a4d9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.textarea;
import java.util.LinkedHashMap;
import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class TextAreaTest extends LegacyAbstractTextFieldTest<TextArea> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java
index 2d2cf29e9e..df5d2a2227 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextDisappearsOnBlur.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.textarea;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class TextDisappearsOnBlur extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/Wordwrap.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/Wordwrap.java
index a157029e1a..905e07191e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/Wordwrap.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textarea/Wordwrap.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.LoremIpsum;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class Wordwrap extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
index a3d98b2555..c6030f9223 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/AutomaticImmediate.java
@@ -15,15 +15,15 @@
*/
package com.vaadin.tests.components.textfield;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
/**
* Test to verify fields become implicitly "immediate" when adding value change
@@ -60,7 +60,7 @@ public class AutomaticImmediate extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField textField = new LegacyTextField() {
+ final TextField textField = new TextField() {
/*
* (non-Javadoc)
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
index 080a4f8523..5bccccb933 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/BigDecimalTextField.java
@@ -19,8 +19,6 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Locale;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
@@ -28,7 +26,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.TextField;
/**
* @since 7.2
@@ -47,7 +47,7 @@ public class BigDecimalTextField extends AbstractTestUIWithLog {
beanBigDecimal);
FormLayout formLayout = new FormLayout();
- LegacyTextField textField = new LegacyTextField("BigDecimal field");
+ TextField textField = new TextField("BigDecimal field");
textField.setImmediate(true);
textField.setValue("12");
formLayout.addComponent(textField);
@@ -58,7 +58,7 @@ public class BigDecimalTextField extends AbstractTestUIWithLog {
Button setValue = new Button("Set value to 15,2", new ClickListener() {
@Override
public void buttonClick(ClickEvent event) {
- ((LegacyTextField) fieldGroup.getField("decimal"))
+ ((TextField) fieldGroup.getField("decimal"))
.setValue("15,2");
}
});
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
index 777ed5c052..cecd559fdc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.textfield;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.Action;
import com.vaadin.event.ShortcutAction;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
public class EnterShortcutMaySendInputPromptAsValue extends TestBase {
@@ -23,7 +23,7 @@ public class EnterShortcutMaySendInputPromptAsValue extends TestBase {
@Override
protected void setup() {
- final LegacyTextField testField = new LegacyTextField();
+ final TextField testField = new TextField();
testField.setInputPrompt("Enter a value");
getMainWindow().addActionHandler(new Action.Handler() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
index cb5e72c444..97e19bc3d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/EnumTextField.java
@@ -15,12 +15,12 @@
*/
package com.vaadin.tests.components.textfield;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.TextField;
public class EnumTextField extends AbstractTestUIWithLog {
@@ -30,7 +30,7 @@ public class EnumTextField extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField tf = new LegacyTextField();
+ final TextField tf = new TextField();
tf.setNullRepresentation("");
tf.addValueChangeListener(new ValueChangeListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
index 7c85a632cd..9df408ba32 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/IE6Cursor.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.textfield;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class IE6Cursor extends TestBase {
@Override
protected void setup() {
- LegacyTextField tf1 = new LegacyTextField("First");
- LegacyTextField tf2 = new LegacyTextField("Second");
+ TextField tf1 = new TextField("First");
+ TextField tf2 = new TextField("Second");
tf2.setInputPrompt("prompt");
addComponent(tf1);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
index c576f2c924..d5ea31f4ed 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/InputPromptGetText.java
@@ -23,7 +23,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* To verify bug fix: Reproducing of bug Textfield value not updated when
@@ -50,7 +50,7 @@ public class InputPromptGetText extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField tf = new LegacyTextField();
+ final TextField tf = new TextField();
tf.setId(FIELD);
tf.setInputPrompt("input text here");
tf.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
index 7251195ccf..906887d6db 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyField.java
@@ -6,21 +6,21 @@ import java.util.Locale;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class LocaleChangeOnReadOnlyField extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField textField = getReadOnlyTextField();
+ final TextField textField = getReadOnlyTextField();
addComponent(textField);
Button changeLocaleButton = addLocaleChangeButton(textField);
addComponent(changeLocaleButton);
}
- private LegacyTextField getReadOnlyTextField() {
- final LegacyTextField textField = new LegacyTextField();
+ private TextField getReadOnlyTextField() {
+ final TextField textField = new TextField();
textField.setConverter(BigDecimal.class);
textField.setLocale(Locale.US);
@@ -30,7 +30,7 @@ public class LocaleChangeOnReadOnlyField extends AbstractTestUI {
return textField;
}
- private Button addLocaleChangeButton(final LegacyTextField textField) {
+ private Button addLocaleChangeButton(final TextField textField) {
Button changeLocaleButton = new Button();
changeLocaleButton.setCaption("Change Locale");
changeLocaleButton.addClickListener(new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
index 56b9840e27..8595791b77 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/RequiredTextField.java
@@ -20,7 +20,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Test for required text field.
@@ -31,7 +31,7 @@ public class RequiredTextField extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField field = new LegacyTextField();
+ final TextField field = new TextField();
addComponent(field);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
index 214e89f680..42f648cfc2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java
@@ -9,8 +9,8 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
+import com.vaadin.v7.ui.TextArea;
public class SelectionAndCursorPosition extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
index bcdbae5a03..6debfd1096 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/SizedTextFields.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.textfield;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class SizedTextFields extends TestBase {
@@ -13,7 +13,7 @@ public class SizedTextFields extends TestBase {
@Override
protected void setup() {
- LegacyTextField tf;
+ TextField tf;
VerticalLayout vl;
@@ -28,7 +28,7 @@ public class SizedTextFields extends TestBase {
vl.setHeight("40px");
vl.setWidth("200px");
- tf = new LegacyTextField();
+ tf = new TextField();
tf.setSizeFull();
vl.addComponent(tf);
vl.setCaption("Fullsize textfield in 40px height 200px width box");
@@ -48,7 +48,7 @@ public class SizedTextFields extends TestBase {
vl = new VerticalLayout();
vl.setSizeUndefined();
- tf = new LegacyTextField();
+ tf = new TextField();
vl.addComponent(tf);
vl.setCaption("Normal textfield in natural size.");
cssLayout.addComponent(vl);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
index 51c073aa89..087d9d8273 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
@@ -6,8 +6,8 @@ import com.vaadin.shared.ui.textfield.ValueChangeMode;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.tests.util.TestUtils;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
+import com.vaadin.v7.ui.TextArea;
public class TextChangeEvents extends TestBase {
Log l = new Log(10);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
index 90da113cda..ee1b1b08db 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
@@ -1,7 +1,5 @@
package com.vaadin.tests.components.textfield;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.FieldEvents.BlurEvent;
import com.vaadin.event.FieldEvents.BlurListener;
import com.vaadin.event.FieldEvents.FocusEvent;
@@ -11,15 +9,17 @@ import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
public class TextChangeEvents2 extends TestBase {
@Override
protected void setup() {
{
- final LegacyTextField tf = new LegacyTextField("Debug");
+ final TextField tf = new TextField("Debug");
getLayout().addComponent(tf);
tf.addTextChangeListener(new TextChangeListener() {
@@ -54,7 +54,7 @@ public class TextChangeEvents2 extends TestBase {
}
{
- final LegacyTextField tf = new LegacyTextField("Label");
+ final TextField tf = new TextField("Label");
getLayout().addComponent(tf);
final Label l = new Label();
getLayout().addComponent(l);
@@ -75,7 +75,7 @@ public class TextChangeEvents2 extends TestBase {
}
{
- final LegacyTextField tf = new LegacyTextField("Slow label");
+ final TextField tf = new TextField("Slow label");
tf.setTextChangeTimeout(2000);
tf.setImmediate(true);
getLayout().addComponent(tf);
@@ -99,7 +99,7 @@ public class TextChangeEvents2 extends TestBase {
}
{
- final LegacyTextField tf = new LegacyTextField("Uppercase");
+ final TextField tf = new TextField("Uppercase");
tf.setTextChangeTimeout(1);
getLayout().addComponent(tf);
final Label l = new Label();
@@ -122,13 +122,13 @@ public class TextChangeEvents2 extends TestBase {
}
{
- final LegacyTextField[] tfs = new LegacyTextField[] {
- new LegacyTextField(), new LegacyTextField(),
- new LegacyTextField(), new LegacyTextField() };
+ final TextField[] tfs = new TextField[] {
+ new TextField(), new TextField(),
+ new TextField(), new TextField() };
HorizontalLayout hl = new HorizontalLayout();
hl.setCaption("Blää");
getLayout().addComponent(hl);
- for (LegacyTextField tf : tfs) {
+ for (TextField tf : tfs) {
tf.setColumns(4);
tf.setTextChangeEventMode(TextChangeEventMode.EAGER);
hl.addComponent(tf);
@@ -147,7 +147,7 @@ public class TextChangeEvents2 extends TestBase {
tfs[idx].setValue("");
tfs[idx].setValue(txt.substring(0, 4));
if (idx < tfs.length - 1) {
- LegacyTextField next = tfs[idx + 1];
+ TextField next = tfs[idx + 1];
next.focus();
if (len > 4) {
next.setValue(txt.substring(4,
@@ -163,7 +163,7 @@ public class TextChangeEvents2 extends TestBase {
@Override
public void valueChange(ValueChangeEvent event) {
- LegacyTextField tf = (LegacyTextField) event
+ TextField tf = (TextField) event
.getProperty();
String val = tf.getValue();
if (val != null && val.length() > 4) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
index edb26da892..c0745aac00 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.textfield;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.FieldEvents.TextChangeEvent;
import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
public class TextChangeEventsWithNonImmediateValueChange extends TestBase {
Log l = new Log(5);
@@ -14,7 +14,7 @@ public class TextChangeEventsWithNonImmediateValueChange extends TestBase {
@Override
protected void setup() {
- LegacyTextField tf = new LegacyTextField("Default");
+ TextField tf = new TextField("Default");
TextChangeListener inputEventListener = new TextChangeListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
index bc4f3a6e00..206ef8e41b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
@@ -4,8 +4,8 @@ import com.vaadin.event.FieldEvents.TextChangeEvent;
import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.TestUtils;
-import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
public class TextChangeListenerChangingNonTextProperties extends TestBase {
@@ -18,7 +18,7 @@ public class TextChangeListenerChangingNonTextProperties extends TestBase {
@Override
protected void setup() {
- final LegacyTextField tf2 = new LegacyTextField("Updates width") {
+ final TextField tf2 = new TextField("Updates width") {
@Override
public void attach() {
super.attach();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
index b971613c09..bac833f626 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
@@ -20,10 +20,10 @@ import com.vaadin.event.FieldEvents.TextChangeEvent;
import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.TestUtils;
-import com.vaadin.ui.TextArea;
-import com.vaadin.v7.ui.LegacyAbstractTextField;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.AbstractTextField;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class TextChangeListenerLosesFocus extends TestBase {
@@ -32,7 +32,7 @@ public class TextChangeListenerLosesFocus extends TestBase {
public void textChange(TextChangeEvent event) {
final String value = event.getText();
if (value.length() > 2) {
- ((LegacyField) event.getComponent())
+ ((Field) event.getComponent())
.setValue("Updated by TextChangeListener");
}
}
@@ -44,7 +44,7 @@ public class TextChangeListenerLosesFocus extends TestBase {
".v-textfield-focus, .v-textarea-focus { "
+ " background: #E8F0FF !important }");
- LegacyAbstractTextField field = new LegacyTextField();
+ AbstractTextField field = new TextField();
field.setDebugId("test-textfield");
field.setInputPrompt("Enter at least 3 characters");
field.addTextChangeListener(listener);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
index f396590fb4..b6d16ab5fe 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
@@ -6,14 +6,14 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
public class TextChangeTimeoutAfterDetach extends TestBase {
@Override
protected void setup() {
- final LegacyTextField field = new LegacyTextField();
+ final TextField field = new TextField();
field.setImmediate(false);
field.setTextChangeTimeout(2000);
field.setTextChangeEventMode(TextChangeEventMode.TIMEOUT);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
index b1ee195dbd..a719515aa3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
@@ -3,15 +3,15 @@ package com.vaadin.tests.components.textfield;
import com.vaadin.event.FieldEvents.TextChangeEvent;
import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.v7.ui.LegacyAbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
public class TextFieldEagerRepaint extends TestBase {
@Override
protected void setup() {
- final LegacyTextField tf1 = new LegacyTextField("Updates value");
+ final TextField tf1 = new TextField("Updates value");
tf1.setTextChangeEventMode(TextChangeEventMode.EAGER);
tf1.addTextChangeListener(new TextChangeListener() {
@Override
@@ -24,7 +24,7 @@ public class TextFieldEagerRepaint extends TestBase {
}
});
- final LegacyTextField tf2 = new LegacyTextField("Updates width");
+ final TextField tf2 = new TextField("Updates width");
tf2.setTextChangeEventMode(TextChangeEventMode.EAGER);
tf2.addTextChangeListener(new TextChangeListener() {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
index 2439819efc..b6814a9713 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInLayoutInTable.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.textfield;
import com.vaadin.server.LegacyApplication;
import com.vaadin.ui.Component;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class TextFieldInLayoutInTable extends LegacyApplication {
@@ -19,7 +19,7 @@ public class TextFieldInLayoutInTable extends LegacyApplication {
final Table table = new Table();
table.addContainerProperty("column1", Component.class, null);
VerticalLayout vl = new VerticalLayout();
- final LegacyTextField textField = new LegacyTextField();
+ final TextField textField = new TextField();
vl.addComponent(textField);
table.addItem(new Object[] { vl }, 1);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
index 7ad3900f4a..d721fb5a4a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java
@@ -7,7 +7,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TextFieldInputPromptAndClickShortcut extends TestBase {
@@ -15,7 +15,7 @@ public class TextFieldInputPromptAndClickShortcut extends TestBase {
protected void setup() {
final Log log = new Log(5);
- final LegacyTextField textField = new LegacyTextField();
+ final TextField textField = new TextField();
Button button = new Button("Show Text", new ClickListener() {
@Override
public void buttonClick(ClickEvent event) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
index 02c4d47ded..01625d0d42 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldMaxLengthRemovedFromDOM.java
@@ -3,13 +3,13 @@ package com.vaadin.tests.components.textfield;
import com.vaadin.event.FieldEvents;
import com.vaadin.event.FieldEvents.FocusEvent;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TextFieldMaxLengthRemovedFromDOM extends TestBase {
@Override
protected void setup() {
- final LegacyTextField tf = new LegacyTextField();
+ final TextField tf = new TextField();
tf.setMaxLength(11);
tf.setRequired(true);
tf.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
index 05301650d2..bb653695bb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldPrimaryStyleName.java
@@ -3,13 +3,13 @@ package com.vaadin.tests.components.textfield;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TextFieldPrimaryStyleName extends TestBase {
@Override
protected void setup() {
- final LegacyTextField field = new LegacyTextField();
+ final TextField field = new TextField();
field.setPrimaryStyleName("my-textfield");
addComponent(field);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
index db4775fcf1..35f61f7419 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.components.textfield;
import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
-public class TextFieldTest extends LegacyAbstractTextFieldTest<LegacyTextField>
+public class TextFieldTest extends LegacyAbstractTextFieldTest<TextField>
implements TextChangeListener {
@Override
- protected Class<LegacyTextField> getTestClass() {
- return LegacyTextField.class;
+ protected Class<TextField> getTestClass() {
+ return TextField.class;
}
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
index 84c2e8c8e4..5f3fc312d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithDataSourceAndInputPrompt.java
@@ -15,10 +15,10 @@
*/
package com.vaadin.tests.components.textfield;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.TextField;
public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI {
public static class Pojo {
@@ -35,14 +35,14 @@ public class TextFieldWithDataSourceAndInputPrompt extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyTextField textField = new LegacyTextField(
+ TextField textField = new TextField(
"TextField with null value");
textField.setInputPrompt("Me is input prompt");
textField.setNullRepresentation(null);
textField.setValue(null);
addComponent(textField);
- LegacyTextField textField2 = new LegacyTextField(
+ TextField textField2 = new TextField(
"TextField with null data source value");
textField2.setInputPrompt("Me is input prompt");
textField2.setNullRepresentation(null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
index 7a0adf9968..15d5a1694a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithProperty.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.textfield;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("unchecked")
public class TextFieldWithProperty extends TestBase {
@@ -13,7 +13,7 @@ public class TextFieldWithProperty extends TestBase {
@Override
protected void setup() {
- final LegacyTextField tf1 = new LegacyTextField();
+ final TextField tf1 = new TextField();
final ObjectProperty<String> op = new ObjectProperty<String>("FOO");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
index 73cab19c95..58f542ccfb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java
@@ -5,13 +5,13 @@ import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.util.Locale;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.PropertyFormatter;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.PropertyFormatter;
+import com.vaadin.v7.ui.TextField;
public class TextFieldWithPropertyFormatter extends TestBase {
@@ -87,7 +87,7 @@ public class TextFieldWithPropertyFormatter extends TestBase {
}
};
- final LegacyTextField tf1 = new LegacyTextField();
+ final TextField tf1 = new TextField();
tf1.setPropertyDataSource(formatter);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
index 3ce2e38eba..bc53d0d88f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java
@@ -2,13 +2,13 @@ package com.vaadin.tests.components.tree;
import java.util.Set;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class CtrlShiftMultiselect extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java b/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
index 42b47508ac..2dc698def5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/DndTreeTargetDetails.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.tree;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.table.DndTableTargetDetails;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
/**
* Test UI for tree as a drop target: AbstractSelectTargetDetails should provide
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java
index 81e177c39b..08a45e07f9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/ExpandCollapseTree.java
@@ -2,13 +2,13 @@ package com.vaadin.tests.components.tree;
import java.util.Set;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class ExpandCollapseTree extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java
index c561781d2b..8cb1bba8d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/ItemStyleGenerator.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.tree;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.CustomLayout;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
public class ItemStyleGenerator extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java b/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
index b812c9e955..3c08324237 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/PreselectedTreeVisible.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.components.tree;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
@SuppressWarnings("serial")
public class PreselectedTreeVisible extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
index 8002f5100e..7a8eabe2a5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/SelectItemAfterRemove.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.tree;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
public class SelectItemAfterRemove extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java b/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java
index f3e47d0996..d1d295e055 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/SimpleTree.java
@@ -2,15 +2,15 @@ package com.vaadin.tests.components.tree;
import java.util.Date;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.Action;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractSelect.ItemDescriptionGenerator;
+import com.vaadin.v7.ui.Tree;
public class SimpleTree extends TestBase implements Action.Handler {
private static final String[][] hardware = { //
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
index da9569aa9a..cd1c49c62d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeConnectors.java
@@ -1,7 +1,5 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptAll;
@@ -9,9 +7,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeDragMode;
import com.vaadin.ui.themes.BaseTheme;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
@SuppressWarnings("serial")
public class TreeConnectors extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java
index 2dde7bbb30..d6167b4bff 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeContainerChange.java
@@ -1,15 +1,15 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Tree;
@SuppressWarnings("serial")
public class TreeContainerChange extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
index 7aa3933752..d0f0a7a189 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java
@@ -1,17 +1,17 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Container;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TargetItemAllowsChildren;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TargetItemAllowsChildren;
public class TreeDragAndDropFromTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
index b200e5cc7c..9d15e2f3a1 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFiltering.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class TreeFiltering extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
index 73b3d6d114..a7d81d758e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeFocusGaining.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
-import com.vaadin.ui.Tree;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.Tree;
@SuppressWarnings("serial")
public class TreeFocusGaining extends TestBase {
@@ -15,7 +15,7 @@ public class TreeFocusGaining extends TestBase {
protected void setup() {
final Log log = new Log(5);
- LegacyTextField textField = new LegacyTextField(
+ TextField textField = new TextField(
"My value should get to server when tree is clicked");
addComponent(textField);
textField.addListener(new Property.ValueChangeListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java
index ef378b420a..98289bf4eb 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHorizontalResize.java
@@ -2,13 +2,13 @@ package com.vaadin.tests.components.tree;
import java.util.Iterator;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class TreeHorizontalResize extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
index eb63807484..ca39ce67ed 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowed.java
@@ -18,7 +18,7 @@ package com.vaadin.tests.components.tree;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
public class TreeHtmlContentAllowed extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java
index 6580133645..03885d2dc5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeIconUpdate.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class TreeIconUpdate extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
index a3f2b113cd..453abc8a5b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemClickListening.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.tree;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
public class TreeItemClickListening extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
index 9031a76e66..3002e71b3f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemDoubleClick.java
@@ -5,7 +5,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
public class TreeItemDoubleClick extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
index 8e0f39be99..780f694504 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeItemSelectionWithoutImmediate.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.tree;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
@SuppressWarnings("serial")
public class TreeItemSelectionWithoutImmediate extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
index e0996cca84..67099c39b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationScrolls.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Container;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.AlwaysFailValidator;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class TreeKeyboardNavigationScrolls extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
index cd06f0a176..8af6fc0137 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationToNone.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
/**
* Test UI for keyboard navigation for first and last tree item.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
index 9204f0495b..e9060f2827 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeKeyboardNavigationValidators.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Container;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.AlwaysFailValidator;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class TreeKeyboardNavigationValidators extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
index 409df2b18d..7d20e53a0d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.components.tree;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
public class TreeNodeCaptionWrapping extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
index 45084fd57d..90db201e46 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreePerformanceTest.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.components.tree;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
public class TreePerformanceTest extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
index 9d56a1cbbf..359f0e18bc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrolling.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.tree;
import com.vaadin.tests.components.AbstractTestCase;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.Tree;
public class TreeScrolling extends AbstractTestCase {
@@ -16,7 +16,7 @@ public class TreeScrolling extends AbstractTestCase {
LegacyWindow w = new LegacyWindow("", layout);
setMainWindow(w);
- LegacyTextField filler1 = new LegacyTextField();
+ TextField filler1 = new TextField();
RichTextArea filler2 = new RichTextArea();
Tree tree = new Tree();
for (int i = 0; i < 20; i++) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
index 8a2b263006..caf69e5b29 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnRightClick.java
@@ -4,7 +4,7 @@ import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.MouseEvents;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.ui.Tree;
/**
* Test for #12618: Trying to select item with right click in Tree causes focus
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
index ba128025cd..95ed21f17a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class TreeScrollingOnSelection extends TestBase {
private static final long serialVersionUID = 4082075610259697145L;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
index 6839e6837c..03dc8b174a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeToolTips.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.tree;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.Tree;
public class TreeToolTips extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
index a1576ffed1..e9921c1d46 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithIcons.java
@@ -8,8 +8,8 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.LoremIpsum;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.Tree;
public class TreeWithIcons extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
index d41cdd94d2..84227ed599 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/tree/Trees.java
@@ -5,26 +5,26 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.shared.ui.MultiSelectMode;
import com.vaadin.tests.components.select.AbstractSelectTestCase;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
-import com.vaadin.ui.Tree.ItemStyleGenerator;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.Tree.ItemStyleGenerator;
public class Trees extends AbstractSelectTestCase<Tree>
implements ExpandListener, CollapseListener {
private int rootItemIds = 3;
- private ItemStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Tree.ItemStyleGenerator() {
+ private ItemStyleGenerator rootGreenSecondLevelRed = new com.vaadin.v7.ui.Tree.ItemStyleGenerator() {
@Override
public String getStyle(Tree source, Object itemId) {
@@ -49,7 +49,7 @@ public class Trees extends AbstractSelectTestCase<Tree>
};
- private ItemStyleGenerator evenItemsBold = new com.vaadin.ui.Tree.ItemStyleGenerator() {
+ private ItemStyleGenerator evenItemsBold = new com.vaadin.v7.ui.Tree.ItemStyleGenerator() {
@Override
public String getStyle(Tree source, Object itemId) {
@@ -146,7 +146,7 @@ public class Trees extends AbstractSelectTestCase<Tree>
private void createItemStyleGenerator(String category) {
- LinkedHashMap<String, com.vaadin.ui.Tree.ItemStyleGenerator> options = new LinkedHashMap<String, com.vaadin.ui.Tree.ItemStyleGenerator>();
+ LinkedHashMap<String, com.vaadin.v7.ui.Tree.ItemStyleGenerator> options = new LinkedHashMap<String, com.vaadin.v7.ui.Tree.ItemStyleGenerator>();
options.put("-", null);
options.put(rootGreenSecondLevelRed.toString(),
@@ -385,10 +385,10 @@ public class Trees extends AbstractSelectTestCase<Tree>
}
};
- private Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator> itemStyleGeneratorCommand = new Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator>() {
+ private Command<Tree, com.vaadin.v7.ui.Tree.ItemStyleGenerator> itemStyleGeneratorCommand = new Command<Tree, com.vaadin.v7.ui.Tree.ItemStyleGenerator>() {
@Override
- public void execute(Tree c, com.vaadin.ui.Tree.ItemStyleGenerator value,
+ public void execute(Tree c, com.vaadin.v7.ui.Tree.ItemStyleGenerator value,
Object data) {
c.setItemStyleGenerator(value);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/AddNodesOnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
index d048f0a4f4..37cbe741d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/AddNodesOnExpand.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.treetable;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.TreeTable;
public class AddNodesOnExpand extends TestBase {
private TreeTable treetable;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
index 69cb884c07..92b14e33c4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.server.ExternalResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Link;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.TreeTable;
public class ChangeDataSourcePageLengthZero extends TestBase {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
index 8ff80204cc..3a0e2812e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
@@ -6,8 +6,8 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.TreeTable;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TreeTable;
public class ComponentsInTreeTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
index c60090d974..3da950c9bd 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DisappearingComponents.java
@@ -4,7 +4,7 @@ import com.vaadin.server.ExternalResource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Link;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
public class DisappearingComponents extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
index 484076d804..d24742bc91 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/DynamicallyModified.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.components.treetable;
import java.util.Collection;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.TreeTable;
public class DynamicallyModified extends TestBase
implements Tree.ExpandListener, Tree.CollapseListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
index 9c34efb539..ce113325d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ExpandAnimationsInChameleon.java
@@ -1,6 +1,5 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Container.Hierarchical;
import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.AbstractComponent;
@@ -8,8 +7,9 @@ import com.vaadin.ui.Alignment;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
public class ExpandAnimationsInChameleon extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
index 09477213a8..14cc5a0d08 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java
@@ -1,16 +1,16 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.TreeTable;
public class KeepAllItemsVisible extends TestBase
implements ExpandListener, CollapseListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
index f47357c9c1..38aa338948 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/MinimalWidthColumns.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.treetable;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
@Theme("valo")
public class MinimalWidthColumns extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
index c9f74dd654..dc642c8ab9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java
@@ -5,8 +5,8 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.TreeTable;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TreeTable;
public class ProgrammaticCollapse extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
index 23776a14b7..c47d258d6f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ProgrammaticSelect.java
@@ -3,13 +3,13 @@ package com.vaadin.tests.components.treetable;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.TreeTable;
public class ProgrammaticSelect extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
index 22a5d2d101..64a7e34fcc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java
@@ -15,15 +15,15 @@
*/
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
public class RemoveAllItemsRefresh extends TestBase {
protected static final String NAME_PROPERTY = "Name";
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java
index 615fb719a8..137d91bb64 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/RowHeightWithoutRows.java
@@ -1,11 +1,11 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.TreeTable;
public class RowHeightWithoutRows extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
index 35db40b966..da41209a50 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java
@@ -5,12 +5,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Ordered;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
@@ -18,14 +12,20 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Ordered;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableCacheOnPartialUpdates extends TestBase {
private Log log = new Log(5);
@@ -69,7 +69,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase {
public class Col3ColumnGenerator implements ColumnGenerator {
@Override
- public Component generateCell(final com.vaadin.ui.Table source,
+ public Component generateCell(final com.vaadin.v7.ui.Table source,
final Object itemId, Object columnId) {
TestBean tb = (TestBean) itemId;
String identifier = "Item " + itemId + "/" + columnId;
@@ -91,7 +91,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase {
public class Col4ColumnGenerator implements ColumnGenerator {
@Override
- public Component generateCell(final com.vaadin.ui.Table source,
+ public Component generateCell(final com.vaadin.v7.ui.Table source,
final Object itemId, Object columnId) {
TestBean tb = (TestBean) itemId;
String identifier = "Expand/Collapse";
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java
index 95f8c54e9e..6b15367d6b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapper.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.TreeTable;
@SuppressWarnings("serial")
public class TreeTableContainerHierarchicalWrapper extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
index eb7053ab0d..0dcdfafc11 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbar.java
@@ -6,8 +6,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableExtraScrollbar extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
index 85d7030b46..f4c6fb61a2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableExtraScrollbarWithChildren.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableExtraScrollbarWithChildren extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableInternalError.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableInternalError.java
index 1b510f1ac5..8f609f08db 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableInternalError.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableInternalError.java
@@ -5,9 +5,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.ui.TreeTable;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableInternalError extends TestBase {
private TreeTable t;
@@ -66,7 +66,7 @@ public class TreeTableInternalError extends TestBase {
public class ButtonColumnGenerator implements ColumnGenerator {
@Override
- public Component generateCell(final com.vaadin.ui.Table source,
+ public Component generateCell(final com.vaadin.v7.ui.Table source,
final Object itemId, Object columnId) {
String identifier = "Expand/Collapse";
Button btnCol = new NativeButton(identifier);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
index ebe3f0e1a8..146f54639f 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUI.java
@@ -16,8 +16,8 @@
package com.vaadin.tests.components.treetable;
import com.vaadin.tests.components.table.TableItemDescriptionGeneratorUI;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableItemDescriptionGeneratorUI
extends TableItemDescriptionGeneratorUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
index 133b024004..42c3ace099 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableModifyAndSetCollapsed extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
index 4a85ab8ca5..011906dbac 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java
@@ -20,8 +20,8 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableOutOfSync extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
index 467eaba120..41c37fcd5e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdates.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTablePartialUpdates extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
index 002ea08429..44d29bc40a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTablePartialUpdatesPageLength0 extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
index 4490d8d4b6..f0be2bbc0c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowGenerator.java
@@ -15,12 +15,12 @@
*/
package com.vaadin.tests.components.treetable;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableRowGenerator extends AbstractTestUI {
public static final String COLUMN_A = "first";
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
index 3996852686..9d0418b8f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowHeaderMode.java
@@ -4,8 +4,8 @@ import com.vaadin.server.Resource;
import com.vaadin.server.ThemeResource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table.RowHeaderMode;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.ui.TreeTable;
/**
* Test UI for RowHeaderMode.ICON_ONLY in TreeTable.
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
index b32644cd29..260a37a416 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableRowIcons.java
@@ -8,7 +8,7 @@ import com.vaadin.server.ThemeResource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableRowIcons extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
index b619835008..2c4acca19e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpand.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.components.treetable;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableScrollOnExpand extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
index 7159addb5b..4d9081dd9d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.treetable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableSetCollapsed extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
index f3ac9fc602..f5f7cc866c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableTest.java
@@ -5,17 +5,17 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.table.Tables;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.CellStyleGenerator;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.CellStyleGenerator;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableTest extends Tables<TreeTable>
implements CollapseListener, ExpandListener {
@@ -26,7 +26,7 @@ public class TreeTableTest extends Tables<TreeTable>
}
private int rootItemIds = 3;
- private CellStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Table.CellStyleGenerator() {
+ private CellStyleGenerator rootGreenSecondLevelRed = new com.vaadin.v7.ui.Table.CellStyleGenerator() {
@Override
public String getStyle(Table source, Object itemId, Object propertyId) {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java
index 25c2bed741..fd16225636 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.twincolselect;
import java.util.LinkedHashMap;
import com.vaadin.tests.components.select.AbstractSelectTestCase;
-import com.vaadin.ui.TwinColSelect;
+import com.vaadin.v7.ui.TwinColSelect;
public class TwinColSelects extends AbstractSelectTestCase<TwinColSelect> {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
index c2f640f7c8..a5edab0d08 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/ComboboxSelectedItemText.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.components.ui;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.ComboBox;
public class ComboboxSelectedItemText extends AbstractTestUIWithLog {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
index 44d0943f2d..9a540ae006 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LoadingIndicatorConfigurationTest.java
@@ -1,7 +1,5 @@
package com.vaadin.tests.components.ui;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Alignment;
@@ -9,17 +7,19 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.NativeButton;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.TextField;
public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog {
- private LegacyTextField firstDelay;
- private LegacyTextField secondDelay;
- private LegacyTextField thirdDelay;
+ private TextField firstDelay;
+ private TextField secondDelay;
+ private TextField thirdDelay;
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField delayField = new LegacyTextField("Delay (ms)");
+ final TextField delayField = new TextField("Delay (ms)");
delayField.setConverter(Integer.class);
delayField.setConvertedValue(1000);
@@ -74,9 +74,9 @@ public class LoadingIndicatorConfigurationTest extends AbstractTestUIWithLog {
}
- private LegacyTextField createIntegerTextField(String caption,
+ private TextField createIntegerTextField(String caption,
int initialValue) {
- LegacyTextField tf = new LegacyTextField(caption);
+ TextField tf = new TextField(caption);
tf.setId(caption);
tf.setConverter(Integer.class);
tf.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java b/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
index 2a7c08345d..ff6da5b4b4 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/TextAreaEventPropagation.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.FormLayout;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
+import com.vaadin.v7.ui.TextArea;
/**
* UI test for TextArea behavior when ENTER has been assigned as a keyboard
diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
index 002b372912..936d6a9b18 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIPolling.java
@@ -15,13 +15,13 @@
*/
package com.vaadin.tests.components.ui;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.MethodProperty;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.util.Log;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.MethodProperty;
+import com.vaadin.v7.ui.TextField;
public class UIPolling extends AbstractTestUIWithLog {
@@ -55,7 +55,7 @@ public class UIPolling extends AbstractTestUIWithLog {
protected void setup(VaadinRequest request) {
log = new Log(20);
log.setNumberLogRows(true);
- LegacyTextField pollingInterval = new LegacyTextField("Poll interval",
+ TextField pollingInterval = new TextField("Poll interval",
new MethodProperty<Integer>(this, "pollInterval"));
pollingInterval.setImmediate(true);
pollingInterval.setValue("-1");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
index 0592c60bed..1901c41720 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/BackButtonTest.java
@@ -1,7 +1,5 @@
package com.vaadin.tests.components.uitest;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.Page.UriFragmentChangedEvent;
import com.vaadin.server.Page.UriFragmentChangedListener;
import com.vaadin.server.VaadinRequest;
@@ -10,7 +8,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
public class BackButtonTest extends AbstractTestUI {
@@ -80,7 +80,7 @@ public class BackButtonTest extends AbstractTestUI {
}
class Page2 extends VerticalLayout {
- private final LegacyTextField f = new LegacyTextField();
+ private final TextField f = new TextField();
public Page2() {
setSizeFull();
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
index 151a92d5af..7978548c38 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/ThemeTestUI.java
@@ -5,11 +5,11 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class ThemeTestUI extends AbstractTestUI {
- private LegacyTextField customStyle;
+ private TextField customStyle;
private Button setStyleName;
private TestSampler sampler;
private String customStyleName = null;
@@ -34,7 +34,7 @@ public class ThemeTestUI extends AbstractTestUI {
}
private void createCustomStyleStringField() {
- customStyle = new LegacyTextField();
+ customStyle = new TextField();
customStyle.setId("customstyle");
setStyleName = new Button("Set stylename", new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/FormsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/FormsCssTest.java
index 1d6527e624..b6ac6e2f97 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/FormsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/FormsCssTest.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.components.uitest.components;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.tests.components.uitest.TestSampler;
import com.vaadin.tests.util.Person;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.LoginForm;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.util.BeanItem;
public class FormsCssTest extends HorizontalLayout {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
index 9c3f91c661..86458d0890 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/SelectsCssTest.java
@@ -1,16 +1,16 @@
package com.vaadin.tests.components.uitest.components;
import com.vaadin.tests.components.uitest.TestSampler;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.Select;
-import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.themes.ChameleonTheme;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.Select;
+import com.vaadin.v7.ui.TwinColSelect;
public class SelectsCssTest extends GridLayout {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
index 2d914f98f1..ab8011010c 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TablesCssTest.java
@@ -7,9 +7,9 @@ import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.uitest.TestSampler;
import com.vaadin.tests.util.TestUtils;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.themes.ChameleonTheme;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.Table;
public class TablesCssTest extends GridLayout {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
index cf0f5f9279..a304ae33f0 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TextFieldsCssTest.java
@@ -4,11 +4,11 @@ import com.vaadin.tests.components.uitest.TestSampler;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.PasswordField;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.themes.ChameleonTheme;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.TextArea;
public class TextFieldsCssTest extends GridLayout {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
index 626d9f47a0..2043faa760 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeCssTest.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.components.uitest.components;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.Action;
import com.vaadin.tests.components.uitest.TestSampler;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.Tree;
public class TreeCssTest {
private int debugIdCounter = 0;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java
index ca246698f5..23ef7d5a6d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/TreeTableCssTest.java
@@ -1,9 +1,9 @@
package com.vaadin.tests.components.uitest.components;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.uitest.TestSampler;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableCssTest {
private int debugIdCounter = 0;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java b/uitest/src/main/java/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java
index 952fe08b79..80ddbaa9da 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/DragAndDropUploadAndInteractions.java
@@ -15,11 +15,11 @@ import com.vaadin.server.StreamVariable;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.Html5File;
import com.vaadin.ui.Panel;
+import com.vaadin.v7.ui.ComboBox;
public class DragAndDropUploadAndInteractions extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java b/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
index 57874c2d41..671e46e4d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/upload/ForceSubmit.java
@@ -12,7 +12,7 @@ import com.vaadin.ui.Upload.FailedEvent;
import com.vaadin.ui.Upload.FinishedEvent;
import com.vaadin.ui.Upload.Receiver;
import com.vaadin.ui.Upload.StartedEvent;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class ForceSubmit extends TestBase implements Receiver {
@@ -29,7 +29,7 @@ public class ForceSubmit extends TestBase implements Receiver {
@Override
protected void setup() {
- final LegacyTextField textField = new LegacyTextField("Test field");
+ final TextField textField = new TextField("Test field");
addComponent(textField);
final Upload u;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
index 455fb2e531..a5c6ed7048 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java
@@ -10,9 +10,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyWindow;
public class AttachShouldBeCalledForSubWindows extends AbstractTestCase {
private static final long serialVersionUID = 1L;
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
index c6be7e1e59..30b75a356e 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/CloseModalSubWindow.java
@@ -15,16 +15,16 @@
*/
package com.vaadin.tests.components.window;
-import com.vaadin.data.Item;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.TreeTable;
import com.vaadin.ui.UI;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.TreeTable;
@SuppressWarnings("serial")
public class CloseModalSubWindow extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
index 1882f37bf3..b98694ce76 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ComboboxScrollableWindow.java
@@ -18,9 +18,9 @@ package com.vaadin.tests.components.window;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Alignment;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.ComboBox;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
index cd057f48b0..9eddcc6c69 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/DownloadAndUpdate.java
@@ -4,7 +4,7 @@ import com.vaadin.server.ExternalResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
public class DownloadAndUpdate extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java b/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
index 8184d10d85..44b04a5f9b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ExecuteJavaScript.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.window;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
public class ExecuteJavaScript extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java b/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
index 924f42632e..788b334998 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/GridInWindow.java
@@ -18,14 +18,14 @@ package com.vaadin.tests.components.window;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.Grid;
public class GridInWindow extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("Hidable column").setHidable(true);
grid.addRow("Close and reopen and it vanishes");
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
index 70d83a466b..0768f0b6d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java
@@ -8,11 +8,11 @@ import com.vaadin.tests.util.Log;
import com.vaadin.tests.util.LoremIpsum;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
import com.vaadin.ui.Window.ResizeEvent;
import com.vaadin.ui.Window.ResizeListener;
+import com.vaadin.v7.ui.LegacyWindow;
public class LazyWindowResize extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
index 3a46d8c299..b7799f3ae8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/LegacyWindowOpenTest.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.TestForWindowOpen;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyWindow;
public class LegacyWindowOpenTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
index 302d90601f..56805c35cc 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowInitialLocation.java
@@ -20,9 +20,9 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.ListSelect;
public class ModalWindowInitialLocation extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowNativeSelect.java b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
index 3713facaf0..b32ed5251d 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/ModalWindowNativeSelect.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.components.window;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.NativeSelect;
public class ModalWindowNativeSelect extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java b/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
index 7159c92700..3fa8075be9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusField.java
@@ -19,8 +19,8 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.TextArea;
public class OpenModalWindowAndFocusField extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
index ba27a48efe..54d8942b4b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocus.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class SubWindowFocus extends TestBase {
@@ -30,13 +30,13 @@ public class SubWindowFocus extends TestBase {
// some fields with tabindex
for (int i = 1; i < 4; i++) {
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
tf.setTabIndex(i);
tf.setInputPrompt("Tab index " + i);
addComponent(tf);
}
// field with tabindex 0
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
tf.setTabIndex(0);
tf.setInputPrompt("Tab index 0");
addComponent(tf);
@@ -79,7 +79,7 @@ public class SubWindowFocus extends TestBase {
});
- layout.addComponent(new LegacyTextField());
+ layout.addComponent(new TextField());
}
});
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
index 450e46eba5..72c0efb8b5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java
@@ -15,7 +15,7 @@ import com.vaadin.ui.Notification;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class SubWindowFocusAndBlurListeners extends TestBase {
@@ -38,7 +38,7 @@ public class SubWindowFocusAndBlurListeners extends TestBase {
final Window window = new Window("Focus test window", layout);
layout.setSizeUndefined();
- layout.addComponent(new LegacyTextField());
+ layout.addComponent(new TextField());
window.addFocusListener(new FocusListener() {
@Override
public void focus(FocusEvent event) {
@@ -74,7 +74,7 @@ public class SubWindowFocusAndBlurListeners extends TestBase {
main.addWindow(window);
((ComponentContainer) main.getContent())
- .addComponent(new LegacyTextField());
+ .addComponent(new TextField());
Button button = new Button("Bring to front (should focus too)",
new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowOrder.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowOrder.java
index 4585a036ff..6d9ced5d11 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowOrder.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowOrder.java
@@ -1,18 +1,18 @@
package com.vaadin.tests.components.window;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.ComboBox;
public class SubWindowOrder extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
index 8e47c608f2..8b705a418b 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.components.window;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.Table;
public class SubWindowWithUndefinedHeight extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
index 59b497cd8c..38cb1412a2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/SubWindows.java
@@ -7,10 +7,10 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class SubWindows extends TestBase {
@@ -49,8 +49,8 @@ public class SubWindows extends TestBase {
final HorizontalLayout hl = new HorizontalLayout();
autoWideWindow = new Window("Dialog - width by contents", hl);
hl.setSizeUndefined();
- hl.addComponent(new LegacyTextField("Field 1"));
- hl.addComponent(new LegacyTextField("Field 2"));
+ hl.addComponent(new TextField("Field 1"));
+ hl.addComponent(new TextField("Field 2"));
hl.addComponent(new Button("Add", new ClickListener() {
@Override
@@ -67,9 +67,9 @@ public class SubWindows extends TestBase {
VerticalLayout vl = new VerticalLayout();
vl.setMargin(true);
Window dialog = new Window("Dialog - undefined width", vl);
- vl.addComponent(new LegacyTextField("Field 1"));
+ vl.addComponent(new TextField("Field 1"));
- LegacyTextField tf2 = new LegacyTextField("Field 2");
+ TextField tf2 = new TextField("Field 2");
tf2.setWidth("500px");
vl.addComponent(tf2);
vl.addComponent(new Button("Ok"));
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
index 9c5cf7e369..47523067c9 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowCloseShortcuts.java
@@ -34,12 +34,12 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
import com.vaadin.ui.declarative.Design;
import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.ui.RichTextArea;
@Theme("valo")
@SuppressWarnings("serial")
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
index b60ef45d13..5b08d08456 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.java
@@ -1,15 +1,11 @@
package com.vaadin.tests.components.window;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.window.WindowMode;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.UI;
@@ -19,6 +15,10 @@ import com.vaadin.ui.Window.CloseEvent;
import com.vaadin.ui.Window.CloseListener;
import com.vaadin.ui.Window.WindowModeChangeEvent;
import com.vaadin.ui.Window.WindowModeChangeListener;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
public class WindowMaximizeRestoreTest extends AbstractTestUI {
Button.ClickListener addListener = new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
index 94ff75386b..f194311b19 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java
@@ -7,11 +7,11 @@ import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class WindowScrollingComponentIntoView extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
index 81996635af..b2b51cefc5 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowScrollingUp.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.window;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class WindowScrollingUp extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
index 42c70ed700..300809e420 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java
@@ -14,7 +14,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class WindowShouldRemoveActionHandler extends AbstractTestUI {
@@ -35,7 +35,7 @@ public class WindowShouldRemoveActionHandler extends AbstractTestUI {
getLayout().setMargin(new MarginInfo(true, false, false, false));
state = new Label("An UI with no action handlers.");
state.setId("state");
- addComponents(state, new LegacyTextField());
+ addComponents(state, new TextField());
addButton("Add an action handler", new Button.ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
index cbd4a622ef..1a5a7ff9f6 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java
@@ -1,23 +1,23 @@
package com.vaadin.tests.containers;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.Sizeable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class BeanItemContainerFilteringTest extends TestBase {
private Table table;
private BeanItemContainer<TestBean> container;
- private LegacyTextField filterString;
- private LegacyTextField position;
+ private TextField filterString;
+ private TextField position;
private int nextToAdd = 1;
private Label nextLabel;
@@ -81,7 +81,7 @@ public class BeanItemContainerFilteringTest extends TestBase {
VerticalLayout vl = new VerticalLayout();
// activate & deactivate filtering
- filterString = new LegacyTextField("Filter string:", "1");
+ filterString = new TextField("Filter string:", "1");
vl.addComponent(filterString);
final CheckBox cb = new CheckBox("Filter on value");
@@ -139,7 +139,7 @@ public class BeanItemContainerFilteringTest extends TestBase {
addItemAfterButton.setImmediate(true);
vl.addComponent(addItemAfterButton);
- position = new LegacyTextField("Position:", "0");
+ position = new TextField("Position:", "0");
vl.addComponent(position);
final Button addItemAtButton = new Button("addItemAt()",
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
index fb996bddb9..0edd76e5a1 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/BeanItemContainerTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.containers;
import java.util.Collection;
import java.util.LinkedList;
-import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.BeanItemContainer;
public class BeanItemContainerTest {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/uitest/src/main/java/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
index b1e080fc16..4eff474113 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java
@@ -1,17 +1,17 @@
package com.vaadin.tests.containers;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Tree;
public class HierarchicalWrapperOrdering extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
index fb60a12619..d6d5d3309a 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/IndexedContainerFilteringTest.java
@@ -1,23 +1,23 @@
package com.vaadin.tests.containers;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.Sizeable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
public class IndexedContainerFilteringTest extends TestBase {
private Table table;
private IndexedContainer container;
- private LegacyTextField filterString;
- private LegacyTextField position;
+ private TextField filterString;
+ private TextField position;
private int nextToAdd = 1;
private Label nextLabel;
@@ -48,7 +48,7 @@ public class IndexedContainerFilteringTest extends TestBase {
VerticalLayout vl = new VerticalLayout();
// activate & deactivate filtering
- filterString = new LegacyTextField("Filter string:", "1");
+ filterString = new TextField("Filter string:", "1");
vl.addComponent(filterString);
final CheckBox cb = new CheckBox("Filter");
@@ -109,7 +109,7 @@ public class IndexedContainerFilteringTest extends TestBase {
addItemAfterButton.setImmediate(true);
vl.addComponent(addItemAfterButton);
- position = new LegacyTextField("Position:", "0");
+ position = new TextField("Position:", "0");
vl.addComponent(position);
final Button addItemAtButton = new Button("addItemAt()",
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
index 8e9a5bb3af..abe62222c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/TableWithFileSystemContainer.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.containers;
import java.io.File;
-import com.vaadin.data.util.FilesystemContainer;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.FilesystemContainer;
+import com.vaadin.v7.ui.Table;
public class TableWithFileSystemContainer extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
index e9fd01ec71..ecec34905e 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/TestItemSorter.java
@@ -3,13 +3,13 @@ package com.vaadin.tests.containers;
import java.util.Collection;
import java.util.Comparator;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.DefaultItemSorter;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.DefaultItemSorter;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
public class TestItemSorter extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
index 57e2ad95ce..c8b3604fd6 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java
@@ -4,20 +4,20 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Ordered;
-import com.vaadin.data.util.FilesystemContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree.CollapseEvent;
-import com.vaadin.ui.Tree.CollapseListener;
-import com.vaadin.ui.Tree.ExpandEvent;
-import com.vaadin.ui.Tree.ExpandListener;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Ordered;
+import com.vaadin.v7.data.util.FilesystemContainer;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Tree.CollapseEvent;
+import com.vaadin.v7.ui.Tree.CollapseListener;
+import com.vaadin.v7.ui.Tree.ExpandEvent;
+import com.vaadin.v7.ui.Tree.ExpandListener;
+import com.vaadin.v7.ui.TreeTable;
public class FileSystemContainerInTreeTable extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
index 321f2ac98f..a7f9594918 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.containers.sqlcontainer;
import com.vaadin.server.LegacyApplication;
import com.vaadin.shared.ui.combobox.FilteringMode;
-import com.vaadin.ui.ComboBox;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.LegacyWindow;
/**
* See http://dev.vaadin.com/ticket/9155 .
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
index 63e4357621..0e91f3741c 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java
@@ -4,11 +4,11 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.SQLTestsConstants;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
class DatabaseHelper {
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
index 8d368bfa78..a0c9bfaf75 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java
@@ -2,18 +2,18 @@ package com.vaadin.tests.containers.sqlcontainer;
import java.sql.SQLException;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
import com.vaadin.server.LegacyApplication;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.ComponentContainer;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.ProgressIndicator;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.ui.LegacyWindow;
// author table in testdb (MySQL) is set out as follows
// +-------------+-------------+------+-----+---------+----------------+
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
index 89893a453e..05a66a73c8 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/SqlcontainertableApplication.java
@@ -1,12 +1,12 @@
package com.vaadin.tests.containers.sqlcontainer;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.LegacyApplication;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class SqlcontainertableApplication extends LegacyApplication {
private LegacyWindow mainWindow;
diff --git a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
index 12528e8c90..c4aa32bd25 100644
--- a/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
+++ b/uitest/src/main/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKey.java
@@ -4,18 +4,18 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.filter.Compare.Equal;
-import com.vaadin.data.util.sqlcontainer.SQLContainer;
-import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
-import com.vaadin.data.util.sqlcontainer.query.TableQuery;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.combobox.FilteringMode;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.filter.Compare.Equal;
+import com.vaadin.v7.data.util.sqlcontainer.SQLContainer;
+import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool;
+import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery;
+import com.vaadin.v7.ui.ComboBox;
public class TableQueryWithNonUniqueFirstPrimaryKey extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
index 731f6b6da1..8dc7547d6c 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/BrowserContextMenuInSubComponent.java
@@ -27,8 +27,8 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TextArea;
@Widgetset(TestingWidgetSet.NAME)
public class BrowserContextMenuInSubComponent extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
index f4936806e4..487772a8d0 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/GridContextClick.java
@@ -15,21 +15,21 @@
*/
package com.vaadin.tests.contextclick;
-import com.vaadin.data.Item;
import com.vaadin.shared.ui.grid.GridConstants.Section;
import com.vaadin.tests.util.PersonContainer;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.GridContextClickEvent;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.GridContextClickEvent;
public class GridContextClick
- extends AbstractContextClickUI<LegacyGrid, GridContextClickEvent> {
+ extends AbstractContextClickUI<Grid, GridContextClickEvent> {
@Override
- protected LegacyGrid createTestComponent() {
- LegacyGrid grid = new LegacyGrid(PersonContainer.createWithTestData());
+ protected Grid createTestComponent() {
+ Grid grid = new Grid(PersonContainer.createWithTestData());
grid.setFooterVisible(true);
grid.appendFooterRow();
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
index 1dcaa6af8b..94f4268fc4 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TableContextClick.java
@@ -15,14 +15,14 @@
*/
package com.vaadin.tests.contextclick;
-import com.vaadin.data.Item;
import com.vaadin.shared.ui.table.TableConstants.Section;
import com.vaadin.tests.util.PersonContainer;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableContextClickEvent;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableContextClickEvent;
public class TableContextClick
extends AbstractContextClickUI<Table, TableContextClickEvent> {
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
index 8f9fde6368..9fb144dc30 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeContextClick.java
@@ -15,8 +15,8 @@
*/
package com.vaadin.tests.contextclick;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeContextClickEvent;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeContextClickEvent;
public class TreeContextClick
extends AbstractContextClickUI<Tree, TreeContextClickEvent> {
diff --git a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
index 5982333e9c..07cd5e34dd 100644
--- a/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
+++ b/uitest/src/main/java/com/vaadin/tests/contextclick/TreeTableContextClick.java
@@ -15,14 +15,14 @@
*/
package com.vaadin.tests.contextclick;
-import com.vaadin.data.Item;
import com.vaadin.shared.ui.table.TableConstants.Section;
import com.vaadin.tests.util.PersonContainer;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table.TableContextClickEvent;
-import com.vaadin.ui.TreeTable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.Table.TableContextClickEvent;
+import com.vaadin.v7.ui.TreeTable;
public class TreeTableContextClick
extends AbstractContextClickUI<TreeTable, TableContextClickEvent> {
diff --git a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
index 6d450d5db0..890db5dcee 100644
--- a/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java
@@ -2,17 +2,17 @@ package com.vaadin.tests.converter;
import java.util.Locale;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
public class ConverterThatEnforcesAFormat extends AbstractTestUIWithLog {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField tf = new LegacyTextField(
+ final TextField tf = new TextField(
"This field should always be formatted with 3 digits");
tf.setLocale(Locale.ENGLISH);
// this is needed so that IE tests pass
diff --git a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
index ccf08a7fc7..9596784606 100644
--- a/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
+++ b/uitest/src/main/java/com/vaadin/tests/converter/StringToDoubleConverterWithThreeFractionDigits.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.converter;
import java.text.NumberFormat;
import java.util.Locale;
-import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.util.converter.StringToDoubleConverter;
public class StringToDoubleConverterWithThreeFractionDigits
- extends LegacyStringToDoubleConverter {
+ extends StringToDoubleConverter {
@Override
protected NumberFormat getFormat(Locale locale) {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
index b01ea3c163..723cdea1f4 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java
@@ -15,8 +15,8 @@ import com.vaadin.ui.DragAndDropWrapper;
import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails;
import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.Tree;
public class AcceptFromComponent extends Window {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
index 4aed1bf196..e406314c9d 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java
@@ -2,8 +2,6 @@ package com.vaadin.tests.dd;
import java.util.Collection;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.Transferable;
import com.vaadin.event.dd.DragAndDropEvent;
@@ -13,17 +11,19 @@ import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion;
import com.vaadin.server.ExternalResource;
import com.vaadin.shared.ui.dd.VerticalDropLocation;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.AcceptItem;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.Link;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeDragMode;
-import com.vaadin.ui.Tree.TreeTargetDetails;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.AbstractSelect.AcceptItem;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
+import com.vaadin.v7.ui.Tree.TreeTargetDetails;
/**
* DD playground. Better quality example/prototype codes in {@link DDTest2}.
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
index ebc09a7685..4d5b7b7506 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java
@@ -4,9 +4,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.Transferable;
import com.vaadin.event.dd.DragAndDropEvent;
@@ -20,17 +17,20 @@ import com.vaadin.server.ThemeResource;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Person;
import com.vaadin.tests.util.PersonContainer;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
-import com.vaadin.ui.AbstractSelect.AcceptItem;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableTransferable;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TargetItemAllowsChildren;
-import com.vaadin.ui.Tree.TreeDragMode;
import com.vaadin.ui.UI;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.AbstractSelect.AcceptItem;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableTransferable;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TargetItemAllowsChildren;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
public class DDTest2 extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
index c2af2cca77..b815cf0603 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java
@@ -2,8 +2,6 @@ package com.vaadin.tests.dd;
import java.util.Collection;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
@@ -14,10 +12,12 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Person;
import com.vaadin.tests.util.PersonContainer;
import com.vaadin.tests.util.TestUtils;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Table;
public class DDTest4 extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
index e2705aecba..f4357a49a1 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java
@@ -10,10 +10,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.data.util.ContainerHierarchicalWrapper;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.event.DataBoundTransferable;
@@ -42,12 +38,16 @@ import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Html5File;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeDragMode;
-import com.vaadin.ui.Tree.TreeTargetDetails;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.ContainerHierarchicalWrapper;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
+import com.vaadin.v7.ui.Tree.TreeTargetDetails;
public class DDTest6 extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
index 32082d2fe9..4c7a732974 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java
@@ -4,8 +4,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
@@ -14,10 +12,12 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Person;
import com.vaadin.tests.util.PersonContainer;
import com.vaadin.tests.util.TestUtils;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Table;
public class DDTest7 extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
index 45adff78cb..0a4a8dbe81 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java
@@ -2,8 +2,6 @@ package com.vaadin.tests.dd;
import java.util.Collection;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.Transferable;
import com.vaadin.event.dd.DragAndDropEvent;
@@ -13,10 +11,12 @@ import com.vaadin.event.dd.acceptcriteria.Or;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.dd.VerticalDropLocation;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.AbstractSelect;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeDragMode;
-import com.vaadin.ui.Tree.TreeTargetDetails;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
+import com.vaadin.v7.ui.Tree.TreeTargetDetails;
/**
* DD playground. Better quality example/prototype codes in {@link DDTest2}.
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
index ba30c32155..35744ea7e0 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSource.java
@@ -1,18 +1,18 @@
package com.vaadin.tests.dd;
-import com.vaadin.data.Item;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.event.dd.acceptcriteria.SourceIs;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.Table.TableTransferable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Table.TableTransferable;
public class NotPaintedAcceptSource extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
index 974e10eb19..4c7e399f0f 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java
@@ -1,16 +1,16 @@
package com.vaadin.tests.dd;
-import com.vaadin.data.Item;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.event.dd.acceptcriteria.SourceIs;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.Table.TableTransferable;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Table.TableTransferable;
public class NotPaintedAcceptSourceInTabSheet extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/ScrolledDropTarget.java b/uitest/src/main/java/com/vaadin/tests/dd/ScrolledDropTarget.java
index 951b9a4a57..e5889c8975 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/ScrolledDropTarget.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/ScrolledDropTarget.java
@@ -6,12 +6,12 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
import com.vaadin.shared.ui.dd.VerticalDropLocation;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
-import com.vaadin.ui.AbstractSelect.VerticalLocationIs;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.AbstractSelect.VerticalLocationIs;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
public class ScrolledDropTarget extends TestBase {
private final Log log = new Log(5);
diff --git a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
index 9c172dd6ee..3616ea8233 100644
--- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
+++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java
@@ -5,10 +5,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import com.vaadin.data.Container;
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
@@ -17,14 +13,18 @@ import com.vaadin.event.dd.acceptcriteria.Not;
import com.vaadin.event.dd.acceptcriteria.Or;
import com.vaadin.shared.ui.dd.VerticalDropLocation;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails;
-import com.vaadin.ui.AbstractSelect.VerticalLocationIs;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeDragMode;
-import com.vaadin.ui.Tree.TreeTargetDetails;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails;
+import com.vaadin.v7.ui.AbstractSelect.VerticalLocationIs;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
+import com.vaadin.v7.ui.Tree.TreeTargetDetails;
public class TreeDragStart extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
index c8d913838e..ad0d9b7137 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/DeclarativeEditor.java
@@ -22,10 +22,6 @@ import java.io.IOException;
import org.apache.commons.io.IOUtils;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ReadOnlyException;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.Property.ValueChangeNotifier;
import com.vaadin.event.FieldEvents.TextChangeEvent;
import com.vaadin.event.FieldEvents.TextChangeListener;
import com.vaadin.server.VaadinRequest;
@@ -33,11 +29,15 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.HasComponents;
import com.vaadin.ui.HorizontalSplitPanel;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.declarative.Design;
import com.vaadin.ui.declarative.DesignContext;
+import com.vaadin.v7.data.Property.ReadOnlyException;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
+import com.vaadin.v7.ui.TextArea;
@Theme("valo")
public class DeclarativeEditor extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
index a2e85a0047..670da355ef 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusCrud.java
@@ -16,16 +16,16 @@
package com.vaadin.tests.declarative;
import com.vaadin.annotations.DesignRoot;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.declarative.Design;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
@DesignRoot
public class PotusCrud extends VerticalLayout {
diff --git a/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
index d4e726e298..1eb6d21bb4 100644
--- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java
@@ -16,21 +16,21 @@
package com.vaadin.tests.declarative;
import com.vaadin.annotations.DesignRoot;
-import com.vaadin.data.fieldgroup.PropertyId;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.PopupDateField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.declarative.Design;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
@DesignRoot
public class PotusForm extends VerticalLayout {
@PropertyId("firstName")
- public LegacyTextField firstName;
+ public TextField firstName;
@PropertyId("lastName")
- public LegacyTextField lastName;
+ public TextField lastName;
@PropertyId("party")
public ComboBox party;
@PropertyId("tookOffice")
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
index 16851994db..7ba28c46f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java
@@ -19,13 +19,6 @@ import java.util.Iterator;
import java.util.Map;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.data.util.BeanItem;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.shared.util.SharedUtil;
@@ -35,7 +28,6 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
@@ -43,10 +35,18 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
import com.vaadin.v7.data.Validator.InvalidValueException;
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.TextField;
@Theme("valo")
public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
@@ -80,8 +80,8 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
formType.setWidth("300px");
formType.addItem(form);
formType.setValue(form);
- formType.addItem(new AutoGeneratedForm(LegacyTextField.class));
- formType.addItem(new AutoGeneratedForm(LegacyField.class));
+ formType.addItem(new AutoGeneratedForm(TextField.class));
+ formType.addItem(new AutoGeneratedForm(Field.class));
Iterator<?> iterator = formType.getItemIds().iterator();
formType.setItemCaption(iterator.next(), "TextField based form");
formType.setItemCaption(iterator.next(),
@@ -103,24 +103,24 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
public class CustomForm extends AbstractForm {
- private LegacyTextField firstName = new LegacyTextField("First name");
- private LegacyTextField lastName = new LegacyTextField("Last name");
- private LegacyTextField gender = new LegacyTextField("Gender");
- private LegacyTextField birthDate = new LegacyTextField("Birth date");
- private LegacyTextField age = new LegacyTextField("Age");
+ private TextField firstName = new TextField("First name");
+ private TextField lastName = new TextField("Last name");
+ private TextField gender = new TextField("Gender");
+ private TextField birthDate = new TextField("Birth date");
+ private TextField age = new TextField("Age");
private CheckBox alive = new CheckBox("Alive");
private Label errorLabel = new Label((String) null, ContentMode.HTML);
@PropertyId("address.streetAddress")
- private LegacyTextField address_streetAddress = new LegacyTextField(
+ private TextField address_streetAddress = new TextField(
"Street address");
@PropertyId("address.postalCode")
- private LegacyTextField address_postalCode = new LegacyTextField(
+ private TextField address_postalCode = new TextField(
"Postal code");
@PropertyId("address.city")
- private LegacyTextField address_city = new LegacyTextField("City");
+ private TextField address_city = new TextField("City");
@PropertyId("address.country")
- private LegacyTextField address_country = new LegacyTextField(
+ private TextField address_country = new TextField(
"Country");
public CustomForm() {
@@ -145,7 +145,7 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
birthDate.setNullRepresentation("");
- age.addValidator(new LegacyIntegerRangeValidator(
+ age.addValidator(new IntegerRangeValidator(
"Must be between 0 and 100", 0, 100));
setDefaultComponentAlignment(Alignment.MIDDLE_LEFT);
@@ -169,11 +169,11 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
// Produce error message in the order in which the fields are in the
// layout
for (Component c : this) {
- if (!(c instanceof LegacyField)) {
+ if (!(c instanceof Field)) {
continue;
}
- LegacyField<?> f = (LegacyField<?>) c;
- Map<LegacyField<?>, InvalidValueException> exceptions = e
+ Field<?> f = (Field<?>) c;
+ Map<Field<?>, InvalidValueException> exceptions = e
.getInvalidFields();
if (exceptions.containsKey(f)) {
message += f.getCaption() + ": "
@@ -202,7 +202,7 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
ComplexPerson.class) {
@Override
protected void configureField(
- com.vaadin.v7.ui.LegacyField<?> field) {
+ com.vaadin.v7.ui.Field<?> field) {
super.configureField(field);
if (field.getCaption().equals("Postal code")) {
// Last name editing is disabled through property.
@@ -248,7 +248,7 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
protected void handleCommitException(CommitException e) {
String message = "";
for (Object propertyId : e.getInvalidFields().keySet()) {
- LegacyField<?> f = e.getFieldGroup().getField(propertyId);
+ Field<?> f = e.getFieldGroup().getField(propertyId);
message += f.getCaption() + ": "
+ e.getInvalidFields().get(propertyId);
}
@@ -265,9 +265,9 @@ public abstract class AbstractBasicCrud extends AbstractTestUIWithLog {
public class AutoGeneratedForm extends AbstractForm {
- public AutoGeneratedForm(Class<? extends LegacyField> class1) {
+ public AutoGeneratedForm(Class<? extends Field> class1) {
for (String p : columns) {
- LegacyField f = fieldGroup.getFieldFactory()
+ Field f = fieldGroup.getFieldFactory()
.createField(container.getType(p), class1);
f.setCaption(SharedUtil.propertyIdToHumanFriendly(p));
fieldGroup.bind(f, p);
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
index 894944d186..827e3be162 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.fieldgroup;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Notification;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
public abstract class AbstractBeanFieldGroupTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
index b892075cc6..527a9cb1d6 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGrid.java
@@ -15,21 +15,21 @@
*/
package com.vaadin.tests.fieldgroup;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.event.SelectionEvent;
import com.vaadin.event.SelectionEvent.SelectionListener;
import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.Grid;
public class BasicCrudGrid extends AbstractBasicCrud {
- private LegacyGrid grid;
+ private Grid grid;
@Override
protected void setup(VaadinRequest request) {
super.setup(request);
- grid = new LegacyGrid();
+ grid = new Grid();
grid.setContainerDataSource(container);
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
index 51897e0f14..4644c372cc 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRow.java
@@ -18,24 +18,24 @@ package com.vaadin.tests.fieldgroup;
import java.text.DateFormat;
import java.util.Locale;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.event.SelectionEvent;
import com.vaadin.event.SelectionEvent.SelectionListener;
import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.renderers.DateRenderer;
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.renderers.DateRenderer;
public class BasicCrudGridEditorRow extends AbstractBasicCrud {
- private LegacyGrid grid;
+ private Grid grid;
@Override
protected void setup(VaadinRequest request) {
super.setup(request);
formType.setVisible(false);
- grid = new LegacyGrid();
+ grid = new Grid();
grid.setContainerDataSource(container);
@@ -52,7 +52,7 @@ public class BasicCrudGridEditorRow extends AbstractBasicCrud {
grid.setEditorEnabled(true);
grid.setSizeFull();
grid.getColumn("age").getEditorField().addValidator(
- new LegacyIntegerRangeValidator("Must be between 0 and 100", 0,
+ new IntegerRangeValidator("Must be between 0 and 100", 0,
100));
grid.getColumn("birthDate").setRenderer(new DateRenderer(
DateFormat.getDateInstance(DateFormat.MEDIUM, Locale.US)));
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
index 22e984a4c1..41ed55e43b 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicCrudTable.java
@@ -15,11 +15,11 @@
*/
package com.vaadin.tests.fieldgroup;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.Table;
public class BasicCrudTable extends AbstractBasicCrud {
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
index c3700fdf9b..edb2188c5c 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/BasicPersonForm.java
@@ -1,11 +1,5 @@
package com.vaadin.tests.fieldgroup;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitEvent;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitHandler;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.data.bean.Address;
@@ -18,23 +12,29 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.data.util.converter.LegacyStringToBooleanConverter;
-import com.vaadin.v7.data.validator.LegacyEmailValidator;
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitEvent;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitHandler;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.util.converter.StringToBooleanConverter;
+import com.vaadin.v7.data.validator.EmailValidator;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
+import com.vaadin.v7.data.validator.StringLengthValidator;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class BasicPersonForm extends AbstractTestUIWithLog {
- private LegacyTextField firstName;
+ private TextField firstName;
private TextArea lastName;
- private LegacyTextField email;
- private LegacyTextField age;
+ private TextField email;
+ private TextField age;
private Table sex;
- private LegacyTextField deceased;
+ private TextField deceased;
public class Configuration {
public boolean preCommitFails = false;
@@ -161,14 +161,14 @@ public class BasicPersonForm extends AbstractTestUIWithLog {
addComponent(commitButton);
addComponent(discardButton);
addComponent(showBean);
- email.addValidator(new LegacyEmailValidator("Must be a valid address"));
- lastName.addValidator(new LegacyStringLengthValidator(
+ email.addValidator(new EmailValidator("Must be a valid address"));
+ lastName.addValidator(new StringLengthValidator(
"Must be min 5 chars", 5, null, true));
- age.addValidator(new LegacyIntegerRangeValidator(
+ age.addValidator(new IntegerRangeValidator(
"Must be between 0 and 150, {0} is not", 0, 150));
sex.setPageLength(0);
- deceased.setConverter(new LegacyStringToBooleanConverter() {
+ deceased.setConverter(new StringToBooleanConverter() {
@Override
protected String getTrueString() {
return "YAY!";
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
index 3570448964..90ac03a67a 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/ComplexPerson.java
@@ -4,8 +4,8 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.Random;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.tests.util.TestDataGenerator;
+import com.vaadin.v7.data.util.BeanItemContainer;
public class ComplexPerson {
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
index c632fa9d73..a45e346947 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java
@@ -3,32 +3,32 @@ package com.vaadin.tests.fieldgroup;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.data.bean.Person;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Notification;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyInlineDateField;
-import com.vaadin.v7.ui.LegacyPopupDateField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.InlineDateField;
+import com.vaadin.v7.ui.PopupDateField;
+import com.vaadin.v7.ui.TextField;
public class DateForm extends AbstractTestUIWithLog {
@PropertyId("date1")
- private LegacyDateField dateField;
+ private DateField dateField;
@PropertyId("date2")
- private LegacyPopupDateField popupDateField;
+ private PopupDateField popupDateField;
@PropertyId("date3")
- private LegacyInlineDateField inlineDateField;
+ private InlineDateField inlineDateField;
@PropertyId("date4")
- private LegacyTextField textField;
+ private TextField textField;
public static class DateObject {
private Date date1, date2, date3, date4;
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
index cb657a8d91..15c205bbda 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java
@@ -1,9 +1,5 @@
package com.vaadin.tests.fieldgroup;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.data.bean.Address;
import com.vaadin.tests.data.bean.Country;
@@ -13,19 +9,23 @@ import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TextArea;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+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.ui.Table;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class FieldBinderWithBeanValidation extends TestBase {
private Log log = new Log(5);
- private LegacyTextField firstName;
+ private TextField firstName;
private TextArea lastName;
- private LegacyTextField email;
- private LegacyTextField age;
+ private TextField email;
+ private TextField age;
private Table sex;
- private LegacyTextField deceased;
+ private TextField deceased;
@Override
protected void setup() {
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
index 46d92edbf3..2e3a855202 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormBuilderWithNestedProperties.java
@@ -1,22 +1,22 @@
package com.vaadin.tests.fieldgroup;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.data.bean.Address;
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.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.TextField;
public class FormBuilderWithNestedProperties extends TestBase {
- private LegacyTextField firstName;
- private LegacyTextField lastName;
+ private TextField firstName;
+ private TextField lastName;
@PropertyId("address.streetAddress")
- private LegacyTextField streetAddress;
+ private TextField streetAddress;
@Override
protected void setup() {
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
index 77b6a667f0..9225b552f1 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/FormWithNestedProperties.java
@@ -1,27 +1,27 @@
package com.vaadin.tests.fieldgroup;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.PropertyId;
import com.vaadin.tests.data.bean.Address;
import com.vaadin.tests.data.bean.Country;
import com.vaadin.tests.data.bean.Person;
import com.vaadin.tests.data.bean.Sex;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
public class FormWithNestedProperties extends AbstractBeanFieldGroupTest {
private Log log = new Log(5);
- private LegacyTextField firstName = new LegacyTextField("First name");
- private LegacyTextField lastName = new LegacyTextField("Last name");
- private LegacyTextField email = new LegacyTextField("Email");
- private LegacyTextField age = new LegacyTextField("Age");
+ private TextField firstName = new TextField("First name");
+ private TextField lastName = new TextField("Last name");
+ private TextField email = new TextField("Email");
+ private TextField age = new TextField("Age");
@PropertyId("address.streetAddress")
- private LegacyTextField streetAddress = new LegacyTextField(
+ private TextField streetAddress = new TextField(
"Street address");
private NativeSelect country;
diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
index 2aed28e0ec..44b2c72cc2 100644
--- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
+++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/MultipleValidationErrors.java
@@ -2,16 +2,16 @@ package com.vaadin.tests.fieldgroup;
import org.apache.commons.lang.StringEscapeUtils;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.AbstractErrorMessage;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
import com.vaadin.v7.data.Validator;
-import com.vaadin.v7.data.validator.LegacyBeanValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.validator.BeanValidator;
+import com.vaadin.v7.ui.TextField;
public class MultipleValidationErrors extends AbstractTestUI {
@@ -57,9 +57,9 @@ public class MultipleValidationErrors extends AbstractTestUI {
private void bindTextField(
BeanItem<PersonBeanWithValidationAnnotations> item,
FieldGroup fieldGroup, String caption, String propertyId) {
- LegacyTextField textfield = new LegacyTextField(caption,
+ TextField textfield = new TextField(caption,
item.getItemProperty(propertyId));
- textfield.addValidator(new LegacyBeanValidator(
+ textfield.addValidator(new BeanValidator(
PersonBeanWithValidationAnnotations.class, propertyId));
fieldGroup.bind(textfield, propertyId);
diff --git a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
index 5b56c9bdd4..76df6a99ba 100644
--- a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
+++ b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java
@@ -9,24 +9,24 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.InlineDateField;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.PopupDateField;
-import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.Slider;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.TreeTable;
-import com.vaadin.ui.TwinColSelect;
-import com.vaadin.v7.ui.LegacyPasswordField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.PasswordField;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.TreeTable;
+import com.vaadin.v7.ui.TwinColSelect;
@SuppressWarnings("rawtypes")
public class TabIndexes extends AbstractTestUIWithLog {
@@ -97,7 +97,7 @@ public class TabIndexes extends AbstractTestUIWithLog {
fields.add(new ComboBox());
fields.add(new NativeSelect());
fields.add(new ListSelect());
- fields.add(new LegacyTextField());
+ fields.add(new TextField());
fields.add(new PopupDateField());
fields.add(new InlineDateField());
OptionGroup og = new OptionGroup();
@@ -114,8 +114,8 @@ public class TabIndexes extends AbstractTestUIWithLog {
tree.addItem("Item 1");
fields.add(tree);
fields.add(new TwinColSelect());
- fields.add(new LegacyPasswordField());
- fields.add(new LegacyTextField());
+ fields.add(new PasswordField());
+ fields.add(new TextField());
fields.add(new TextArea());
fields.add(new RichTextArea());
fields.add(new CheckBox());
diff --git a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
index 0ca0451ad3..c747272606 100644
--- a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
+++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java
@@ -26,36 +26,36 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.Position;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.AbstractSelect;
import com.vaadin.ui.Accordion;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.DateField;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.MenuBar.MenuItem;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Slider;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
-import com.vaadin.ui.Table.RowHeaderMode;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.Upload;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.AbstractSelect;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.TwinColSelect;
public class FontIcons extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java b/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
index 8a94497686..900743b315 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/EmbedSizeTest.java
@@ -5,7 +5,7 @@ import com.vaadin.server.Page.BrowserWindowResizeEvent;
import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.Log;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyWindow;
public class EmbedSizeTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
index e49e527975..edb41152c7 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/IntegrationTestApplication.java
@@ -1,14 +1,14 @@
package com.vaadin.tests.integration;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.ClassResource;
import com.vaadin.server.LegacyApplication;
import com.vaadin.server.Resource;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Table;
public class IntegrationTestApplication extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
index 390fc3375d..f09b790bc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java
@@ -37,7 +37,7 @@ import com.vaadin.ui.UI;
import com.vaadin.ui.Upload;
import com.vaadin.ui.Upload.Receiver;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Adapted from old PortletDemo to support integration testing.
@@ -45,7 +45,7 @@ import com.vaadin.v7.ui.LegacyTextField;
@StyleSheet("PortletConnectorResource.css")
public class JSR286Portlet extends UI {
- LegacyTextField tf = new LegacyTextField("Some value");
+ TextField tf = new TextField("Some value");
Label userInfo = new Label();
Link portletEdit = new Link();
Link portletMax = new Link();
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
index 667365e9ea..c3057b849f 100644
--- a/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/PortletSizeInLiferayFreeformLayoutApplication.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.integration;
import com.vaadin.server.LegacyApplication;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
/**
* On Liferay in a freeform layout, this application should get its height from
diff --git a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java
index b81d57eccd..e2e198e8ed 100755
--- a/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/integration/ServletIntegrationUI.java
@@ -1,17 +1,17 @@
package com.vaadin.tests.integration;
import com.vaadin.annotations.DesignRoot;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.ClassResource;
import com.vaadin.server.Resource;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.declarative.Design;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.Table;
public class ServletIntegrationUI extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
index d99c5751cb..20782e8d7e 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayouts.java
@@ -3,9 +3,6 @@ package com.vaadin.tests.layouts;
import java.util.ArrayList;
import java.util.List;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.ThemeResource;
import com.vaadin.server.UserError;
import com.vaadin.server.VaadinRequest;
@@ -21,10 +18,13 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
public class CaptionsInLayouts extends AbstractTestUI {
@@ -38,7 +38,7 @@ public class CaptionsInLayouts extends AbstractTestUI {
private HorizontalLayout horizontalLayout;
private GridLayout gridLayout;
private FormLayout formLayout;
- private List<LegacyAbstractField<?>> components = new ArrayList<LegacyAbstractField<?>>();
+ private List<AbstractField<?>> components = new ArrayList<AbstractField<?>>();
private CssLayout cssLayout;
private HorizontalLayout layoutParent = new HorizontalLayout();
@@ -71,7 +71,7 @@ public class CaptionsInLayouts extends AbstractTestUI {
}
protected void prependCaptions(String prepend) {
- for (LegacyAbstractField<?> c : components) {
+ for (AbstractField<?> c : components) {
c.setCaption(prepend + c.getCaption());
}
@@ -95,14 +95,14 @@ public class CaptionsInLayouts extends AbstractTestUI {
}
protected void setRequired(boolean value) {
- for (LegacyAbstractField<?> c : components) {
+ for (AbstractField<?> c : components) {
c.setRequired(value);
}
}
protected void setIcon(boolean value) {
- for (LegacyAbstractField<?> c : components) {
+ for (AbstractField<?> c : components) {
if (!value) {
c.setIcon(null);
} else {
@@ -121,7 +121,7 @@ public class CaptionsInLayouts extends AbstractTestUI {
}
protected void setError(boolean value) {
- for (LegacyAbstractField<?> c : components) {
+ for (AbstractField<?> c : components) {
if (value) {
c.setComponentError(new UserError("error"));
} else {
@@ -133,13 +133,13 @@ public class CaptionsInLayouts extends AbstractTestUI {
}
private void createComponents() {
- LegacyTextField tfUndefWide = new LegacyTextField(
+ TextField tfUndefWide = new TextField(
"Undefined wide text field with a very long caption, longer than the field and the layout. Lorem ipsum dolor sit amet.");
- LegacyTextField tf100pxWide = new LegacyTextField(
+ TextField tf100pxWide = new TextField(
"100 px wide text field with a very long caption, longer than 100px.");
tf100pxWide.setWidth("100px");
- LegacyTextField tf500pxWide = new LegacyTextField(
+ TextField tf500pxWide = new TextField(
"500 px wide text field with a very long caption, longer than 500px. Lorem ipsum dolor sit amet, consectetur adipiscing elit.");
tf500pxWide.setWidth("500px");
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
index f60b700448..5790f8ad50 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java
@@ -4,9 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import com.vaadin.data.HasRequired;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.ThemeResource;
import com.vaadin.server.UserError;
import com.vaadin.tests.components.TestBase;
@@ -15,7 +12,6 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.DateField;
@@ -23,12 +19,16 @@ import com.vaadin.ui.FormLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyPasswordField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.PasswordField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class CaptionsInLayoutsWaiAria extends TestBase {
@@ -196,10 +196,10 @@ public class CaptionsInLayoutsWaiAria extends TestBase {
}
private void createComponents() {
- components.add(new LegacyTextField("Default TextBox"));
+ components.add(new TextField("Default TextBox"));
components.add(new TextArea("Default TextArea."));
// components.add(new RichTextArea("Default RichtTextArea"));
- components.add(new LegacyPasswordField("Default Password"));
+ components.add(new PasswordField("Default Password"));
components.add(new DateField("Default DateField"));
// PopupDateField popupDateField = new
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
index 2573ca57fa..c3ae31717e 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java
@@ -4,9 +4,9 @@ import com.vaadin.server.Sizeable;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.TextField;
public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase {
private int cols;
@@ -35,7 +35,7 @@ public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase {
final GridLayout gl = new GridLayout(cols, 3);
gl.setWidth("1000px");
// textfield spreads across all cols
- final LegacyTextField textfield = new LegacyTextField();
+ final TextField textfield = new TextField();
textfield.setWidth(100, Sizeable.UNITS_PERCENTAGE);
Button b1 = new Button("new button");
Button b2 = new Button("nothing");
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
index 673caa310b..d8a9d3d27e 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CssLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("serial")
public class CssLayoutRemoveComponent extends TestBase {
@@ -13,7 +13,7 @@ public class CssLayoutRemoveComponent extends TestBase {
@Override
protected void setup() {
final CssLayout layout = new CssLayout();
- final LegacyTextField tf = new LegacyTextField("Caption1");
+ final TextField tf = new TextField("Caption1");
Button b = new Button("Remove field ", new ClickListener() {
@Override
@@ -24,8 +24,8 @@ public class CssLayoutRemoveComponent extends TestBase {
});
layout.addComponent(tf);
layout.addComponent(b);
- layout.addComponent(new LegacyTextField("Caption2"));
- layout.addComponent(new LegacyTextField("Caption3"));
+ layout.addComponent(new TextField("Caption2"));
+ layout.addComponent(new TextField("Caption3"));
addComponent(layout);
}
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
index 922b960652..7e5e0f34ef 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java
@@ -5,20 +5,20 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CssLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class CssLayoutRemoveComponentWithCaption extends TestBase {
@Override
protected void setup() {
final CssLayout layout = new CssLayout();
- final LegacyTextField tf = new LegacyTextField("Caption");
+ final TextField tf = new TextField("Caption");
Button b = new Button("Remove field and add new", new ClickListener() {
@Override
public void buttonClick(ClickEvent event) {
layout.removeComponent(tf);
- addComponent(new LegacyTextField("new field"));
+ addComponent(new TextField("new field"));
}
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/DeepComponentTrees.java b/uitest/src/main/java/com/vaadin/tests/layouts/DeepComponentTrees.java
index 643612d254..c985117ab6 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/DeepComponentTrees.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/DeepComponentTrees.java
@@ -1,16 +1,16 @@
package com.vaadin.tests.layouts;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.ComboBox;
public class DeepComponentTrees extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
index 76a3dba08f..149519ba3c 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.layouts;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.FormLayout;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class FormLayoutWithInvisibleComponent extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
index e6161e77d3..d90facb9c9 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java
@@ -6,9 +6,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.TextField;
public class GridLayoutExpandRatioModification extends TestBase
implements ClickListener {
@@ -36,7 +36,7 @@ public class GridLayoutExpandRatioModification extends TestBase
// The bottom layout
vl2 = new VerticalLayout();
- LegacyTextField tf = new LegacyTextField("The bottom/right field");
+ TextField tf = new TextField("The bottom/right field");
tf.setHeight("100%");
tf.setWidth("100%");
vl2.addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
index bdda348005..9947ade6e4 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/GridLayoutInsidePanel2.java
@@ -4,7 +4,7 @@ import com.vaadin.server.LegacyApplication;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
+import com.vaadin.v7.ui.LegacyWindow;
public class GridLayoutInsidePanel2 extends LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
index 45a7db8893..918fa1f461 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/HtmlInCaption.java
@@ -21,8 +21,6 @@ import com.vaadin.ui.AbsoluteLayout;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ColorPicker;
-import com.vaadin.ui.ColorPickerArea;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.GridLayout;
@@ -32,7 +30,9 @@ import com.vaadin.ui.NativeButton;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ColorPicker;
+import com.vaadin.v7.ui.ColorPickerArea;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -131,7 +131,7 @@ public class HtmlInCaption extends AbstractTestUI {
}
private Component tf(boolean htmlCaption) {
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
if (htmlCaption) {
tf.setCaptionAsHtml(htmlCaption);
tf.setCaption(getHtmlCaption(""));
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
index 1f8a477314..4ec406129d 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/LayoutPerformanceTests.java
@@ -15,10 +15,10 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
public class LayoutPerformanceTests extends TestBase {
private static final String[] widths = { null, "100%", "200px" };
@@ -138,7 +138,7 @@ public class LayoutPerformanceTests extends TestBase {
TEXT_FIELD {
@Override
public Component createContent() {
- return new LegacyTextField("Field label");
+ return new TextField("Field label");
}
},
HORIZONTAL_LAYOUT {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
index 22ac9506f0..87bed151d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java
@@ -4,14 +4,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.AbsoluteLayout;
import com.vaadin.ui.Accordion;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.FormLayout;
@@ -25,6 +22,9 @@ import com.vaadin.ui.SingleComponentContainer;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.VerticalSplitPanel;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
public class MovingComponentsWhileOldParentInvisible extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
index 184d327834..d40bd2da8c 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/MovingInvisibleField.java
@@ -5,7 +5,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("serial")
public class MovingInvisibleField extends TestBase {
@@ -15,9 +15,9 @@ public class MovingInvisibleField extends TestBase {
final VerticalLayout layout1 = new VerticalLayout();
final VerticalLayout layout2 = new VerticalLayout();
- final LegacyTextField tfHidden = new LegacyTextField(
+ final TextField tfHidden = new TextField(
"Hidden text field caption", "A hidden text field");
- final LegacyTextField tfVisible = new LegacyTextField(
+ final TextField tfVisible = new TextField(
"Visible text field caption", "A visible text field");
tfHidden.setVisible(false);
Button b = new Button("Move hidden textfield to other layout");
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
index 3881223c10..e8e7c2ea99 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutBasics.java
@@ -16,11 +16,11 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class OrderedLayoutBasics extends TestBase {
@@ -140,7 +140,7 @@ public class OrderedLayoutBasics extends TestBase {
ol.setWidth("");
ol.setCaption("Fixed height (200px) and dynamic width");
- LegacyTextField tf = new LegacyTextField(
+ TextField tf = new TextField(
"100px high TextField, valign: bottom");
tf.setHeight("100px");
tf.setWidth("");
@@ -182,14 +182,14 @@ public class OrderedLayoutBasics extends TestBase {
ol.setWidth("");
ol.setCaption("Fixed height (50px) and dynamic width");
- LegacyTextField tf = new LegacyTextField(
+ TextField tf = new TextField(
"100px high TextField, valign: bottom, should be partly outside");
tf.setHeight("100px");
tf.setWidth("");
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_LEFT);
- tf = new LegacyTextField(
+ tf = new TextField(
"100% high, 50px wide TextField, valign: bottom, should fill full height");
tf.setHeight("100%");
tf.setWidth("50px");
@@ -229,21 +229,21 @@ public class OrderedLayoutBasics extends TestBase {
ol.setHeight("");
ol.setWidth("500px");
ol.setCaption("Fixed width (500px) and dynamic height");
- LegacyTextField tf;
+ TextField tf;
- tf = new LegacyTextField("100px high TextField, valign: bottom");
+ tf = new TextField("100px high TextField, valign: bottom");
tf.setHeight("100px");
tf.setWidth("100%");
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_LEFT);
- tf = new LegacyTextField("100px high TextField, valign: top");
+ tf = new TextField("100px high TextField, valign: top");
tf.setHeight("100px");
tf.setWidth("100%");
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.TOP_LEFT);
- tf = new LegacyTextField(
+ tf = new TextField(
"100% high, 50px wide TextField, valign: bottom");
tf.setHeight("100%");
tf.setWidth("50px");
@@ -285,21 +285,21 @@ public class OrderedLayoutBasics extends TestBase {
// ol.setWidth("500px");
ol.setWidth("");
ol.setCaption("Dynamic width and fixed height(300px)");
- LegacyTextField tf;
+ TextField tf;
- tf = new LegacyTextField("100px high TextField, valign: bottom");
+ tf = new TextField("100px high TextField, valign: bottom");
tf.setHeight("100px");
tf.setWidth("100%");
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_LEFT);
- tf = new LegacyTextField("100px high TextField, valign: top");
+ tf = new TextField("100px high TextField, valign: top");
tf.setHeight("100px");
tf.setWidth("100%");
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.TOP_LEFT);
- tf = new LegacyTextField(
+ tf = new TextField(
"100% high, 50px wide TextField, valign: bottom");
tf.setHeight("100%");
tf.setWidth("50px");
@@ -803,15 +803,15 @@ public class OrderedLayoutBasics extends TestBase {
// ol.setWidth("");
ol.setCaption("Caption test with dynamic width");
- LegacyTextField tf;
- tf = new LegacyTextField("Short caption");
+ TextField tf;
+ tf = new TextField("Short caption");
ol.addComponent(tf);
- tf = new LegacyTextField(
+ tf = new TextField(
"A very long caption which is probably much longer than the field");
ol.addComponent(tf);
- tf = new LegacyTextField(
+ tf = new TextField(
"A very long caption which is probably much longer than the field and includes indicators");
tf.setRequired(true);
tf.setComponentError(new UserError("abc123"));
@@ -841,14 +841,14 @@ public class OrderedLayoutBasics extends TestBase {
// ol.setWidth("");
ol.setCaption("Caption test with fixed size");
- LegacyTextField tf;
- tf = new LegacyTextField("Short caption");
+ TextField tf;
+ tf = new TextField("Short caption");
tf.setValue("Undefined width");
tf.setComponentError(new UserError("123"));
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_RIGHT);
- tf = new LegacyTextField(
+ tf = new TextField(
"A long caption which is probably much longer than the field");
tf.setValue("Undefined width");
tf.setRequired(true);
@@ -856,7 +856,7 @@ public class OrderedLayoutBasics extends TestBase {
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_RIGHT);
- tf = new LegacyTextField(
+ tf = new TextField(
"A very long caption which is probably much longer than the field and includes indicators");
tf.setValue("Undefined width");
tf.setIcon(new ThemeResource("icons/16/document-add.png"));
@@ -890,8 +890,8 @@ public class OrderedLayoutBasics extends TestBase {
// ol.setWidth("");
ol.setCaption("Caption test with fixed width (700x250)");
- LegacyTextField tf;
- tf = new LegacyTextField("Short caption");
+ TextField tf;
+ tf = new TextField("Short caption");
tf.setSizeFull();
tf.setValue("100% wide field, ratio 1");
@@ -900,7 +900,7 @@ public class OrderedLayoutBasics extends TestBase {
ol.setComponentAlignment(tf, Alignment.BOTTOM_RIGHT);
ol.setExpandRatio(tf, 1);
- tf = new LegacyTextField(
+ tf = new TextField(
"A long caption which is probably much longer than the field");
tf.setValue("100% wide field, ratio 2");
tf.setSizeFull();
@@ -910,7 +910,7 @@ public class OrderedLayoutBasics extends TestBase {
ol.setComponentAlignment(tf, Alignment.BOTTOM_RIGHT);
ol.setExpandRatio(tf, 2);
- tf = new LegacyTextField(
+ tf = new TextField(
"A very long caption which is probably much longer than the field and includes indicators");
tf.setValue("100% wide field, ratio 3");
tf.setSizeFull();
@@ -946,15 +946,15 @@ public class OrderedLayoutBasics extends TestBase {
// ol.setWidth("");
ol.setCaption("Caption test with fixed width");
- LegacyTextField tf;
- tf = new LegacyTextField("Short caption");
+ TextField tf;
+ tf = new TextField("Short caption");
tf.setValue("250px wide field");
tf.setWidth("250px");
tf.setComponentError(new UserError("123"));
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_RIGHT);
- tf = new LegacyTextField(
+ tf = new TextField(
"A long caption which is probably much longer than the field");
tf.setWidth("250px");
tf.setValue("250px wide field");
@@ -963,7 +963,7 @@ public class OrderedLayoutBasics extends TestBase {
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_RIGHT);
- tf = new LegacyTextField(
+ tf = new TextField(
"A very long caption which is probably much longer than the field and includes indicators");
tf.setValue("200px wide field");
tf.setWidth("200px");
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
index 90dc5f68d3..fa943f33ca 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/OrderedLayoutCSSCompatibility.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.layouts;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class OrderedLayoutCSSCompatibility extends TestBase {
@@ -21,8 +21,8 @@ public class OrderedLayoutCSSCompatibility extends TestBase {
HorizontalLayout l = new HorizontalLayout();
l.setMargin(true);
l.setSpacing(true);
- l.addComponent(new LegacyTextField("abc"));
- l.addComponent(new LegacyTextField("def"));
+ l.addComponent(new TextField("abc"));
+ l.addComponent(new TextField("def"));
addComponent(l);
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
index bbbc60a4bd..349c709228 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/RelativeSizeInUndefinedCssLayout.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.FormLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class RelativeSizeInUndefinedCssLayout extends AbstractTestUI {
@@ -37,7 +37,7 @@ public class RelativeSizeInUndefinedCssLayout extends AbstractTestUI {
cssLayout.addComponent(formLayout);
- LegacyTextField tf = new LegacyTextField("Enter something");
+ TextField tf = new TextField("Enter something");
tf.setWidth("100%");
formLayout.addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index ae007794e4..39d1ec9dd7 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutClickListeners.java
@@ -12,9 +12,9 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TextArea;
public class TestLayoutClickListeners extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
index dfc72399a9..72be418a22 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java
@@ -11,9 +11,9 @@ import com.vaadin.ui.CssLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
public class TestLayoutPerformance extends TestBase {
private NativeSelect ns;
@@ -55,7 +55,7 @@ public class TestLayoutPerformance extends TestBase {
ns2.setNullSelectionAllowed(false);
ns2.setValue(Label.class);
- final LegacyTextField n = new LegacyTextField("Number of components");
+ final TextField n = new TextField("Number of components");
n.setValue("1000");
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
index 257e0174d5..f7cc37a80e 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/TreeWithBordersInLayout.java
@@ -2,9 +2,9 @@ package com.vaadin.tests.layouts;
import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.Tree;
public class TreeWithBordersInLayout extends AbstractTestCase {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
index 3b708b1a82..b9964afb75 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java
@@ -5,9 +5,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.LegacyWindow;
+import com.vaadin.v7.ui.TextField;
public class VerticalLayoutExpandRatioModification extends TestBase
implements ClickListener {
@@ -35,7 +35,7 @@ public class VerticalLayoutExpandRatioModification extends TestBase
// The bottom layout
vl2 = new VerticalLayout();
- LegacyTextField tf = new LegacyTextField("The bottom field");
+ TextField tf = new TextField("The bottom field");
tf.setHeight("100%");
vl2.addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
index 28edca3249..ffb7d4e80e 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutMoveComponent.java
@@ -6,7 +6,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class GridLayoutMoveComponent extends AbstractTestUI {
@@ -21,7 +21,7 @@ public class GridLayoutMoveComponent extends AbstractTestUI {
final Label l = new Label("100% label");
final Button b = new Button("100px button");
b.setWidth("100px");
- final LegacyTextField tf = new LegacyTextField("Undef textfield");
+ final TextField tf = new TextField("Undef textfield");
// Adding component to grid
grid.addComponent(l, 0, 0);
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
index 64e5998eca..16bbdc0209 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/gridlayout/GridLayoutWidthChange.java
@@ -8,7 +8,7 @@ import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class GridLayoutWidthChange extends AbstractTestUI {
@@ -20,7 +20,7 @@ public class GridLayoutWidthChange extends AbstractTestUI {
fields1.addComponent(nb);
VerticalLayout fields3 = new VerticalLayout();
- fields3.addComponent(new LegacyTextField("field14"));
+ fields3.addComponent(new TextField("field14"));
NativeButton b = new NativeButton("A big button");
b.setWidth("200px");
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
index a270835e3f..ebdb8fdcff 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java
@@ -24,8 +24,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -78,7 +78,7 @@ public class BaseAddReplaceMove extends BaseLayoutTestUI {
@Override
public void buttonClick(ClickEvent event) {
- l2.addComponent(new LegacyTextField());
+ l2.addComponent(new TextField());
}
});
btnReplace.addClickListener(new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseCaption.java
index 31c918820e..2c83163288 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseCaption.java
@@ -17,8 +17,8 @@ package com.vaadin.tests.layouts.layouttester;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.AbstractLayout;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.ComboBox;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
index 4256968dc4..f504ce70d8 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseIcon.java
@@ -18,11 +18,11 @@ package com.vaadin.tests.layouts.layouttester;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.AbstractLayout;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
import com.vaadin.ui.TabSheet;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -40,7 +40,7 @@ public class BaseIcon extends BaseLayoutTestUI {
@Override
protected void setup(VaadinRequest request) {
init();
- l1.addComponent(createLabelsFields(LegacyTextField.class, true, ""));
+ l1.addComponent(createLabelsFields(TextField.class, true, ""));
l1.addComponent(createLabelsFields(Label.class, true, ""));
l1.addComponent(createLabelsFields(Button.class, true, ""));
l2.addComponent(createLabelsFields(ComboBox.class, true, ""));
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
index d0201c0b83..ca7fc72c3a 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java
@@ -19,7 +19,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.AbstractLayout;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
index b5f6a0679a..6295bbce70 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
@@ -22,7 +22,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
index 568afd2620..4c1d9a1b3a 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
@@ -32,9 +32,9 @@ import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -93,7 +93,7 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI {
private void fillComponents() {
for (int i = 0; i < components.length; i++) {
String name = "Field" + i;
- LegacyTextField field = new LegacyTextField();
+ TextField field = new TextField();
field.setValue(name);
components[i] = field;
}
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
index dae15c41ed..857b7e51ce 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseRegError.java
@@ -19,12 +19,12 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.AbstractLayout;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TabSheet;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -49,7 +49,7 @@ public class BaseRegError extends BaseLayoutTestUI {
l1.addComponent(createLabelsFields(Label.class, true, ""));
l1.addComponent(createLabelsFields(Button.class, true, ""));
l1.addComponent(createLabelsFields(TabSheet.class, true, ""));
- l1.addComponent(createLabelsFields(LegacyTextField.class, true, ""));
+ l1.addComponent(createLabelsFields(TextField.class, true, ""));
l2.addComponent(createLabelsFields(ComboBox.class, true, ""));
l2.addComponent(createLabelsFields(DateField.class, true, ""));
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
index c549830429..a07e97ab1f 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java
@@ -23,8 +23,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -74,7 +74,7 @@ public class GridAddReplaceMove extends GridBaseLayoutTestUI {
@Override
public void buttonClick(ClickEvent event) {
- layout.addComponent(new LegacyTextField());
+ layout.addComponent(new TextField());
}
});
btnReplace.addClickListener(new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java
index 74f9782c4b..96a1fbbd1b 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridCaption.java
@@ -17,9 +17,9 @@ package com.vaadin.tests.layouts.layouttester.GridLayout;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
+import com.vaadin.v7.ui.ComboBox;
public class GridCaption extends GridBaseLayoutTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
index 3e751fb5a5..9708de292f 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java
@@ -17,11 +17,11 @@ package com.vaadin.tests.layouts.layouttester.GridLayout;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.Link;
import com.vaadin.ui.TabSheet;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -32,7 +32,7 @@ public class GridIcon extends GridBaseLayoutTestUI {
@Override
protected void setup(VaadinRequest request) {
layout.addComponent(
- createLabelsFields(LegacyTextField.class, true, ""));
+ createLabelsFields(TextField.class, true, ""));
layout.addComponent(createLabelsFields(Label.class, true, ""));
layout.addComponent(createLabelsFields(Button.class, true, ""));
layout.addComponent(createLabelsFields(ComboBox.class, true, ""));
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
index b065dca4f2..5a5d64f791 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.layouts.layouttester.GridLayout;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
index f133b89c5d..8287f443a8 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
@@ -21,7 +21,7 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
index 723cba8102..115c5458e2 100644
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java
@@ -18,12 +18,12 @@ package com.vaadin.tests.layouts.layouttester.GridLayout;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TabSheet;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -44,7 +44,7 @@ public class GridLayoutRegError extends GridBaseLayoutTestUI {
layout.addComponent(createLabelsFields(Button.class, true, ""));
layout.addComponent(createLabelsFields(TabSheet.class, true, ""));
layout.addComponent(
- createLabelsFields(LegacyTextField.class, true, ""));
+ createLabelsFields(TextField.class, true, ""));
layout.addComponent(createLabelsFields(ComboBox.class, true, ""));
layout.addComponent(createLabelsFields(DateField.class, true, ""));
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java
index 0d63df5e95..27364fe6b9 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/broadcastingmessages/BroadcasterUI.java
@@ -7,9 +7,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TextArea;
@Push
public class BroadcasterUI extends UI implements BroadcastListener {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
index 25f2ed6544..342f0ada14 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/CookieMonsterUI.java
@@ -9,7 +9,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Notification;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Tutorial example for
@@ -25,7 +25,7 @@ public class CookieMonsterUI extends UI {
layout.setMargin(true);
setContent(layout);
- final LegacyTextField nameField = new LegacyTextField();
+ final TextField nameField = new TextField();
layout.addComponent(nameField);
// Read previously stored cookie value
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
index 44d90d145e..e57fae53e2 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v70/SimpleLoginView.java
@@ -9,19 +9,19 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.v7.data.validator.LegacyAbstractValidator;
-import com.vaadin.v7.data.validator.LegacyEmailValidator;
-import com.vaadin.v7.ui.LegacyPasswordField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.validator.AbstractValidator;
+import com.vaadin.v7.data.validator.EmailValidator;
+import com.vaadin.v7.ui.PasswordField;
+import com.vaadin.v7.ui.TextField;
public class SimpleLoginView extends CustomComponent
implements View, Button.ClickListener {
public static final String NAME = "login";
- private final LegacyTextField user;
+ private final TextField user;
- private final LegacyPasswordField password;
+ private final PasswordField password;
private final Button loginButton;
@@ -29,16 +29,16 @@ public class SimpleLoginView extends CustomComponent
setSizeFull();
// Create the user input field
- user = new LegacyTextField("User:");
+ user = new TextField("User:");
user.setWidth("300px");
user.setRequired(true);
user.setInputPrompt("Your username (eg. joe@email.com)");
user.addValidator(
- new LegacyEmailValidator("Username must be an email address"));
+ new EmailValidator("Username must be an email address"));
user.setInvalidAllowed(false);
// Create the password input field
- password = new LegacyPasswordField("Password:");
+ password = new PasswordField("Password:");
password.setWidth("300px");
password.addValidator(new PasswordValidator());
password.setRequired(true);
@@ -74,7 +74,7 @@ public class SimpleLoginView extends CustomComponent
* Validator for validating the passwords
*/
private static final class PasswordValidator
- extends LegacyAbstractValidator<String> {
+ extends AbstractValidator<String> {
public PasswordValidator() {
super("The password provided is not valid");
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
index 9c38102840..9c7fe6378e 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java
@@ -2,8 +2,6 @@ package com.vaadin.tests.minitutorials.v71beta;
import java.util.Arrays;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.Page;
import com.vaadin.server.Page.Styles;
import com.vaadin.server.VaadinRequest;
@@ -11,17 +9,19 @@ import com.vaadin.shared.ui.MarginInfo;
import com.vaadin.shared.ui.colorpicker.Color;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Alignment;
-import com.vaadin.ui.ColorPicker;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.components.colorpicker.ColorChangeEvent;
-import com.vaadin.ui.components.colorpicker.ColorChangeListener;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ColorPicker;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeEvent;
+import com.vaadin.v7.ui.components.colorpicker.ColorChangeListener;
public class CSSInjectWithColorpicker extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
index 4fd1eb52a2..e8759a1910 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_3/ThemeChangeUI.java
@@ -17,11 +17,11 @@ package com.vaadin.tests.minitutorials.v7_3;
import java.util.Arrays;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.UI;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.ComboBox;
public class ThemeChangeUI extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
index c9d6162631..a638222519 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringColumnWidths.java
@@ -17,16 +17,16 @@ package com.vaadin.tests.minitutorials.v7_4;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.SelectionMode;
import com.vaadin.ui.UI;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.SelectionMode;
@Theme("valo")
public class ConfiguringColumnWidths extends UI {
@Override
protected void init(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid(GridExampleHelper.createContainer());
+ Grid grid = new Grid(GridExampleHelper.createContainer());
grid.setSelectionMode(SelectionMode.NONE);
grid.setColumnOrder("name", "amount", "count");
@@ -35,31 +35,31 @@ public class ConfiguringColumnWidths extends UI {
setContent(grid);
}
- private void setupCase1(LegacyGrid grid) {
+ private void setupCase1(Grid grid) {
grid.getColumn("name").setExpandRatio(1);
}
- private void setupCase2(LegacyGrid grid) {
+ private void setupCase2(Grid grid) {
grid.getColumn("name").setExpandRatio(1);
grid.getColumn("amount").setWidth(100);
grid.getColumn("count").setWidth(100);
}
- private void setupCase3(LegacyGrid grid) {
+ private void setupCase3(Grid grid) {
grid.setWidth("400px");
grid.getColumn("name").setExpandRatio(1);
grid.getColumn("amount").setWidth(100);
grid.getColumn("count").setWidth(100);
}
- private void setupCase4(LegacyGrid grid) {
+ private void setupCase4(Grid grid) {
grid.setWidth("400px");
grid.getColumn("name").setMinimumWidth(250);
grid.getColumn("amount").setWidth(100);
grid.getColumn("count").setWidth(100);
}
- private void setupCase5(LegacyGrid grid) {
+ private void setupCase5(Grid grid) {
grid.setWidth("400px");
grid.setFrozenColumnCount(1);
grid.getColumn("name").setMinimumWidth(250);
@@ -67,7 +67,7 @@ public class ConfiguringColumnWidths extends UI {
grid.getColumn("count").setWidth(100);
}
- private void setupCase6(LegacyGrid grid) {
+ private void setupCase6(Grid grid) {
grid.setWidth("700px");
grid.setFrozenColumnCount(1);
grid.getColumn("name").setMinimumWidth(250);
@@ -75,12 +75,12 @@ public class ConfiguringColumnWidths extends UI {
grid.getColumn("count").setWidth(100);
}
- private void setupCase(LegacyGrid grid, int number) {
+ private void setupCase(Grid grid, int number) {
if (number == 0) {
return;
}
try {
- getClass().getDeclaredMethod("setupCase" + number, LegacyGrid.class)
+ getClass().getDeclaredMethod("setupCase" + number, Grid.class)
.invoke(this, grid);
} catch (Exception e) {
throw new RuntimeException(e);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
index b509bce922..3ca84ecf15 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ConfiguringGridHeadersAndFooters.java
@@ -18,17 +18,17 @@ package com.vaadin.tests.minitutorials.v7_4;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.Button;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.FooterCell;
-import com.vaadin.ui.LegacyGrid.HeaderCell;
-import com.vaadin.ui.LegacyGrid.HeaderRow;
import com.vaadin.ui.UI;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.FooterCell;
+import com.vaadin.v7.ui.Grid.HeaderCell;
+import com.vaadin.v7.ui.Grid.HeaderRow;
@Theme("valo")
public class ConfiguringGridHeadersAndFooters extends UI {
@Override
protected void init(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid(GridExampleHelper.createContainer());
+ Grid grid = new Grid(GridExampleHelper.createContainer());
grid.setColumnOrder("name", "amount", "count");
grid.getDefaultHeaderRow().getCell("amount")
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
index 016d6b94bf..d3321b3b88 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/FormattingDataInGrid.java
@@ -20,21 +20,21 @@ import java.util.Locale;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.CellReference;
-import com.vaadin.ui.LegacyGrid.CellStyleGenerator;
import com.vaadin.ui.UI;
-import com.vaadin.ui.renderers.HtmlRenderer;
-import com.vaadin.ui.renderers.NumberRenderer;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.CellReference;
+import com.vaadin.v7.ui.Grid.CellStyleGenerator;
+import com.vaadin.v7.ui.renderers.HtmlRenderer;
+import com.vaadin.v7.ui.renderers.NumberRenderer;
@Theme("valo")
public class FormattingDataInGrid extends UI {
@Override
protected void init(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid(GridExampleHelper.createContainer());
+ Grid grid = new Grid(GridExampleHelper.createContainer());
setContent(grid);
@@ -59,11 +59,11 @@ public class FormattingDataInGrid extends UI {
grid.getColumn("amount").setRenderer(poundRenderer);
grid.getColumn("count")
- .setConverter(new LegacyStringToIntegerConverter() {
+ .setConverter(new StringToIntegerConverter() {
@Override
public String convertToPresentation(Integer value,
Class<? extends String> targetType, Locale locale)
- throws LegacyConverter.ConversionException {
+ throws Converter.ConversionException {
String stringRepresentation = super.convertToPresentation(
value, targetType, locale);
if (value.intValue() % 2 == 0) {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
index 140f53f023..1d7943d1d1 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/GridExampleHelper.java
@@ -15,7 +15,7 @@
*/
package com.vaadin.tests.minitutorials.v7_4;
-import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.BeanItemContainer;
public class GridExampleHelper {
public static BeanItemContainer<GridExampleBean> createContainer() {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
index 4c3b93e390..ed9fe507f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/ShowingInlineDataInGrid.java
@@ -18,15 +18,15 @@ package com.vaadin.tests.minitutorials.v7_4;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.grid.HeightMode;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.UI;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class ShowingInlineDataInGrid extends UI {
@Override
protected void init(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("Name").setSortable(true);
grid.addColumn("Score", Integer.class);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
index 72ec28c209..24df2fdb4a 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_4/UsingGridWithAContainer.java
@@ -16,13 +16,13 @@
package com.vaadin.tests.minitutorials.v7_4;
import com.vaadin.server.VaadinRequest;
-import com.vaadin.ui.LegacyGrid;
import com.vaadin.ui.UI;
+import com.vaadin.v7.ui.Grid;
public class UsingGridWithAContainer extends UI {
@Override
protected void init(VaadinRequest request) {
- LegacyGrid grid = new LegacyGrid();
+ Grid grid = new Grid();
grid.setContainerDataSource(GridExampleHelper.createContainer());
grid.getColumn("name").setHeaderCaption("Bean name");
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
index c7bbcbe026..094e887426 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7_5/ShowingExtraDataForRows.java
@@ -26,17 +26,17 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.Image;
import com.vaadin.ui.Label;
-import com.vaadin.ui.LegacyGrid;
-import com.vaadin.ui.LegacyGrid.DetailsGenerator;
-import com.vaadin.ui.LegacyGrid.RowReference;
import com.vaadin.ui.Notification;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.DetailsGenerator;
+import com.vaadin.v7.ui.Grid.RowReference;
public class ShowingExtraDataForRows extends UI {
@Override
protected void init(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.setContainerDataSource(GridExampleHelper.createContainer());
grid.setDetailsGenerator(new DetailsGenerator() {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
index 4ed019337e..07ffab84a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/AutoGeneratingForm.java
@@ -16,12 +16,12 @@
package com.vaadin.tests.minitutorials.v7a1;
-import com.vaadin.data.fieldgroup.BeanFieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.data.fieldgroup.BeanFieldGroup;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.util.BeanItem;
/**
* Mini tutorial code for
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
index 74ed83a51b..818df35a1f 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CreatingPreserveState.java
@@ -21,7 +21,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Mini tutorial code for
@@ -39,7 +39,7 @@ public class CreatingPreserveState extends UI {
@Override
public void init(VaadinRequest request) {
- LegacyTextField tf = new LegacyTextField(
+ TextField tf = new TextField(
"Instance #" + (++instanceCounter));
tf.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
index 93a1c112bc..a97cc6af2f 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/CustomConverterFactoryUI.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.minitutorials.v7a1;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class CustomConverterFactoryUI extends AbstractTestUI {
@Override
public void setup(VaadinRequest request) {
getSession().setConverterFactory(new MyConverterFactory());
- LegacyTextField tf = new LegacyTextField("This is my double field");
+ TextField tf = new TextField("This is my double field");
tf.setImmediate(true);
tf.setConverter(Double.class);
addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
index bc977da249..bf2aecc102 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormUsingExistingLayout.java
@@ -1,13 +1,13 @@
package com.vaadin.tests.minitutorials.v7a1;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.PropertyId;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.TextArea;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.fieldgroup.PropertyId;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class FormUsingExistingLayout extends AbstractTestUI {
@@ -49,8 +49,8 @@ public class FormUsingExistingLayout extends AbstractTestUI {
}
public static class MyFormLayout extends GridLayout {
- private LegacyTextField firstName = new LegacyTextField("First name");
- private LegacyTextField lastName = new LegacyTextField("Last name");
+ private TextField firstName = new TextField("First name");
+ private TextField lastName = new TextField("Last name");
// The name of the property is by default the name of the member field,
// but it can be redefined with the @PropertyId annotation
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
index 2ecb34f795..4dd2f960cc 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/FormatTableValue.java
@@ -5,8 +5,8 @@ import java.util.Locale;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
-import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.util.converter.StringToDoubleConverter;
+import com.vaadin.v7.ui.Table;
public class FormatTableValue extends AbstractTestUI {
@@ -31,7 +31,7 @@ public class FormatTableValue extends AbstractTestUI {
.setValue(3.1415);
table.setConverter(PERCENT_PROPERTY,
- new LegacyStringToDoubleConverter() {
+ new StringToDoubleConverter() {
@Override
protected NumberFormat getFormat(Locale locale) {
return NumberFormat.getPercentInstance(locale);
@@ -39,7 +39,7 @@ public class FormatTableValue extends AbstractTestUI {
});
table.setConverter(CURRENCY_PROPERTY,
- new LegacyStringToDoubleConverter() {
+ new StringToDoubleConverter() {
@Override
protected NumberFormat getFormat(Locale locale) {
return NumberFormat.getCurrencyInstance(locale);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
index 918d2f4b71..cbda57bbc0 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java
@@ -1,7 +1,5 @@
package com.vaadin.tests.minitutorials.v7a1;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
@@ -9,7 +7,9 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.ui.TextField;
public class IntegerTextFieldDataSource extends AbstractTestUI {
@@ -32,7 +32,7 @@ public class IntegerTextFieldDataSource extends AbstractTestUI {
final Property<Integer> integerProperty = beanItem
.getItemProperty("value");
- final LegacyTextField textField = new LegacyTextField("Text field",
+ final TextField textField = new TextField("Text field",
integerProperty);
Button submitButton = new Button("Submit value", new ClickListener() {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
index e1e0601a20..2d9ecb274a 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java
@@ -7,16 +7,16 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
-import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.converter.Converter.ConversionException;
+import com.vaadin.v7.data.util.converter.StringToIntegerConverter;
+import com.vaadin.v7.ui.TextField;
public class IntegerTextFieldStandalone extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyTextField textField = new LegacyTextField("Text field");
- textField.setConverter(new LegacyStringToIntegerConverter());
+ final TextField textField = new TextField("Text field");
+ textField.setConverter(new StringToIntegerConverter());
Button submitButton = new Button("Submit value", new ClickListener() {
@Override
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
index 0278653ae4..5c1d2f1a6d 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyConverterFactory.java
@@ -1,15 +1,15 @@
package com.vaadin.tests.minitutorials.v7a1;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.DefaultConverterFactory;
-public class MyConverterFactory extends LegacyDefaultConverterFactory {
+public class MyConverterFactory extends DefaultConverterFactory {
@Override
- protected <PRESENTATION, MODEL> LegacyConverter<PRESENTATION, MODEL> findConverter(
+ protected <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> findConverter(
Class<PRESENTATION> presentationType, Class<MODEL> modelType) {
// Handle String <-> Double
if (presentationType == String.class && modelType == Double.class) {
- return (LegacyConverter<PRESENTATION, MODEL>) new MyStringToDoubleConverter();
+ return (Converter<PRESENTATION, MODEL>) new MyStringToDoubleConverter();
}
// Let default factory handle the rest
return super.findConverter(presentationType, modelType);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
index c376dce865..576d420b56 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/MyStringToDoubleConverter.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.minitutorials.v7a1;
import java.text.NumberFormat;
import java.util.Locale;
-import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter;
+import com.vaadin.v7.data.util.converter.StringToDoubleConverter;
-public class MyStringToDoubleConverter extends LegacyStringToDoubleConverter {
+public class MyStringToDoubleConverter extends StringToDoubleConverter {
@Override
protected NumberFormat getFormat(Locale locale) {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
index 9bd379c301..17b6101b15 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java
@@ -8,9 +8,9 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Notification;
-import com.vaadin.v7.data.util.converter.LegacyConverter;
-import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.converter.Converter;
+import com.vaadin.v7.data.util.converter.Converter.ConversionException;
+import com.vaadin.v7.ui.TextField;
public class StringMyTypeConverter extends AbstractTestUI {
@@ -18,7 +18,7 @@ public class StringMyTypeConverter extends AbstractTestUI {
protected void setup(VaadinRequest request) {
Name name = new Name("Rudolph", "Reindeer");
- final LegacyTextField textField = new LegacyTextField("Name");
+ final TextField textField = new TextField("Name");
textField.setConverter(new StringToNameConverter());
textField.setConvertedValue(name);
@@ -50,7 +50,7 @@ public class StringMyTypeConverter extends AbstractTestUI {
}
-class StringToNameConverter implements LegacyConverter<String, Name> {
+class StringToNameConverter implements Converter<String, Name> {
@Override
public Name convertToModel(String text, Class<? extends Name> targetType,
Locale locale) throws ConversionException {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
index 003f7c9923..06932cbb9c 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7a1/UsingBeanValidation.java
@@ -20,11 +20,11 @@ import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.Size;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.server.VaadinRequest;
import com.vaadin.ui.UI;
-import com.vaadin.v7.data.validator.LegacyBeanValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.util.BeanItem;
+import com.vaadin.v7.data.validator.BeanValidator;
+import com.vaadin.v7.ui.TextField;
/**
* Mini tutorial code for
@@ -74,12 +74,12 @@ public class UsingBeanValidation extends UI {
Person person = new Person("John", 26);
BeanItem<Person> item = new BeanItem<Person>(person);
- LegacyTextField firstName = new LegacyTextField("First name",
+ TextField firstName = new TextField("First name",
item.getItemProperty("name"));
firstName.setImmediate(true);
setContent(firstName);
- firstName.addValidator(new LegacyBeanValidator(Person.class, "name"));
+ firstName.addValidator(new BeanValidator(Person.class, "name"));
}
}
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
index 146432789a..9da431b97a 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b5/SettingReadingSessionAttributesUI.java
@@ -23,7 +23,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
//Remove comment to preserve UI value when reloading
//@PreserveOnRefresh
@@ -32,7 +32,7 @@ public class SettingReadingSessionAttributesUI extends UI {
private String value;
private VerticalLayout statusHolder = new VerticalLayout();
- private LegacyTextField textField = new LegacyTextField();
+ private TextField textField = new TextField();
@Override
protected void init(VaadinRequest request) {
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
index 7d29c874cc..497977bf67 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/LoginView.java
@@ -10,8 +10,8 @@ import com.vaadin.ui.Notification;
import com.vaadin.ui.Panel;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyPasswordField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.PasswordField;
+import com.vaadin.v7.ui.TextField;
public class LoginView extends Panel implements View {
@@ -21,10 +21,10 @@ public class LoginView extends Panel implements View {
final String fragmentAndParameters) {
Layout layout = new VerticalLayout();
- final LegacyTextField email = new LegacyTextField("Email");
+ final TextField email = new TextField("Email");
layout.addComponent(email);
- final LegacyPasswordField password = new LegacyPasswordField(
+ final PasswordField password = new PasswordField(
"Password");
layout.addComponent(password);
diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
index 1053255e87..2c19ac03d7 100644
--- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
+++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v7b9/SettingsView.java
@@ -2,9 +2,6 @@ package com.vaadin.tests.minitutorials.v7b9;
import java.util.Date;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.ObjectProperty;
import com.vaadin.navigator.Navigator;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener;
@@ -17,15 +14,18 @@ import com.vaadin.ui.Notification.Type;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyInlineDateField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.InlineDateField;
public class SettingsView extends Panel implements View {
public static String NAME = "settings";
Navigator navigator;
- LegacyDateField date;
+ DateField date;
Button apply;
Button cancel;
@@ -35,7 +35,7 @@ public class SettingsView extends Panel implements View {
this.navigator = navigator;
Layout layout = new VerticalLayout();
- date = new LegacyInlineDateField("Birth date");
+ date = new InlineDateField("Birth date");
date.setImmediate(true);
layout.addComponent(date);
// pretend we have a datasource:
diff --git a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
index 62aa8eec86..276e7e90d5 100644
--- a/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/navigator/NavigatorTest.java
@@ -13,11 +13,11 @@ import com.vaadin.tests.util.Log;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.Table;
public class NavigatorTest extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
index 4e351628a3..a858d408bd 100644
--- a/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/performance/BasicPerformanceTest.java
@@ -12,10 +12,10 @@ import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.Reindeer;
+import com.vaadin.v7.ui.TextArea;
public class BasicPerformanceTest extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
index 7c1177d58f..2819eb00fe 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java
@@ -19,13 +19,13 @@ import java.util.Timer;
import java.util.TimerTask;
import com.vaadin.annotations.Push;
-import com.vaadin.data.util.ObjectProperty;
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.Button.ClickEvent;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.util.ObjectProperty;
@Push
public class BasicPush extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
index e59c66e1f6..ca4f325bce 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java
@@ -19,13 +19,13 @@ import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
-import com.vaadin.data.util.ObjectProperty;
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.Button.ClickEvent;
import com.vaadin.ui.Label;
+import com.vaadin.v7.data.util.ObjectProperty;
public class PushConfiguration extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
index d08b2fa8c1..73fec4026c 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java
@@ -22,8 +22,6 @@ package com.vaadin.tests.push;
import java.util.ArrayList;
import java.util.Collections;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.shared.communication.PushMode;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.shared.ui.ui.Transport;
@@ -33,11 +31,13 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.PushConfiguration;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -48,8 +48,8 @@ public class PushConfigurator extends VerticalLayout {
private NativeSelect pushMode = new NativeSelect("Push mode");
private NativeSelect transport = new NativeSelect("Transport");
private NativeSelect fallbackTransport = new NativeSelect("Fallback");
- private LegacyTextField parameter = new LegacyTextField("Parameter");
- private LegacyTextField value = new LegacyTextField("Value");
+ private TextField parameter = new TextField("Parameter");
+ private TextField value = new TextField("Value");
private Button set = new Button("Set");
private HorizontalLayout paramValue = new HorizontalLayout();
private VerticalLayout vl = new VerticalLayout();
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
index e73f776b3b..533e69b28b 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushErrorHandling.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import com.vaadin.data.util.AbstractInMemoryContainer;
-import com.vaadin.data.util.BeanContainer;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.event.ItemClickEvent.ItemClickListener;
import com.vaadin.server.ErrorHandler;
@@ -16,7 +14,9 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.AbstractInMemoryContainer;
+import com.vaadin.v7.data.util.BeanContainer;
+import com.vaadin.v7.ui.Table;
public class PushErrorHandling extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
index 0e06854736..2d4a1a0fc8 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/PushLargeData.java
@@ -30,7 +30,7 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.UI;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public abstract class PushLargeData extends AbstractTestUIWithLog {
@@ -51,20 +51,20 @@ public abstract class PushLargeData extends AbstractTestUIWithLog {
private final ExecutorService executor = Executors
.newSingleThreadExecutor();
- protected LegacyTextField dataSize;
+ protected TextField dataSize;
- protected LegacyTextField interval;
+ protected TextField interval;
- protected LegacyTextField duration;
+ protected TextField duration;
@Override
protected void setup(VaadinRequest request) {
dataLabel.setSizeUndefined();
- dataSize = new LegacyTextField("Data size");
+ dataSize = new TextField("Data size");
dataSize.setConverter(Integer.class);
- interval = new LegacyTextField("Interval (ms)");
+ interval = new TextField("Interval (ms)");
interval.setConverter(Integer.class);
- duration = new LegacyTextField("Duration (ms)");
+ duration = new TextField("Duration (ms)");
duration.setConverter(Integer.class);
dataSize.setValue(DEFAULT_SIZE_BYTES + "");
diff --git a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
index 3925b80fc6..8cbb4c0007 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/RoundTripTest.java
@@ -23,7 +23,7 @@ import com.vaadin.tests.widgetset.server.RoundTripTester;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
@Widgetset(TestingWidgetSet.NAME)
public class RoundTripTest extends AbstractTestUI {
@@ -31,7 +31,7 @@ public class RoundTripTest extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
final RoundTripTester roundTripTester = new RoundTripTester();
- final LegacyTextField payloadSize = new LegacyTextField(
+ final TextField payloadSize = new TextField(
"Payload size (bytes)");
payloadSize.setConverter(Integer.class);
payloadSize.setConvertedValue(10000);
@@ -39,7 +39,7 @@ public class RoundTripTest extends AbstractTestUI {
payloadSize.setValue(request.getParameter("payload"));
}
addComponent(payloadSize);
- final LegacyTextField testDuration = new LegacyTextField(
+ final TextField testDuration = new TextField(
"Test duration (ms)");
testDuration.setConverter(Integer.class);
testDuration.setConvertedValue(10000);
diff --git a/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java b/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java
index e41f769724..4e9372ad40 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/SendMultibyteCharacters.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.push;
import com.vaadin.annotations.Push;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
@Push
public class SendMultibyteCharacters extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
index fe2dbef59e..a0874d30be 100644
--- a/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
+++ b/uitest/src/main/java/com/vaadin/tests/push/TablePushStreaming.java
@@ -20,13 +20,13 @@
package com.vaadin.tests.push;
import com.vaadin.annotations.Push;
-import com.vaadin.data.Container;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.ui.ui.Transport;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.Table;
/**
*
diff --git a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
index 472819a2cb..ff2f39959b 100644
--- a/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/rpclogger/RPCLoggerUI.java
@@ -30,9 +30,9 @@ import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ListSelect;
import com.vaadin.ui.Notification;
import com.vaadin.ui.Notification.Type;
+import com.vaadin.v7.ui.ListSelect;
public class RPCLoggerUI extends AbstractTestUIWithLog implements ErrorHandler {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java b/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
index 862636fa3b..f3e9dbeed7 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ButtonsTest.java
@@ -7,8 +7,8 @@ import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.LegacyWindow;
import com.vaadin.ui.NativeButton;
+import com.vaadin.v7.ui.LegacyWindow;
@SuppressWarnings("serial")
public class ButtonsTest extends com.vaadin.server.LegacyApplication {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
index 0612d5f855..fec4399d63 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java
@@ -12,7 +12,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class CSSInjectTest extends TestBase {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
index 9579888e6d..d289787adf 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/LegacyComponentThemeChange.java
@@ -25,13 +25,13 @@ import com.vaadin.tests.util.PersonContainer;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.MenuBar.MenuItem;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Table;
@Theme("reindeer")
public class LegacyComponentThemeChange extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
index ad1e0745d5..982afb2562 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/ThemeChangeOnTheFly.java
@@ -27,9 +27,9 @@ import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Image;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
+import com.vaadin.v7.ui.Table;
@Theme("reindeer")
public class ThemeChangeOnTheFly extends AbstractTestUIWithLog {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
index e627c700e3..2cc53bbdd1 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CalendarTest.java
@@ -8,12 +8,6 @@ import java.util.TimeZone;
import com.vaadin.annotations.Theme;
import com.vaadin.data.Binder;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.fieldgroup.FieldGroup.CommitException;
-import com.vaadin.data.util.BeanItem;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.shared.ui.combobox.FilteringMode;
@@ -23,34 +17,40 @@ import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Calendar;
-import com.vaadin.ui.Calendar.TimeFormat;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick;
-import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
-import com.vaadin.ui.components.calendar.event.BasicEvent;
-import com.vaadin.ui.components.calendar.event.BasicEventProvider;
-import com.vaadin.ui.components.calendar.event.CalendarEvent;
-import com.vaadin.ui.components.calendar.handler.BasicDateClickHandler;
-import com.vaadin.ui.components.calendar.handler.BasicWeekClickHandler;
import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.LegacyDateField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+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.ui.Calendar;
+import com.vaadin.v7.ui.Calendar.TimeFormat;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.DateField;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventClickHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectEvent;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.RangeSelectHandler;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick;
+import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHandler;
+import com.vaadin.v7.ui.components.calendar.event.BasicEvent;
+import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider;
+import com.vaadin.v7.ui.components.calendar.event.CalendarEvent;
+import com.vaadin.v7.ui.components.calendar.handler.BasicDateClickHandler;
+import com.vaadin.v7.ui.components.calendar.handler.BasicWeekClickHandler;
/** Calendar component test application */
@Theme("valo-test")
@@ -97,7 +97,7 @@ public class CalendarTest extends GridLayout implements View {
private CheckBox readOnlyButton;
- private LegacyTextField captionField;
+ private TextField captionField;
private Window scheduleEventPopup;
@@ -143,8 +143,8 @@ public class CalendarTest extends GridLayout implements View {
private boolean useSecondResolution;
- private LegacyDateField startDateField;
- private LegacyDateField endDateField;
+ private DateField startDateField;
+ private DateField endDateField;
public CalendarTest() {
setSizeFull();
@@ -466,7 +466,7 @@ public class CalendarTest extends GridLayout implements View {
captionField = createTextField("Caption");
captionField.setInputPrompt("Event name");
captionField.setRequired(true);
- final LegacyTextField whereField = createTextField("Where");
+ final TextField whereField = createTextField("Where");
whereField.setInputPrompt("Address or location");
final TextArea descriptionField = createTextArea("Description");
descriptionField.setInputPrompt("Describe the event");
@@ -506,8 +506,8 @@ public class CalendarTest extends GridLayout implements View {
return cb;
}
- private LegacyTextField createTextField(String caption) {
- LegacyTextField f = new LegacyTextField(caption);
+ private TextField createTextField(String caption) {
+ TextField f = new TextField(caption);
f.setNullRepresentation("");
return f;
}
@@ -518,8 +518,8 @@ public class CalendarTest extends GridLayout implements View {
return f;
}
- private LegacyDateField createDateField(String caption) {
- LegacyDateField f = new LegacyDateField(caption);
+ private DateField createDateField(String caption) {
+ DateField f = new DateField(caption);
if (useSecondResolution) {
f.setResolution(Resolution.SECOND);
} else {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
index 270966141d..788d9d29f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CheckBoxes.java
@@ -15,15 +15,15 @@
*/
package com.vaadin.tests.themes.valo;
-import com.vaadin.data.Item;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.ui.OptionGroup;
public class CheckBoxes extends VerticalLayout implements View {
public CheckBoxes() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java
index f21d6bbdc3..2981001530 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CollapsibleTableColumn.java
@@ -16,10 +16,10 @@
package com.vaadin.tests.themes.valo;
import com.vaadin.annotations.Theme;
-import com.vaadin.data.util.BeanItemContainer;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.data.util.BeanItemContainer;
+import com.vaadin.v7.ui.Table;
/**
* Test UI for non-collapsible column distinction in the table.
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
index b3bba48cf4..7a7ae821e1 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ColorPickers.java
@@ -18,12 +18,12 @@ package com.vaadin.tests.themes.valo;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.shared.ui.colorpicker.Color;
-import com.vaadin.ui.AbstractColorPicker.PopupStyle;
-import com.vaadin.ui.ColorPicker;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.AbstractColorPicker.PopupStyle;
+import com.vaadin.v7.ui.ColorPicker;
public class ColorPickers extends VerticalLayout implements View {
public ColorPickers() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
index 8e803f8b6b..a5e273a4c1 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ComboBoxes.java
@@ -20,12 +20,12 @@ import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.server.ThemeResource;
import com.vaadin.server.UserError;
import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.ComboBox;
public class ComboBoxes extends VerticalLayout implements View {
public ComboBoxes() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
index 5c2e67e9d3..0daa8a23a0 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/CommonParts.java
@@ -15,8 +15,6 @@
*/
package com.vaadin.tests.themes.valo;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.event.ShortcutAction.KeyCode;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
@@ -45,13 +43,15 @@ import com.vaadin.ui.Panel;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;
import com.vaadin.ui.TabSheet.SelectedTabChangeListener;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
import com.vaadin.ui.Window.CloseEvent;
import com.vaadin.ui.Window.CloseListener;
import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class CommonParts extends VerticalLayout implements View {
public CommonParts() {
@@ -145,13 +145,13 @@ public class CommonParts extends VerticalLayout implements View {
Panel p = new Panel("Notifications");
VerticalLayout content = new VerticalLayout() {
Notification notification = new Notification("");
- LegacyTextField title = new LegacyTextField("Title");
+ TextField title = new TextField("Title");
TextArea description = new TextArea("Description");
MenuBar style = new MenuBar();
MenuBar type = new MenuBar();
String typeString = "";
String styleString = "";
- LegacyTextField delay = new LegacyTextField();
+ TextField delay = new TextField();
{
setSpacing(true);
setMargin(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
index 07cf951e45..cae1dbc29b 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java
@@ -18,9 +18,6 @@ package com.vaadin.tests.themes.valo;
import java.util.Date;
import java.util.Locale;
-import com.vaadin.data.fieldgroup.FieldGroup;
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.data.util.PropertysetItem;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.server.UserError;
@@ -36,6 +33,9 @@ import com.vaadin.ui.InlineDateField;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.fieldgroup.FieldGroup;
+import com.vaadin.v7.data.util.ObjectProperty;
+import com.vaadin.v7.data.util.PropertysetItem;
public class DateFields extends VerticalLayout implements View {
public DateFields() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
index b7a231763a..7812e78ba7 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/FormLayoutInsideTable.java
@@ -5,8 +5,8 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Table;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.Table;
@Theme(ValoTheme.THEME_NAME)
public class FormLayoutInsideTable extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
index 9b46a8eba2..e35318209f 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Forms.java
@@ -26,17 +26,17 @@ import com.vaadin.ui.Button;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.OptionGroup;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -64,7 +64,7 @@ public class Forms extends VerticalLayout implements View {
form.addComponent(section);
StringGenerator sg = new StringGenerator();
- LegacyTextField name = new LegacyTextField("Name");
+ TextField name = new TextField("Name");
name.setValue(sg.nextString(true) + " " + sg.nextString(true));
name.setWidth("50%");
form.addComponent(name);
@@ -73,7 +73,7 @@ public class Forms extends VerticalLayout implements View {
birthday.setValue(new Date(80, 0, 31));
form.addComponent(birthday);
- LegacyTextField username = new LegacyTextField("Username");
+ TextField username = new TextField("Username");
username.setValue(sg.nextString(false) + sg.nextString(false));
username.setRequired(true);
form.addComponent(username);
@@ -90,20 +90,20 @@ public class Forms extends VerticalLayout implements View {
section.addStyleName(ValoTheme.LABEL_COLORED);
form.addComponent(section);
- LegacyTextField email = new LegacyTextField("Email");
+ TextField email = new TextField("Email");
email.setValue(
sg.nextString(false) + "@" + sg.nextString(false) + ".com");
email.setWidth("50%");
email.setRequired(true);
form.addComponent(email);
- LegacyTextField location = new LegacyTextField("Location");
+ TextField location = new TextField("Location");
location.setValue(sg.nextString(true) + ", " + sg.nextString(true));
location.setWidth("50%");
location.setComponentError(new UserError("This address doesn't exist"));
form.addComponent(location);
- LegacyTextField phone = new LegacyTextField("Phone");
+ TextField phone = new TextField("Phone");
phone.setWidth("50%");
form.addComponent(phone);
@@ -131,7 +131,7 @@ public class Forms extends VerticalLayout implements View {
section.addStyleName(ValoTheme.LABEL_COLORED);
form.addComponent(section);
- LegacyTextField website = new LegacyTextField("Website");
+ TextField website = new TextField("Website");
website.setInputPrompt("http://");
website.setWidth("100%");
form.addComponent(website);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java
index 0c445ceed0..c50c75c314 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/GridDisabled.java
@@ -4,14 +4,14 @@ import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
-import com.vaadin.ui.LegacyGrid;
+import com.vaadin.v7.ui.Grid;
@Theme("valo")
public class GridDisabled extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- final LegacyGrid grid = new LegacyGrid();
+ final Grid grid = new Grid();
grid.addColumn("foo", String.class);
grid.addRow("Foo");
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
index 5bb7720307..65fd66a353 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/NativeSelects.java
@@ -19,11 +19,11 @@ import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.TwinColSelect;
public class NativeSelects extends VerticalLayout implements View {
public NativeSelects() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java
index 4d95a9c5f0..95d7541d08 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableSortIndicator.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.themes.valo;
import com.vaadin.annotations.Theme;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
@Theme("valo")
public class TableSortIndicator extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
index 36c9dc3289..62d9987b6c 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TableWithEmptyCaption.java
@@ -20,7 +20,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.Button;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Table;
+import com.vaadin.v7.ui.Table;
@Theme("valo")
public class TableWithEmptyCaption extends AbstractTestUI {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
index 5d5091a4b1..032dd55039 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Tables.java
@@ -15,7 +15,6 @@
*/
package com.vaadin.tests.themes.valo;
-import com.vaadin.data.Container;
import com.vaadin.data.HasValue;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
@@ -25,23 +24,24 @@ import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.ui.Button;
import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.OptionGroup;
import com.vaadin.ui.ProgressBar;
import com.vaadin.ui.Slider;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.Table.Align;
-import com.vaadin.ui.Table.ColumnGenerator;
-import com.vaadin.ui.Table.RowHeaderMode;
-import com.vaadin.ui.Table.TableDragMode;
-import com.vaadin.ui.TreeTable;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.OptionGroup;
+import com.vaadin.v7.ui.Table;
+import com.vaadin.v7.ui.Table.Align;
+import com.vaadin.v7.ui.Table.ColumnGenerator;
+import com.vaadin.v7.ui.Table.RowHeaderMode;
+import com.vaadin.v7.ui.Table.TableDragMode;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.TreeTable;
public class Tables extends VerticalLayout implements View {
@@ -178,13 +178,13 @@ public class Tables extends VerticalLayout implements View {
table.removeGeneratedColumn("progress");
if (componentsInRows) {
- table.addContainerProperty("textfield", LegacyTextField.class,
+ table.addContainerProperty("textfield", TextField.class,
null);
table.addGeneratedColumn("textfield", new ColumnGenerator() {
@Override
public Object generateCell(Table source, Object itemId,
Object columnId) {
- LegacyTextField tf = new LegacyTextField();
+ TextField tf = new TextField();
tf.setInputPrompt("Type here…");
// tf.addStyleName(ValoTheme.TABLE_COMPACT);
if ((Integer) itemId % 2 == 0) {
@@ -194,7 +194,7 @@ public class Tables extends VerticalLayout implements View {
}
});
- table.addContainerProperty("datefield", LegacyTextField.class,
+ table.addContainerProperty("datefield", TextField.class,
null);
table.addGeneratedColumn("datefield", new ColumnGenerator() {
@Override
@@ -209,7 +209,7 @@ public class Tables extends VerticalLayout implements View {
}
});
- table.addContainerProperty("combobox", LegacyTextField.class, null);
+ table.addContainerProperty("combobox", TextField.class, null);
table.addGeneratedColumn("combobox", new ColumnGenerator() {
@Override
public Object generateCell(Table source, Object itemId,
@@ -235,7 +235,7 @@ public class Tables extends VerticalLayout implements View {
}
});
- table.addContainerProperty("label", LegacyTextField.class, null);
+ table.addContainerProperty("label", TextField.class, null);
table.addGeneratedColumn("label", new ColumnGenerator() {
@Override
public Object generateCell(Table source, Object itemId,
@@ -247,7 +247,7 @@ public class Tables extends VerticalLayout implements View {
}
});
- table.addContainerProperty("checkbox", LegacyTextField.class, null);
+ table.addContainerProperty("checkbox", TextField.class, null);
table.addGeneratedColumn("checkbox", new ColumnGenerator() {
@Override
public Object generateCell(Table source, Object itemId,
@@ -257,7 +257,7 @@ public class Tables extends VerticalLayout implements View {
}
});
- table.addContainerProperty("optiongroup", LegacyTextField.class,
+ table.addContainerProperty("optiongroup", TextField.class,
null);
table.addGeneratedColumn("optiongroup", new ColumnGenerator() {
@Override
@@ -271,7 +271,7 @@ public class Tables extends VerticalLayout implements View {
}
});
- table.addContainerProperty("slider", LegacyTextField.class, null);
+ table.addContainerProperty("slider", TextField.class, null);
table.addGeneratedColumn("slider", new ColumnGenerator() {
@Override
public Object generateCell(Table source, Object itemId,
@@ -282,7 +282,7 @@ public class Tables extends VerticalLayout implements View {
}
});
- table.addContainerProperty("progress", LegacyTextField.class, null);
+ table.addContainerProperty("progress", TextField.class, null);
table.addGeneratedColumn("progress", new ColumnGenerator() {
@Override
public Object generateCell(Table source, Object itemId,
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
index 33236adf6b..7d924c876d 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/TextFields.java
@@ -24,11 +24,11 @@ import com.vaadin.ui.CssLayout;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.PasswordField;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
public class TextFields extends VerticalLayout implements View {
private TestIcon testIcon = new TestIcon(140);
@@ -45,87 +45,87 @@ public class TextFields extends VerticalLayout implements View {
row.setSpacing(true);
addComponent(row);
- LegacyTextField tf = new LegacyTextField("Normal");
+ TextField tf = new TextField("Normal");
tf.setInputPrompt("First name");
tf.setIcon(testIcon.get());
row.addComponent(tf);
- tf = new LegacyTextField("Custom color");
+ tf = new TextField("Custom color");
tf.setInputPrompt("Email");
tf.addStyleName("color1");
row.addComponent(tf);
- tf = new LegacyTextField("User Color");
+ tf = new TextField("User Color");
tf.setInputPrompt("Gender");
tf.addStyleName("color2");
row.addComponent(tf);
- tf = new LegacyTextField("Themed");
+ tf = new TextField("Themed");
tf.setInputPrompt("Age");
tf.addStyleName("color3");
row.addComponent(tf);
- tf = new LegacyTextField("Error");
+ tf = new TextField("Error");
tf.setValue("Something’s wrong");
tf.setComponentError(new UserError("Fix it, now!"));
row.addComponent(tf);
- tf = new LegacyTextField("Error, borderless");
+ tf = new TextField("Error, borderless");
tf.setValue("Something’s wrong");
tf.setComponentError(new UserError("Fix it, now!"));
tf.addStyleName(ValoTheme.TEXTFIELD_BORDERLESS);
row.addComponent(tf);
- tf = new LegacyTextField("Read-only");
+ tf = new TextField("Read-only");
tf.setInputPrompt("Nationality");
tf.setValue("Finnish");
tf.setReadOnly(true);
row.addComponent(tf);
- tf = new LegacyTextField("Small");
+ tf = new TextField("Small");
tf.setValue("Field value");
tf.addStyleName(ValoTheme.TEXTFIELD_SMALL);
row.addComponent(tf);
- tf = new LegacyTextField("Large");
+ tf = new TextField("Large");
tf.setValue("Field value");
tf.addStyleName(ValoTheme.TEXTFIELD_LARGE);
tf.setIcon(testIcon.get(true));
row.addComponent(tf);
- tf = new LegacyTextField("Icon inside");
+ tf = new TextField("Icon inside");
tf.setInputPrompt("Ooh, an icon");
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.setIcon(testIcon.get());
row.addComponent(tf);
- tf = new LegacyTextField("Large, Icon inside");
+ tf = new TextField("Large, Icon inside");
tf.setInputPrompt("Ooh, an icon");
tf.addStyleName(ValoTheme.TEXTFIELD_LARGE);
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.setIcon(testIcon.get());
row.addComponent(tf);
- tf = new LegacyTextField("Small, Icon inside");
+ tf = new TextField("Small, Icon inside");
tf.setInputPrompt("Ooh, an icon");
tf.addStyleName(ValoTheme.TEXTFIELD_SMALL);
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.setIcon(testIcon.get());
row.addComponent(tf);
- tf = new LegacyTextField("16px supported by default");
+ tf = new TextField("16px supported by default");
tf.setInputPrompt("Image icon");
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.setIcon(testIcon.get(true, 16));
row.addComponent(tf);
- tf = new LegacyTextField();
+ tf = new TextField();
tf.setValue("Font, no caption");
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.setIcon(testIcon.get());
row.addComponent(tf);
- tf = new LegacyTextField();
+ tf = new TextField();
tf.setValue("Image, no caption");
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.setIcon(testIcon.get(true, 16));
@@ -135,7 +135,7 @@ public class TextFields extends VerticalLayout implements View {
group.addStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP);
row.addComponent(group);
- tf = new LegacyTextField();
+ tf = new TextField();
tf.setInputPrompt("Grouped with a button");
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.setIcon(testIcon.get());
@@ -146,19 +146,19 @@ public class TextFields extends VerticalLayout implements View {
// button.addStyleName(ValoTheme.BUTTON_PRIMARY);
group.addComponent(button);
- tf = new LegacyTextField("Borderless");
+ tf = new TextField("Borderless");
tf.setInputPrompt("Write here…");
tf.addStyleName(ValoTheme.TEXTFIELD_INLINE_ICON);
tf.addStyleName(ValoTheme.TEXTFIELD_BORDERLESS);
tf.setIcon(testIcon.get());
row.addComponent(tf);
- tf = new LegacyTextField("Right-aligned");
+ tf = new TextField("Right-aligned");
tf.setValue("1,234");
tf.addStyleName(ValoTheme.TEXTFIELD_ALIGN_RIGHT);
row.addComponent(tf);
- tf = new LegacyTextField("Centered");
+ tf = new TextField("Centered");
tf.setInputPrompt("Guess what?");
tf.addStyleName(ValoTheme.TEXTFIELD_ALIGN_CENTER);
row.addComponent(tf);
@@ -183,12 +183,12 @@ public class TextFields extends VerticalLayout implements View {
pwf.setIcon(FontAwesome.LOCK);
row.addComponent(pwf);
- tf = new LegacyTextField("Tiny");
+ tf = new TextField("Tiny");
tf.setValue("Field value");
tf.addStyleName(ValoTheme.TEXTFIELD_TINY);
row.addComponent(tf);
- tf = new LegacyTextField("Huge");
+ tf = new TextField("Huge");
tf.setValue("Field value");
tf.addStyleName(ValoTheme.TEXTFIELD_HUGE);
row.addComponent(tf);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
index b26beccb53..a34455dfc4 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Trees.java
@@ -15,7 +15,6 @@
*/
package com.vaadin.tests.themes.valo;
-import com.vaadin.data.Container;
import com.vaadin.event.dd.DragAndDropEvent;
import com.vaadin.event.dd.DropHandler;
import com.vaadin.event.dd.acceptcriteria.AcceptAll;
@@ -25,10 +24,11 @@ import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Tree.TreeDragMode;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.ui.Tree;
+import com.vaadin.v7.ui.Tree.TreeDragMode;
public class Trees extends VerticalLayout implements View {
public Trees() {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMiscTests.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMiscTests.java
index 48885e2f14..4fc96b8181 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMiscTests.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoMiscTests.java
@@ -22,9 +22,9 @@ import com.vaadin.ui.CheckBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.InlineDateField;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.TreeTable;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.TreeTable;
public class ValoMiscTests extends UI {
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index 6701d502a4..db4e36e49a 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -22,13 +22,6 @@ import java.util.Map.Entry;
import com.vaadin.annotations.PreserveOnRefresh;
import com.vaadin.annotations.Theme;
import com.vaadin.annotations.Title;
-import com.vaadin.data.Container;
-import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.data.util.HierarchicalContainer;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.event.Action;
import com.vaadin.event.Action.Handler;
import com.vaadin.navigator.Navigator;
@@ -53,10 +46,17 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.MenuBar.MenuItem;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.Notification;
import com.vaadin.ui.UI;
import com.vaadin.ui.themes.ValoTheme;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.Container.Hierarchical;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.data.util.HierarchicalContainer;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.NativeSelect;
@Theme("tests-valo")
@Title("Valo Theme Test")
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
index f2d0ab3a54..28a2b63402 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/LongTooltip.java
@@ -4,7 +4,7 @@ import com.vaadin.tests.components.TestBase;
import com.vaadin.tests.util.LoremIpsum;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.GridLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class LongTooltip extends TestBase {
private int tooltipCount = 0;
@@ -14,10 +14,10 @@ public class LongTooltip extends TestBase {
GridLayout gl = new GridLayout(2, 2);
gl.setSizeFull();
- LegacyTextField f1 = createField();
- LegacyTextField f2 = createField();
- LegacyTextField f3 = createField();
- LegacyTextField f4 = createField();
+ TextField f1 = createField();
+ TextField f2 = createField();
+ TextField f3 = createField();
+ TextField f4 = createField();
gl.addComponent(f1);
gl.addComponent(f2);
gl.addComponent(f3);
@@ -33,8 +33,8 @@ public class LongTooltip extends TestBase {
}
- private LegacyTextField createField() {
- final LegacyTextField field = new LegacyTextField();
+ private TextField createField() {
+ final TextField field = new TextField();
field.setDescription("Tooltip " + Integer.toString(tooltipCount++)
+ ": " + LoremIpsum.get(1000));
return field;
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
index 7b48dc6227..99ddd75f3c 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipConfiguration.java
@@ -1,20 +1,20 @@
package com.vaadin.tests.tooltip;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUIWithLog;
import com.vaadin.tests.util.LoremIpsum;
import com.vaadin.ui.NativeButton;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.ui.TextField;
public class TooltipConfiguration extends AbstractTestUIWithLog {
- private LegacyTextField closeTimeout;
- private LegacyTextField quickOpenTimeout;
- private LegacyTextField maxWidth;
- private LegacyTextField openDelay;
- private LegacyTextField quickOpenDelay;
+ private TextField closeTimeout;
+ private TextField quickOpenTimeout;
+ private TextField maxWidth;
+ private TextField openDelay;
+ private TextField quickOpenDelay;
@Override
protected void setup(VaadinRequest request) {
@@ -98,9 +98,9 @@ public class TooltipConfiguration extends AbstractTestUIWithLog {
}
- private LegacyTextField createIntegerTextField(String caption,
+ private TextField createIntegerTextField(String caption,
int initialValue) {
- LegacyTextField tf = new LegacyTextField(caption);
+ TextField tf = new TextField(caption);
tf.setId(caption);
tf.setConverter(Integer.class);
tf.setImmediate(true);
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
index 252420c35a..0e0d167434 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipInWindow.java
@@ -20,7 +20,7 @@ import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
public class TooltipInWindow extends AbstractTestUI {
@@ -37,8 +37,8 @@ public class TooltipInWindow extends AbstractTestUI {
addComponent(createTextField("tf2"));
}
- private LegacyTextField createTextField(String id) {
- LegacyTextField tf = new LegacyTextField("TextField with a tooltip");
+ private TextField createTextField(String id) {
+ TextField tf = new TextField("TextField with a tooltip");
tf.setDescription("My tooltip");
tf.setId(id);
return tf;
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
index 337def9e67..c2ab5eb06a 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/TooltipWidthUpdating.java
@@ -5,7 +5,7 @@ import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.util.LoremIpsum;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
/**
* Test to see if the width of the tooltip element is updated if a narrower
@@ -37,15 +37,15 @@ public class TooltipWidthUpdating extends AbstractTestUI {
VerticalLayout vl = new VerticalLayout();
- LegacyTextField component1 = new LegacyTextField("TextField");
+ TextField component1 = new TextField("TextField");
component1.setId("component1");
- LegacyTextField component2 = new LegacyTextField("TextField");
- LegacyTextField component3 = new LegacyTextField("TextField");
- LegacyTextField component4 = new LegacyTextField("TextField");
- LegacyTextField component5 = new LegacyTextField("TextField");
- LegacyTextField component6 = new LegacyTextField("TextField");
- LegacyTextField component7 = new LegacyTextField("TextField");
- LegacyTextField component8 = new LegacyTextField("TextField");
+ TextField component2 = new TextField("TextField");
+ TextField component3 = new TextField("TextField");
+ TextField component4 = new TextField("TextField");
+ TextField component5 = new TextField("TextField");
+ TextField component6 = new TextField("TextField");
+ TextField component7 = new TextField("TextField");
+ TextField component8 = new TextField("TextField");
// some count of any components should be added before (between) buttons
// to make defect reproducible
diff --git a/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
index ce95c85cbc..8963f5f72f 100644
--- a/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
+++ b/uitest/src/main/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltip.java
@@ -17,8 +17,8 @@ package com.vaadin.tests.tooltip;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.validator.IntegerRangeValidator;
+import com.vaadin.v7.ui.TextField;
/**
*
@@ -28,12 +28,12 @@ public class ValidatorCaptionTooltip extends AbstractTestUI {
@Override
protected void setup(VaadinRequest request) {
- LegacyTextField fieldWithError = new LegacyTextField();
+ TextField fieldWithError = new TextField();
int min = 0;
int max = 100;
String errorMessage = "Valid value is between " + min + " and " + max
+ ". {0} is not.";
- LegacyIntegerRangeValidator validator = new LegacyIntegerRangeValidator(
+ IntegerRangeValidator validator = new IntegerRangeValidator(
errorMessage, min, max);
fieldWithError.setValue("142");
@@ -41,7 +41,7 @@ public class ValidatorCaptionTooltip extends AbstractTestUI {
fieldWithError.setConverter(Integer.class);
fieldWithError.setImmediate(true);
- LegacyTextField fieldWithoutError = new LegacyTextField();
+ TextField fieldWithoutError = new TextField();
fieldWithoutError.addValidator(validator);
fieldWithoutError.setConverter(Integer.class);
fieldWithoutError.setValue("42");
diff --git a/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java b/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
index a9ab397541..328cfdaef6 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/AlwaysFailValidator.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.util;
-import com.vaadin.v7.data.validator.LegacyAbstractValidator;
+import com.vaadin.v7.data.validator.AbstractValidator;
-public class AlwaysFailValidator extends LegacyAbstractValidator<Object> {
+public class AlwaysFailValidator extends AbstractValidator<Object> {
public AlwaysFailValidator() {
super("Validation error");
}
diff --git a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
index 90c56f0a2c..bd9df1e8f8 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/CheckBoxWithPropertyDataSource.java
@@ -1,8 +1,8 @@
package com.vaadin.tests.util;
-import com.vaadin.data.Property;
-import com.vaadin.data.Property.ValueChangeNotifier;
import com.vaadin.ui.CheckBox;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.Property.ValueChangeNotifier;
import com.vaadin.v7.data.Validator.InvalidValueException;
public class CheckBoxWithPropertyDataSource extends CheckBox {
diff --git a/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
index 8a925e9842..7707fe0b77 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/LargeContainer.java
@@ -5,12 +5,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.vaadin.data.Container;
-import com.vaadin.data.ContainerHelpers;
-import com.vaadin.data.Item;
-import com.vaadin.data.Property;
-import com.vaadin.data.util.AbstractContainer;
-import com.vaadin.data.util.ObjectProperty;
+import com.vaadin.v7.data.Container;
+import com.vaadin.v7.data.ContainerHelpers;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.Property;
+import com.vaadin.v7.data.util.AbstractContainer;
+import com.vaadin.v7.data.util.ObjectProperty;
public class LargeContainer extends AbstractContainer
implements Container.Indexed {
diff --git a/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
index 2f0e4f0d6f..cb7c3c28a5 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/PersonContainer.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.util;
import java.io.Serializable;
import java.util.Random;
-import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.v7.data.util.BeanItemContainer;
@SuppressWarnings("serial")
public class PersonContainer extends BeanItemContainer<Person>
diff --git a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
index d2048b528f..3792e9c7d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java
@@ -23,9 +23,9 @@ import com.vaadin.server.VaadinService;
import com.vaadin.server.VaadinSession;
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.ui.LegacyWindow;
/**
* Provides sample directory based on application directory. If this fails then
diff --git a/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
index 86a7c4d852..69589cec9e 100644
--- a/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
+++ b/uitest/src/main/java/com/vaadin/tests/util/TestUtils.java
@@ -1,10 +1,10 @@
package com.vaadin.tests.util;
-import com.vaadin.data.Item;
-import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.JavaScript;
-import com.vaadin.ui.TextArea;
import com.vaadin.ui.UI;
+import com.vaadin.v7.data.Item;
+import com.vaadin.v7.data.util.IndexedContainer;
+import com.vaadin.v7.ui.TextArea;
public class TestUtils {
diff --git a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
index d9ee350512..9cea8a7d2d 100644
--- a/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/FieldErrorIndication.java
@@ -20,21 +20,21 @@ import java.util.Set;
import com.vaadin.server.UserError;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.ListSelect;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.TwinColSelect;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.v7.data.Validator;
-import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
-import com.vaadin.v7.ui.LegacyAbstractField;
-import com.vaadin.v7.ui.LegacyField;
-import com.vaadin.v7.ui.LegacyPasswordField;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.validator.StringLengthValidator;
+import com.vaadin.v7.ui.AbstractField;
+import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.ListSelect;
+import com.vaadin.v7.ui.NativeSelect;
+import com.vaadin.v7.ui.PasswordField;
+import com.vaadin.v7.ui.RichTextArea;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
+import com.vaadin.v7.ui.TwinColSelect;
public class FieldErrorIndication extends AbstractTestUI {
@@ -50,21 +50,21 @@ public class FieldErrorIndication extends AbstractTestUI {
comboBox.addItem("ok");
comboBox.addItem("error");
comboBox.addValidator(
- new LegacyStringLengthValidator("fail", 0, 2, false));
+ new StringLengthValidator("fail", 0, 2, false));
comboBox.setValue("error");
ListSelect listSelect = new ListSelect("ListSelect");
listSelect.addItem("ok");
listSelect.addItem("error");
listSelect.addValidator(
- new LegacyStringLengthValidator("fail", 0, 2, false));
+ new StringLengthValidator("fail", 0, 2, false));
listSelect.setValue("error");
NativeSelect nativeSelect = new NativeSelect("NativeSelect");
nativeSelect.addItem("ok");
nativeSelect.addItem("error");
nativeSelect.addValidator(
- new LegacyStringLengthValidator("fail", 0, 2, false));
+ new StringLengthValidator("fail", 0, 2, false));
nativeSelect.setValue("error");
TwinColSelect twinColSelect = new TwinColSelect("TwinColSelect");
twinColSelect.addItem("ok");
@@ -86,12 +86,12 @@ public class FieldErrorIndication extends AbstractTestUI {
vl.addComponents(comboBox, listSelect, nativeSelect, twinColSelect);
- Class<? extends LegacyAbstractField>[] textFields = new Class[] {
- LegacyTextField.class, TextArea.class, RichTextArea.class,
- LegacyPasswordField.class };
+ Class<? extends AbstractField>[] textFields = new Class[] {
+ TextField.class, TextArea.class, RichTextArea.class,
+ PasswordField.class };
vl = new VerticalLayout();
hl.addComponent(vl);
- for (Class<? extends LegacyField> fieldClass : textFields) {
+ for (Class<? extends Field> fieldClass : textFields) {
vl.addComponent(getField(fieldClass));
}
@@ -102,10 +102,10 @@ public class FieldErrorIndication extends AbstractTestUI {
* @param fieldClass
* @return
*/
- private Component getField(Class<? extends LegacyField> fieldClass) {
- LegacyAbstractField f;
+ private Component getField(Class<? extends Field> fieldClass) {
+ AbstractField f;
try {
- f = (LegacyAbstractField) fieldClass.newInstance();
+ f = (AbstractField) fieldClass.newInstance();
f.setCaption(fieldClass.getSimpleName());
f.setComponentError(new UserError("fail"));
return f;
diff --git a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
index b58d74feb4..c865d911d4 100644
--- a/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
+++ b/uitest/src/main/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java
@@ -1,25 +1,25 @@
package com.vaadin.tests.validation;
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.ui.CheckBox;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
import com.vaadin.v7.data.Validator;
-import com.vaadin.v7.data.validator.LegacyIntegerValidator;
-import com.vaadin.v7.data.validator.LegacyStringLengthValidator;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.data.validator.IntegerValidator;
+import com.vaadin.v7.data.validator.StringLengthValidator;
+import com.vaadin.v7.ui.TextField;
@SuppressWarnings("deprecation")
public class ValidationOfRequiredEmptyFields extends AbstractTestUI {
- private LegacyTextField tf;
+ private TextField tf;
private CheckBox requiredInput;
- private LegacyTextField requiredErrorInput;
+ private TextField requiredErrorInput;
- private Validator integerValidator = new LegacyIntegerValidator(
+ private Validator integerValidator = new IntegerValidator(
"Must be an integer");
- private Validator stringLengthValidator = new LegacyStringLengthValidator(
+ private Validator stringLengthValidator = new StringLengthValidator(
"Must be 5-10 chars", 5, 10, false);
private CheckBox integerValidatorInput;
private CheckBox stringLengthValidatorInput;
@@ -31,7 +31,7 @@ public class ValidationOfRequiredEmptyFields extends AbstractTestUI {
requiredInput.addValueChangeListener(
event -> tf.setRequired(requiredInput.getValue()));
- requiredErrorInput = new LegacyTextField("Required error message");
+ requiredErrorInput = new TextField("Required error message");
requiredErrorInput.setImmediate(true);
requiredErrorInput.addValueChangeListener(new ValueChangeListener() {
@Override
@@ -59,7 +59,7 @@ public class ValidationOfRequiredEmptyFields extends AbstractTestUI {
}
});
- tf = new LegacyTextField();
+ tf = new TextField();
tf.setImmediate(true);
requiredInput.setValue(false);
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
index 6983a5c3e3..e52a0aaf5b 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/DelegateWithoutStateClassComponent.java
@@ -16,7 +16,7 @@
package com.vaadin.tests.widgetset.server;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
public class DelegateWithoutStateClassComponent extends TextArea {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java
index b741c099b5..5470a4ba12 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/ExtraSuperTextArea.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.widgetset.server;
import com.vaadin.tests.widgetset.client.superText.SuperTextAreaState;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
/**
* @author artamonov
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
index 97e085b777..f7201aa670 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/OverriddenDecendants.java
@@ -19,7 +19,7 @@ import com.vaadin.annotations.Widgetset;
import com.vaadin.server.VaadinRequest;
import com.vaadin.tests.components.AbstractTestUI;
import com.vaadin.tests.widgetset.TestingWidgetSet;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
/**
* UI for testing that @DelegateToWidget works on derived widget states.
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/SuperTextArea.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SuperTextArea.java
index 6e73915e44..ab5a8bcec2 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/SuperTextArea.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/SuperTextArea.java
@@ -1,7 +1,7 @@
package com.vaadin.tests.widgetset.server;
import com.vaadin.tests.widgetset.client.superText.SuperTextAreaState;
-import com.vaadin.ui.TextArea;
+import com.vaadin.v7.ui.TextArea;
/**
* @author artamonov
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
index 7163d18642..459a36865e 100644
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
+++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java
@@ -24,15 +24,15 @@ import com.vaadin.tests.widgetset.TestingWidgetSet;
import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererConnector.Renderers;
import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererRpc;
import com.vaadin.ui.AbstractComponent;
-import com.vaadin.ui.AbstractSelect.ItemCaptionMode;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CssLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.NativeButton;
-import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode;
+import com.vaadin.v7.ui.NativeSelect;
@Widgetset(TestingWidgetSet.NAME)
public class GridClientColumnRenderers extends UI {
diff --git a/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/uitest/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLTestsConstants.java
index 3718cf756d..f7a13583c4 100755
--- a/uitest/src/main/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java
+++ b/uitest/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLTestsConstants.java
@@ -13,12 +13,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
-package com.vaadin.data.util.sqlcontainer;
+package com.vaadin.v7.data.util.sqlcontainer;
-import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator;
-import com.vaadin.data.util.sqlcontainer.query.generator.SQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator;
+import com.vaadin.v7.data.util.sqlcontainer.query.generator.SQLGenerator;
public class SQLTestsConstants {
diff --git a/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java b/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java
index ac7d55b396..499f3296dc 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/TerminalErrorNotificationTest.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.application;
import org.junit.Assert;
import org.junit.Test;
+import com.vaadin.testbench.customelements.FixedNotificationElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
public class TerminalErrorNotificationTest extends MultiBrowserTest {
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
index b150425a23..c3bfb832f8 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/VaadinSessionAttributeTest.java
@@ -19,9 +19,9 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
+import com.vaadin.testbench.customelements.FixedNotificationElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
public class VaadinSessionAttributeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
index 5d0ef4e1a8..7375bb21ab 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationcontext/CloseSessionTest.java
@@ -4,9 +4,9 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.FixedNotificationElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
public class CloseSessionTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
index dd5248ce76..6710e96b47 100644
--- a/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/applicationservlet/SystemMessagesTest.java
@@ -4,9 +4,9 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
public class SystemMessagesTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
index 34e0f3110e..44cdcbec1d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/NoLayoutUpdateWhichNeedsLayoutTest.java
@@ -20,8 +20,8 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.tests.customelements.CustomProgressBarElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.ProgressBarElement;
public class NoLayoutUpdateWhichNeedsLayoutTest extends SingleBrowserTest {
@@ -30,8 +30,8 @@ public class NoLayoutUpdateWhichNeedsLayoutTest extends SingleBrowserTest {
openTestURL("debug");
ButtonElement open = $(ButtonElement.class).id("openWindow");
open.click();
- final CustomProgressBarElement progress = $(
- CustomProgressBarElement.class).first();
+ final ProgressBarElement progress = $(
+ ProgressBarElement.class).first();
waitUntil(new ExpectedCondition<Boolean>() {
@Override
public Boolean apply(WebDriver input) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
index fb8d03d613..2b5524831f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarDisabledTest.java
@@ -5,7 +5,7 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.CalendarElement;
+import com.vaadin.v7.testbench.customelements.CalendarElement;
public class CalendarDisabledTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
index 9cd19291e0..9b88cf396f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarHtmlInEventsTest.java
@@ -20,9 +20,9 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.CalendarElement;
+import com.vaadin.v7.testbench.customelements.CalendarElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class CalendarHtmlInEventsTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
index eef3ca5439..90367ffa5d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/CalendarReadOnlyTest.java
@@ -12,7 +12,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.CalendarElement;
+import com.vaadin.v7.testbench.customelements.CalendarElement;
public class CalendarReadOnlyTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
index 1cce6b1827..04d4657718 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/colorpicker/DefaultCaptionWidthTest.java
@@ -20,7 +20,7 @@ import org.junit.Before;
import org.junit.Test;
import org.openqa.selenium.By;
-import com.vaadin.testbench.elements.ColorPickerElement;
+import com.vaadin.v7.testbench.customelements.ColorPickerElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
index 056a644992..4dfc99cd1f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxBorderTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxBorderTest extends MultiBrowserTest {
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
index f60e3b5f67..3994f24080 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClickIconTest.java
@@ -19,7 +19,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
index 606f406db0..b19f8ae505 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
index 04e4280f76..d895046a75 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcutTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
import org.openqa.selenium.Keys;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxCombinedWithEnterShortcutTest extends MultiBrowserTest {
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
index 187d6d40f4..fe06f4f329 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxEmptyItemsKeyboardNavigationTest.java
@@ -11,7 +11,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxEmptyItemsKeyboardNavigationTest
extends SingleBrowserTestPhantomJS2 {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
index 5f542cbaa2..22cb44b3c9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxIdenticalItemsTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.By;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* Test for identical item captions in ComboBox.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
index 5aaa0fa839..07724ad016 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxInputPromptTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ComboBoxInputPromptTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
index 76758eecdd..cc52fff69f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemAddingWithFocusListenerTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ComboBoxItemAddingWithFocusListenerTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
index 15c87b65f0..aea88eb4b7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.combobox;
import org.junit.Test;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxItemIconTest extends MultiBrowserTest {
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
index bb839eb591..8dc50ce0c0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemStyleGeneratorTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class ComboBoxItemStyleGeneratorTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
index f2dcdee4ef..4d2cc61b55 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxLargeIconsTest.java
@@ -5,9 +5,9 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxLargeIconsTest extends MultiBrowserTest {
@Override
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
index bbf6a9ba5b..cb1ba25294 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxMouseSelectEnterTest.java
@@ -31,7 +31,7 @@ import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxMouseSelectEnterTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
index 0b3312cb04..975452d63a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxNoTextInputTest.java
@@ -22,8 +22,8 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.testbench.commands.TestBenchElementCommands;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxNoTextInputTest extends MultiBrowserTest {
@@ -38,7 +38,8 @@ public class ComboBoxNoTextInputTest extends MultiBrowserTest {
ComboBoxElement cb = $(ComboBoxElement.class).first();
click(cb);
// popup is opened lazily
- waitForElementPresent(By.vaadin("//com.vaadin.ui.ComboBox[0]#popup"));
+ waitForElementPresent(
+ By.vaadin("//com.vaadin.v7.ui.ComboBox[0]#popup"));
}
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
index 6d82f349bf..f0c2cbcce5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxOnSmallScreenTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebDriver.Window;
import org.openqa.selenium.WebElement;
import com.vaadin.client.ui.VFilterSelect;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java
index 7b805415a2..322425a103 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxPopupWhenBodyScrollsTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxPopupWhenBodyScrollsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
index a7cd95d7b4..955c498996 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxResetValueTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.Keys;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxResetValueTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java
index 658e4e58e6..2624b337dc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingToPageDisabledTest.java
@@ -19,7 +19,7 @@ import org.junit.Test;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* When pressed down key, while positioned on the last item - should show next
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
index 2e40d16abe..e43447e6b2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxScrollingWithArrowsTest.java
@@ -27,7 +27,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java
index 0fad2c309b..d02667cf03 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingTest.java
@@ -12,7 +12,7 @@ import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxSelectingTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
index beb0d37ae6..4483c27240 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSelectingWithNewItemsAllowedTest.java
@@ -27,7 +27,7 @@ import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboBoxSelectingWithNewItemsAllowedTest extends MultiBrowserTest {
private ComboBoxElement comboBoxElement;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
index 6dcbac3f40..60977d8ca2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSetNullWhenNewItemsAllowedTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.By;
import com.vaadin.testbench.commands.TestBenchElementCommands;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
index 94376f4518..2b606f1eae 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ComboBoxSuggestionPageLengthTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
index 8c9e526955..8f246f211f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupCloseTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java
index aa68f7330d..f0c0fdf509 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthLegacyTest.java
@@ -19,8 +19,8 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* @author Vaadin Ltd
@@ -37,7 +37,7 @@ public class ComboBoxSuggestionPopupWidthLegacyTest extends MultiBrowserTest {
.findElement(By.vaadin("#textbox"));
selectTextbox.click();
- CustomComboBoxElement cb = $(CustomComboBoxElement.class).first();
+ ComboBoxElement cb = $(ComboBoxElement.class).first();
cb.openPopup();
WebElement popup = cb.getSuggestionPopup();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java
index a101617e8b..371e5aee95 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPercentageTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* @author Vaadin Ltd
@@ -40,7 +40,7 @@ public class ComboBoxSuggestionPopupWidthPercentageTest
.findElement(By.vaadin("#textbox"));
selectTextbox.click();
- CustomComboBoxElement cb = $(CustomComboBoxElement.class).first();
+ ComboBoxElement cb = $(ComboBoxElement.class).first();
cb.openPopup();
WebElement popup = cb.getSuggestionPopup();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java
index cdd42f2313..1d175b63f8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthPixelsTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* @author Vaadin Ltd
@@ -39,7 +39,7 @@ public class ComboBoxSuggestionPopupWidthPixelsTest extends MultiBrowserTest {
.findElement(By.vaadin("#textbox"));
selectTextbox.click();
- CustomComboBoxElement cb = $(CustomComboBoxElement.class).first();
+ ComboBoxElement cb = $(ComboBoxElement.class).first();
cb.openPopup();
WebElement popup = cb.getSuggestionPopup();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java
index 133512cb71..3ee8bb76a1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxSuggestionPopupWidthTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* @author Vaadin Ltd
@@ -39,7 +39,7 @@ public class ComboBoxSuggestionPopupWidthTest extends MultiBrowserTest {
.findElement(By.vaadin("#textbox"));
selectTextbox.click();
- CustomComboBoxElement cb = $(CustomComboBoxElement.class).first();
+ ComboBoxElement cb = $(ComboBoxElement.class).first();
cb.openPopup();
WebElement popup = cb.getSuggestionPopup();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
index d25eee2ef5..e95f6ad7b1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxValueInputTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.testbench.elements.VerticalLayoutElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
index 48ba71fe60..fd8eb1b054 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboSelectedValueBeyondTheFirstDropdownPageTest.java
@@ -20,7 +20,7 @@ import static org.hamcrest.Matchers.is;
import org.junit.Test;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
index a11921eef4..420ea32ce7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.testbench.elements.MenuBarElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
index 4ebed48842..ba3543e981 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPopupScrollingTest.java
@@ -20,6 +20,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class ComboboxPopupScrollingTest extends MultiBrowserTest {
@@ -46,7 +47,7 @@ public class ComboboxPopupScrollingTest extends MultiBrowserTest {
private void testNoScrollbars(String theme) {
openTestURL("theme=" + theme);
- for (CustomComboBoxElement cb : $(CustomComboBoxElement.class).all()) {
+ for (ComboBoxElement cb : $(ComboBoxElement.class).all()) {
String caption = cb.getCaption();
cb.openPopup();
WebElement popup = cb.getSuggestionPopup();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
index 299fb23b1b..90b31ea12a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxStyleChangeWidthTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
deleted file mode 100644
index 7a42d7a669..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/CustomComboBoxElement.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.combobox;
-
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.ui.ComboBox")
-public class CustomComboBoxElement extends ComboBoxElement {
- private static org.openqa.selenium.By bySuggestionPopup = By
- .vaadin("#popup");
-
- public WebElement getSuggestionPopup() {
- ensurePopupOpen();
- return findElement(bySuggestionPopup);
- }
-
- private void ensurePopupOpen() {
- if (!isElementPresent(bySuggestionPopup)) {
- openPopup();
- }
- }
-
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
index 6eeb9c50fd..226da41641 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/FilteringTurkishLocaleTest.java
@@ -21,8 +21,8 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class FilteringTurkishLocaleTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
index d024c39087..1c34d57c6a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
+import com.vaadin.v7.testbench.customelements.DateFieldElement;
/**
* @author Vaadin Ltd
@@ -36,7 +36,7 @@ public class LegacyDateFieldIsValidTest extends MultiBrowserTest {
waitForElementVisible(By.id("Log"));
waitForElementVisible(By.className("v-datefield"));
- WebElement dateTextbox = $(LegacyDateFieldElement.class).first()
+ WebElement dateTextbox = $(DateFieldElement.class).first()
.findElement(By.className("v-textfield"));
ButtonElement button = $(ButtonElement.class).first();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
index c29b6de36d..3431a0e374 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEventsTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.support.ui.Select;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.DateFieldElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
index 31a0d0800c..6e6daf5db2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/FormLayoutResizingTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.FormLayoutElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserThemeTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
index 8132c3b93f..4f22aa8c5c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/formlayout/TableInFormLayoutCausesScrollingTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
import org.openqa.selenium.Keys;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableInFormLayoutCausesScrollingTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
index e1b5cacc75..69debf19b2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/CustomRendererTest.java
@@ -21,10 +21,11 @@ import java.util.List;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class CustomRendererTest extends MultiBrowserTest {
@@ -60,7 +61,7 @@ public class CustomRendererTest extends MultiBrowserTest {
}
private GridElement findGrid() {
- List<LegacyGridElement> elements = $(LegacyGridElement.class).all();
+ List<GridElement> elements = $(GridElement.class).all();
return elements.get(0);
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
index b0c5d6234a..2a05e7a193 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddAndRemoveDataOnInitTest.java
@@ -19,9 +19,10 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridAddAndRemoveDataOnInitTest extends MultiBrowserTest {
@@ -30,13 +31,13 @@ public class GridAddAndRemoveDataOnInitTest extends MultiBrowserTest {
public void verifyGridSizes() {
openTestURL();
- GridElement gridAdd = $(LegacyGridElement.class).first();
+ GridElement gridAdd = $(GridElement.class).first();
if (!gridAdd.isElementPresent(By.vaadin("#cell[9][0]"))
|| gridAdd.isElementPresent(By.vaadin("#cell[10][0]"))) {
Assert.fail("Grid with added data contained incorrect rows");
}
- GridElement gridRemove = $(LegacyGridElement.class).get(1);
+ GridElement gridRemove = $(GridElement.class).get(1);
if (!gridRemove.isElementPresent(By.vaadin("#cell[4][0]"))
|| gridRemove.isElementPresent(By.vaadin("#cell[5][0]"))) {
Assert.fail("Grid with removed data contained incorrect rows");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
index 3ef26ce934..f9ba51b331 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridAddRowTest.java
@@ -19,9 +19,10 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridAddRowTest extends MultiBrowserTest {
@@ -29,7 +30,7 @@ public class GridAddRowTest extends MultiBrowserTest {
public void testAddRow() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertEquals("Lorem", grid.getCell(0, 1).getText());
Assert.assertEquals("2", grid.getCell(1, 2).getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
index a8f8df4ec7..509261ddc8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCellFocusOnResetSizeTest.java
@@ -22,10 +22,10 @@ import java.io.IOException;
import org.junit.Test;
import org.openqa.selenium.By;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elementsbase.ServerClass;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridCellFocusOnResetSizeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
index c4f5ced747..76282e074e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCheckBoxDisplayTest.java
@@ -19,11 +19,10 @@ import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.By;
-import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyCheckBoxElement;
+import com.vaadin.v7.testbench.customelements.CheckBoxElement;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridCheckBoxDisplayTest extends SingleBrowserTest {
@@ -31,7 +30,7 @@ public class GridCheckBoxDisplayTest extends SingleBrowserTest {
public void testAddRow() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertEquals("First item had wrong value", "true",
grid.getCell(0, 0).getText());
@@ -41,7 +40,7 @@ public class GridCheckBoxDisplayTest extends SingleBrowserTest {
// First edit false item and see that the CheckBox is unchecked
grid.getCell(1, 0).doubleClick();
- CheckBoxElement checkbox = $(LegacyCheckBoxElement.class).first();
+ CheckBoxElement checkbox = $(CheckBoxElement.class).first();
Assert.assertEquals("CheckBox was checked", "unchecked",
checkbox.getValue());
@@ -50,7 +49,7 @@ public class GridCheckBoxDisplayTest extends SingleBrowserTest {
// Edit true item and see that the CheckBox is checked
grid.getCell(0, 0).doubleClick();
- checkbox = $(LegacyCheckBoxElement.class).first();
+ checkbox = $(CheckBoxElement.class).first();
Assert.assertEquals("CheckBox was not checked.", "checked",
checkbox.getValue());
@@ -59,7 +58,7 @@ public class GridCheckBoxDisplayTest extends SingleBrowserTest {
// Edit false item and confirm that the CheckBox is unchecked again
grid.getCell(1, 0).doubleClick();
- checkbox = $(LegacyCheckBoxElement.class).first();
+ checkbox = $(CheckBoxElement.class).first();
Assert.assertEquals("CheckBox was checked", "unchecked",
checkbox.getValue());
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
index fb0a1cf4d5..44a9ee3b15 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
@@ -28,16 +28,16 @@ import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.elements.NativeButtonElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.testbench.elementsbase.ServerClass;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererConnector.Renderers;
import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* Tests Grid client side renderers
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
index ad1fb8c434..77aac67135 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColspansTest.java
@@ -23,10 +23,11 @@ import org.junit.Test;
import org.openqa.selenium.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridColspansTest extends MultiBrowserTest {
@@ -40,7 +41,7 @@ public class GridColspansTest extends MultiBrowserTest {
public void testHeaderColSpans() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertEquals("5", grid.getHeaderCell(0, 1).getAttribute("colspan"));
assertEquals("2", grid.getHeaderCell(1, 1).getAttribute("colspan"));
assertEquals("3", grid.getHeaderCell(1, 3).getAttribute("colspan"));
@@ -50,7 +51,7 @@ public class GridColspansTest extends MultiBrowserTest {
public void testFooterColSpans() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertEquals("5", grid.getFooterCell(1, 1).getAttribute("colspan"));
assertEquals("2", grid.getFooterCell(0, 1).getAttribute("colspan"));
assertEquals("3", grid.getFooterCell(0, 3).getAttribute("colspan"));
@@ -60,7 +61,7 @@ public class GridColspansTest extends MultiBrowserTest {
public void testHideFirstColumnOfColspan() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertEquals("Failed initial condition.", "all the stuff",
grid.getHeaderCell(0, 1).getText().toLowerCase());
assertEquals("Failed initial condition.", "first name",
@@ -76,7 +77,7 @@ public class GridColspansTest extends MultiBrowserTest {
public void testSplittingMergedHeaders() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
GridCellElement headerCell = grid.getHeaderCell(1, 1);
assertEquals("Failed initial condition.", "full name",
headerCell.getText().toLowerCase());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
index 927910fa48..6f4c0da27f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
@@ -21,6 +21,7 @@ import org.junit.Test;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridColumnAutoExpandTest extends MultiBrowserTest {
@@ -28,7 +29,7 @@ public class GridColumnAutoExpandTest extends MultiBrowserTest {
public void testSecondColumnHasExpanded() {
openTestURL();
- GridCellElement headerCell = $(LegacyGridElement.class).first()
+ GridCellElement headerCell = $(GridElement.class).first()
.getHeaderCell(0, 1);
assertTrue("Column did not expand as expected",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
index d03d40a60f..6c43a1baef 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthRecalculationTest.java
@@ -21,10 +21,11 @@ import org.junit.Test;
import org.openqa.selenium.Dimension;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridColumnWidthRecalculationTest extends SingleBrowserTest {
@@ -34,7 +35,7 @@ public class GridColumnWidthRecalculationTest extends SingleBrowserTest {
@Before
public void open() {
openTestURL();
- grid = $(LegacyGridElement.class).first();
+ grid = $(GridElement.class).first();
}
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
index 91f6648f1c..d389d6ab94 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridColumnWidthsWithoutDataTest.java
@@ -21,12 +21,13 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
@@ -34,7 +35,7 @@ public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
@Test
public void testWidthsWhenAddingDataBack() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int[] baseWidths = getColWidths(grid);
Assert.assertEquals("Sanity check", 2, baseWidths.length);
@@ -57,7 +58,7 @@ public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
openTestURL();
$(ButtonElement.class).caption("Recreate without data").first().click();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int[] baseWidths = getColWidths(grid);
Assert.assertEquals("Sanity check", 2, baseWidths.length);
@@ -84,7 +85,7 @@ public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
$(NativeSelectElement.class).caption("Selection mode").first()
.selectByText("Multi");
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int sum = sumUsedWidths(grid);
@@ -93,7 +94,7 @@ public class GridColumnWidthsWithoutDataTest extends SingleBrowserTest {
$(ButtonElement.class).caption("Recreate without data").first().click();
- grid = $(LegacyGridElement.class).first();
+ grid = $(GridElement.class).first();
sum = sumUsedWidths(grid);
// 295 instead of 300 to avoid rounding issues
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
index 08d1c7202d..08406ac571 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridCustomSelectionModelTest.java
@@ -22,10 +22,11 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.Keys;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridCustomSelectionModelTest extends MultiBrowserTest {
@@ -35,7 +36,7 @@ public class GridCustomSelectionModelTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
GridCellElement cell = grid.getCell(0, 0);
assertTrue("First column of Grid should not have an input element",
cell.findElements(By.className("input")).isEmpty());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
index 896e4da5c3..6c7694b81f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDataSourceResetTest.java
@@ -21,8 +21,9 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridDataSourceResetTest extends SingleBrowserTest {
@@ -30,7 +31,7 @@ public class GridDataSourceResetTest extends SingleBrowserTest {
public void testRemoveWithSelectUpdatesRowsCorrectly() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertTrue("First row was not selected", grid.getRow(0).isSelected());
for (int i = 1; i < 10; ++i) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
index 60395aca87..f00be81a76 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDefaultSelectionModeTest.java
@@ -21,9 +21,10 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridDefaultSelectionModeTest extends MultiBrowserTest {
@@ -35,12 +36,12 @@ public class GridDefaultSelectionModeTest extends MultiBrowserTest {
$(ButtonElement.class).caption("Select on server").first().click();
assertTrue("Row should be selected.",
- $(LegacyGridElement.class).first().getRow(0).isSelected());
+ $(GridElement.class).first().getRow(0).isSelected());
$(ButtonElement.class).caption("Deselect on server").first().click();
assertFalse("Row should not be selected.",
- $(LegacyGridElement.class).first().getRow(0).isSelected());
+ $(GridElement.class).first().getRow(0).isSelected());
assertNoErrorNotifications();
}
@@ -50,7 +51,7 @@ public class GridDefaultSelectionModeTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
grid.getCell(0, 0).click();
GridCellElement header = grid.getHeaderCell(0, 1);
@@ -69,7 +70,7 @@ public class GridDefaultSelectionModeTest extends MultiBrowserTest {
$(ButtonElement.class).caption("Select on server").first().click();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertTrue("Row should be selected.", grid.getRow(0).isSelected());
$(ButtonElement.class).caption("Deselect on server").first().click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
index 80c3cc7ceb..5382897784 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsDetachTest.java
@@ -25,6 +25,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridDetailsDetachTest extends MultiBrowserTest {
@@ -34,8 +35,8 @@ public class GridDetailsDetachTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- $(LegacyGridElement.class).first().getCell(3, 0).click();
- $(LegacyGridElement.class).first().getCell(5, 0).click();
+ $(GridElement.class).first().getCell(3, 0).click();
+ $(GridElement.class).first().getCell(5, 0).click();
assertNoErrorNotifications();
@@ -49,8 +50,8 @@ public class GridDetailsDetachTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- $(LegacyGridElement.class).first().getCell(3, 0).click();
- $(LegacyGridElement.class).first().getCell(5, 0).click();
+ $(GridElement.class).first().getCell(3, 0).click();
+ $(GridElement.class).first().getCell(5, 0).click();
assertNoErrorNotifications();
@@ -75,8 +76,8 @@ public class GridDetailsDetachTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- $(LegacyGridElement.class).first().getCell(3, 0).click();
- $(LegacyGridElement.class).first().getCell(5, 0).click();
+ $(GridElement.class).first().getCell(3, 0).click();
+ $(GridElement.class).first().getCell(5, 0).click();
assertNoErrorNotifications();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
index d8b676ea31..eccdf8e630 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
@@ -24,11 +24,12 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.remote.DesiredCapabilities;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.parallel.Browser;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* Tests the layouting of Grid's details row when it contains a HorizontalLayout
@@ -53,7 +54,7 @@ public class GridDetailsLayoutExpandTest extends MultiBrowserTest {
openTestURL();
waitForElementPresent(By.className("v-grid"));
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int gridWidth = grid.getSize().width;
grid.getRow(2).click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
index eaeb8bfddb..4293c61de7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
@@ -35,8 +35,8 @@ import com.vaadin.testbench.elements.CheckBoxElement;
import com.vaadin.testbench.elements.GridElement.GridRowElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridDetailsLocationTest extends MultiBrowserTest {
@@ -301,8 +301,8 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
Keys.ENTER, Keys.TAB);
}
- private CustomGridElement getGrid() {
- return $(CustomGridElement.class).first();
+ private GridElement getGrid() {
+ return $(GridElement.class).first();
}
private WebElement getVerticalScrollbar() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
index c2dde9114a..14ec039f43 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsWidthTest.java
@@ -22,10 +22,11 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridDetailsWidthTest extends SingleBrowserTest {
@@ -33,7 +34,7 @@ public class GridDetailsWidthTest extends SingleBrowserTest {
@Test
public void testSpacerTDsHaveNoWidth() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Open all details rows
grid.getCell(0, 0).click();
@@ -70,7 +71,7 @@ public class GridDetailsWidthTest extends SingleBrowserTest {
@Test
public void testDetailsOnSort() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Open a details rows
grid.getCell(0, 0).click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
index 752622e195..dac5fce68a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDragSelectionWhileScrolledTest.java
@@ -24,9 +24,10 @@ import org.junit.Test;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest {
@@ -41,7 +42,7 @@ public class GridDragSelectionWhileScrolledTest extends MultiBrowserTest {
openTestURL();
// Scroll grid to view
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
((JavascriptExecutor) getDriver())
.executeScript("arguments[0].scrollIntoView(true);", grid);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
index cff81b0d58..5997a77c65 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditingWithNoScrollBarsTest.java
@@ -19,9 +19,10 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridEditingWithNoScrollBarsTest extends MultiBrowserTest {
@@ -30,7 +31,7 @@ public class GridEditingWithNoScrollBarsTest extends MultiBrowserTest {
public void testEditorWideEnough() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
grid.getCell(1, 1).doubleClick();
assertEquals(grid.getEditor().getSize().width,
grid.getTableWrapper().getSize().width);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
index 7b385f0005..abe96c61b9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorConverterNotFoundTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridEditorConverterNotFoundTest extends GridBasicFeaturesTest {
@@ -33,9 +34,9 @@ public class GridEditorConverterNotFoundTest extends GridBasicFeaturesTest {
public void testConverterNotFound() {
openTestURL();
- $(LegacyGridElement.class).first().getCell(0, 0).doubleClick();
+ $(GridElement.class).first().getCell(0, 0).doubleClick();
- assertEquals("1. com.vaadin.data.Buffered$SourceException",
+ assertEquals("1. com.vaadin.v7.data.Buffered$SourceException",
getLogRow(0));
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
index b1c7bb884f..de6156bd42 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorCustomFieldTest.java
@@ -19,11 +19,11 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridEditorElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridEditorCustomFieldTest extends MultiBrowserTest {
@@ -31,7 +31,7 @@ public class GridEditorCustomFieldTest extends MultiBrowserTest {
@Test
public void testCustomFieldWorksInEditorRow() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertEquals("Stockholm", grid.getCell(0, 2).getText());
grid.getCell(0, 1).doubleClick();
GridEditorElement editor = grid.getEditor();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
index 20f00bf1f0..43af0ed1c9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorFrozenColumnsUITest.java
@@ -24,10 +24,11 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridEditorFrozenColumnsUITest extends MultiBrowserTest {
@@ -46,7 +47,7 @@ public class GridEditorFrozenColumnsUITest extends MultiBrowserTest {
}
private void openEditor(int rowIndex) {
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
GridCellElement cell = grid.getCell(rowIndex, 1);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
index a4483770e2..5360b5f918 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorMultiselectTest.java
@@ -7,9 +7,10 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridEditorMultiselectTest extends MultiBrowserTest {
@@ -38,7 +39,7 @@ public class GridEditorMultiselectTest extends MultiBrowserTest {
}
private GridElement openEditor() {
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
grid.getRow(0).doubleClick();
Assert.assertTrue("Grid editor should be displayed.",
grid.getEditor().isDisplayed());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
index 4353ba7e01..b8b69e238d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridEditorUITest.java
@@ -26,12 +26,13 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.legacyelements.LegacyPasswordFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.v7.testbench.customelements.PasswordFieldElement;
@TestCategory("grid")
public class GridEditorUITest extends MultiBrowserTest {
@@ -45,7 +46,7 @@ public class GridEditorUITest extends MultiBrowserTest {
}
private void openEditor(int rowIndex) {
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
GridCellElement cell = grid.getCell(rowIndex, 1);
@@ -57,7 +58,7 @@ public class GridEditorUITest extends MultiBrowserTest {
}
private GridCellElement getHeaderCell(int rowIndex, int colIndex) {
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
GridCellElement headerCell = grid.getHeaderCell(rowIndex, colIndex);
@@ -67,7 +68,7 @@ public class GridEditorUITest extends MultiBrowserTest {
@Test
public void testEditor() {
assertFalse("Sanity check",
- isElementPresent(LegacyPasswordFieldElement.class));
+ isElementPresent(PasswordFieldElement.class));
openEditor(5);
new Actions(getDriver()).sendKeys(Keys.ESCAPE).perform();
@@ -75,7 +76,7 @@ public class GridEditorUITest extends MultiBrowserTest {
openEditor(10);
assertTrue("Editor should be opened with a password field",
- isElementPresent(LegacyPasswordFieldElement.class));
+ isElementPresent(PasswordFieldElement.class));
assertFalse("Notification was present",
isElementPresent(NotificationElement.class));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
index dcd01ebb3e..fed6083b25 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridExtensionCommunicationTest.java
@@ -22,6 +22,7 @@ import org.junit.Test;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridExtensionCommunicationTest extends SingleBrowserTest {
@@ -30,7 +31,7 @@ public class GridExtensionCommunicationTest extends SingleBrowserTest {
public void testMouseClickIsSentToExtension() {
openTestURL();
- GridCellElement cell = $(LegacyGridElement.class).first().getCell(0, 4);
+ GridCellElement cell = $(GridElement.class).first().getCell(0, 4);
cell.click(5, 5);
int expectedX = cell.getLocation().getX() + 5;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
index 2c93a4e280..b04e34dd4e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridGeneratedPropertiesTest.java
@@ -21,11 +21,12 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridGeneratedPropertiesTest extends MultiBrowserTest {
@@ -33,7 +34,7 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
@Test
public void testMilesColumnExists() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertEquals("Miles header wasn't present.", "miles",
grid.getHeaderCell(0, 2).getText().toLowerCase());
}
@@ -41,7 +42,7 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
@Test
public void testUnsortableGeneratedProperty() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Overwritten foo property should not be sortable
GridCellElement fooHeader = grid.getHeaderCell(0, 0);
@@ -59,7 +60,7 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
@Test
public void testSortableGeneratedProperty() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Generated property baz is sortable
GridCellElement bazHeader = grid.getHeaderCell(0, 3);
@@ -78,7 +79,7 @@ public class GridGeneratedPropertiesTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
GridCellElement kmHeader = grid.getHeaderCell(0, 1);
assertFalse("Column km was unexpectedly sorted",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
index 762334b26b..3b5c33c956 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFooterComponentsTest.java
@@ -15,8 +15,6 @@
*/
package com.vaadin.tests.components.grid;
-import static org.junit.Assert.assertFalse;
-
import java.util.List;
import org.junit.Assert;
@@ -25,10 +23,10 @@ import org.junit.Test;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
@@ -41,7 +39,7 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
@Test
public void hideAndShowComponentsInHeader() {
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int filterRow = 2;
Assert.assertNull(getHeaderElement(grid, filterRow, 1));
@@ -79,7 +77,7 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
@Test
public void hideAndShowComponentsInFooter() {
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int filterRow = 0;
Assert.assertNull(getFooterElement(grid, filterRow, 1));
@@ -121,17 +119,17 @@ public class GridHeaderFooterComponentsTest extends SingleBrowserTest {
for (int i = 2; i >= 0; --i) {
// Remove Header
- $(LegacyGridElement.class).first().getHeaderCell(i, 0)
+ $(GridElement.class).first().getHeaderCell(i, 0)
.$(ButtonElement.class).first().click();
- assertFalse("Header " + i + " should not be present.",
- $(LegacyGridElement.class).first()
+ Assert.assertFalse("Header " + i + " should not be present.",
+ $(GridElement.class).first()
.isElementPresent(By.vaadin("#header[" + i + "]")));
// Remove Footer
- $(LegacyGridElement.class).first().getFooterCell(i, 0)
+ $(GridElement.class).first().getFooterCell(i, 0)
.$(ButtonElement.class).first().click();
- assertFalse("Footer " + i + " should not be present.",
- $(LegacyGridElement.class).first()
+ Assert.assertFalse("Footer " + i + " should not be present.",
+ $(GridElement.class).first()
.isElementPresent(By.vaadin("#footer[" + i + "]")));
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
index dfe5a692f6..b3d011a4f5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderFormatChangeTest.java
@@ -20,9 +20,10 @@ import org.junit.Test;
import org.openqa.selenium.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridHeaderFormatChangeTest extends MultiBrowserTest {
@@ -30,7 +31,7 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
@Test
public void testHeaderRetainsSelectAllForColumnRemoval() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Assert that we do not have the select all checkbox
Assert.assertTrue(
@@ -63,7 +64,7 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
@Test
public void testHeaderRetainsSelectAllForJoinColumnAdd() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Assert that we do not have the select all checkbox
Assert.assertTrue(
@@ -96,7 +97,7 @@ public class GridHeaderFormatChangeTest extends MultiBrowserTest {
@Test
public void selectAllShouldKeepState() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Assert that we do not have the select all checkbox
Assert.assertTrue(
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
index b2bf6d2293..be9cfc1356 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
@@ -22,10 +22,10 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridHeaderStyleNamesTest extends SingleBrowserTest {
@@ -35,7 +35,7 @@ public class GridHeaderStyleNamesTest extends SingleBrowserTest {
@Before
public void findGridCells() {
openTestURL();
- grid = $(LegacyGridElement.class).first();
+ grid = $(GridElement.class).first();
}
private GridCellElement getMergedHeaderCell() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
index 812e3e0c05..41f9d72267 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
@@ -27,10 +27,11 @@ import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.By;
-import com.vaadin.testbench.elements.GridElement;
-import com.vaadin.testbench.elements.OptionGroupElement;
+
+import com.vaadin.v7.testbench.customelements.OptionGroupElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* Tests that Grid gets correct height based on height mode, and resizes
@@ -83,7 +84,7 @@ public class GridHeightTest extends MultiBrowserTest {
.selectByText(detailsRowHeight);
sleep(500);
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int initialHeight = grid.getSize().getHeight();
try {
// check default height
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
index 52483d9a43..8383536d99 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInTabSheetTest.java
@@ -21,11 +21,12 @@ import static org.junit.Assert.assertFalse;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.elements.TabSheetElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridInTabSheetTest extends MultiBrowserTest {
@@ -97,6 +98,6 @@ public class GridInTabSheetTest extends MultiBrowserTest {
}
private GridElement getGridElement() {
- return $(LegacyGridElement.class).first();
+ return $(GridElement.class).first();
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
index 8a4e8e79ee..a607297f11 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInWindowResizeTest.java
@@ -23,9 +23,10 @@ import org.junit.Test;
import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridInWindowResizeTest extends MultiBrowserTest {
@Override
@@ -38,7 +39,7 @@ public class GridInWindowResizeTest extends MultiBrowserTest {
@Test
public void resizeWindow() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int col1WidthBefore = grid.getCell(0, 0).getSize().getWidth();
$(ButtonElement.class).caption("resize").first().click();
int col1WidthAfter = grid.getCell(0, 0).getSize().getWidth();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
index 58a4022814..4acac627ac 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridInitiallyHiddenColumnsTest.java
@@ -22,9 +22,10 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest {
@@ -32,7 +33,7 @@ public class GridInitiallyHiddenColumnsTest extends SingleBrowserTest {
@Test
public void ensureCorrectlyRendered() {
openTestURL("debug");
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertEquals("Rowling", grid.getCell(0, 0).getText());
Assert.assertEquals("Scott", grid.getCell(1, 0).getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
index e1993b1ac7..4eafd5f13d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridItemSetChangeTest.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridItemSetChangeTest extends SingleBrowserTest {
@@ -29,7 +29,7 @@ public class GridItemSetChangeTest extends SingleBrowserTest {
public void testValueChangeListenersWorkAfterItemSetChange() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertEquals("Last name initially wrong", "Bar",
grid.getCell(0, 1).getText());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
index 5479c84f16..962e8f392a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridLayoutDetailsRowTest.java
@@ -21,11 +21,12 @@ import static org.hamcrest.number.IsCloseTo.closeTo;
import org.junit.Test;
import org.openqa.selenium.By;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridLayoutElement;
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* Tests that details row displays GridLayout contents properly.
@@ -40,7 +41,7 @@ public class GridLayoutDetailsRowTest extends MultiBrowserTest {
openTestURL();
waitForElementPresent(By.className("v-grid"));
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
grid.getRow(2).click(5, 5);
waitForElementPresent(By.id("lbl2"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
index 7e860553b6..797ac8a680 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java
@@ -24,6 +24,7 @@ import org.openqa.selenium.By;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridMultiSelectionOnInitTest extends MultiBrowserTest {
@@ -32,7 +33,7 @@ public class GridMultiSelectionOnInitTest extends MultiBrowserTest {
public void testSelectAllCheckBoxExists() {
openTestURL();
assertTrue("The select all checkbox was missing.",
- $(LegacyGridElement.class).first().getHeaderCell(0, 0)
+ $(GridElement.class).first().getHeaderCell(0, 0)
.isElementPresent(By.tagName("input")));
}
@@ -40,9 +41,9 @@ public class GridMultiSelectionOnInitTest extends MultiBrowserTest {
public void testSetSelectedUpdatesClient() {
openTestURL();
assertFalse("Rows should not be selected initially.",
- $(LegacyGridElement.class).first().getRow(0).isSelected());
+ $(GridElement.class).first().getRow(0).isSelected());
$(ButtonElement.class).first().click();
assertTrue("Rows should be selected after button click.",
- $(LegacyGridElement.class).first().getRow(0).isSelected());
+ $(GridElement.class).first().getRow(0).isSelected());
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
index f0e77eb5c3..b1322949a8 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.junit.Test;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridMultiSelectionScrollBarTest extends MultiBrowserTest {
@@ -31,7 +32,7 @@ public class GridMultiSelectionScrollBarTest extends MultiBrowserTest {
openTestURL();
assertTrue("Horizontal scrollbar should not be visible.",
- $(LegacyGridElement.class).first().getHorizontalScroller()
+ $(GridElement.class).first().getHorizontalScroller()
.getAttribute("style").toLowerCase()
.contains("display: none;"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
index 5e50b98295..6bf16d6fe6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRendererChangeTest.java
@@ -27,6 +27,7 @@ import org.openqa.selenium.By;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridRendererChangeTest extends MultiBrowserTest {
@@ -35,7 +36,7 @@ public class GridRendererChangeTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- GridCellElement cell = $(LegacyGridElement.class).first().getCell(0, 0);
+ GridCellElement cell = $(GridElement.class).first().getCell(0, 0);
assertTrue("No button in the first cell.",
cell.isElementPresent(By.tagName("button")));
int width = cell.getSize().getWidth();
@@ -47,7 +48,7 @@ public class GridRendererChangeTest extends MultiBrowserTest {
for (ButtonElement button : buttons) {
button.click();
assertNoErrorNotifications();
- cell = $(LegacyGridElement.class).first().getCell(0, 0);
+ cell = $(GridElement.class).first().getCell(0, 0);
assertEquals("Cell size changed", width, cell.getSize().getWidth());
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
index 0735264bff..960f85b35e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridReplaceContainerTest.java
@@ -19,15 +19,16 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridReplaceContainerTest extends SingleBrowserTest {
@Test
public void selectAfterContainerChange() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
grid.getCell(0, 0).click();
Assert.assertTrue(grid.getRow(0).isSelected());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
index af5833824a..d28bb46bbc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeAndScrollTest.java
@@ -18,16 +18,17 @@ package com.vaadin.tests.components.grid;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridResizeAndScrollTest extends MultiBrowserTest {
@Test
public void scrollAndClick() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
grid.scrollToRow(49);
// select a row (click on checkbox)
grid.getCell(49, 0).click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
index 29cec68c6f..ee84187af0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridResizeHiddenColumnTest.java
@@ -25,10 +25,11 @@ import org.openqa.selenium.Dimension;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridResizeHiddenColumnTest extends MultiBrowserTest {
@@ -39,7 +40,7 @@ public class GridResizeHiddenColumnTest extends MultiBrowserTest {
@Test
public void testDragResizeHiddenColumnSize() {
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Actions action = new Actions(getDriver());
// Check if column 'Gender' hidden
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
index c5cfc65a5e..496f335e01 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridRowHeightChangeTest.java
@@ -8,9 +8,10 @@ import java.util.List;
import org.junit.Test;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.GridElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
+
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridRowHeightChangeTest extends MultiBrowserTest {
@@ -29,7 +30,7 @@ public class GridRowHeightChangeTest extends MultiBrowserTest {
// select theme
$(NativeSelectElement.class).first().selectByText(theme);
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int gridHeight = grid.getSize().getHeight();
int tabsheetHeight = findElements(
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
index 093a7b6d7b..2687716fcd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridScrollToLineWhileResizingTest.java
@@ -25,6 +25,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridScrollToLineWhileResizingTest extends MultiBrowserTest {
@@ -33,7 +34,7 @@ public class GridScrollToLineWhileResizingTest extends MultiBrowserTest {
public void testScrollToLineWorksWhileMovingSplitProgrammatically() {
openTestURL();
- $(LegacyGridElement.class).first().getCell(21, 0).click();
+ $(GridElement.class).first().getCell(21, 0).click();
List<WebElement> cells = findElements(By.className("v-grid-cell"));
boolean foundCell21 = false;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
index d9be0cdf64..eabbaa3234 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSelectAllCellTest.java
@@ -10,8 +10,9 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridSelectAllCellTest extends MultiBrowserTest {
@@ -24,7 +25,7 @@ public class GridSelectAllCellTest extends MultiBrowserTest {
@Test
public void selectAllCellCanBeClicked() throws IOException {
- GridElement.GridCellElement selectAllCell = $(LegacyGridElement.class).first()
+ GridElement.GridCellElement selectAllCell = $(GridElement.class).first()
.getHeaderCell(0, 0);
new Actions(getDriver()).moveToElement(selectAllCell, 2, 2).click()
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
index c16ccbe5fb..a63dc5374f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
@@ -24,15 +24,16 @@ import org.openqa.selenium.Dimension;
import org.openqa.selenium.Point;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridSidebarPositionTest extends MultiBrowserTest {
@Test
public void heightRestrictedToBrowserWindow() {
openTestURL();
- GridElement gridWithVeryManyColumns = $(LegacyGridElement.class)
+ GridElement gridWithVeryManyColumns = $(GridElement.class)
.id(GridSidebarPosition.POPUP_WINDOW_HEIGHT);
getSidebarOpenButton(gridWithVeryManyColumns).click();
Dimension popupSize = getSidebarPopup().getSize();
@@ -45,7 +46,7 @@ public class GridSidebarPositionTest extends MultiBrowserTest {
@Test
public void popupNotBelowBrowserWindow() {
openTestURL();
- GridElement gridAtBottom = $(LegacyGridElement.class)
+ GridElement gridAtBottom = $(GridElement.class)
.id(GridSidebarPosition.POPUP_WINDOW_MOVED_UP);
getSidebarOpenButton(gridAtBottom).click();
WebElement sidebarPopup = getSidebarPopup();
@@ -60,7 +61,7 @@ public class GridSidebarPositionTest extends MultiBrowserTest {
@Test
public void popupAbove() {
openTestURL();
- GridElement gridPopupAbove = $(LegacyGridElement.class)
+ GridElement gridPopupAbove = $(GridElement.class)
.id(GridSidebarPosition.POPUP_ABOVE);
WebElement sidebarOpenButton = getSidebarOpenButton(gridPopupAbove);
sidebarOpenButton.click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
index d0db225816..7c6fe714ea 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSingleColumnTest.java
@@ -22,6 +22,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridSingleColumnTest extends MultiBrowserTest {
@@ -30,7 +31,7 @@ public class GridSingleColumnTest extends MultiBrowserTest {
public void testHeaderIsVisible() {
openTestURL();
- GridCellElement cell = $(LegacyGridElement.class).first().getHeaderCell(0, 0);
+ GridCellElement cell = $(GridElement.class).first().getHeaderCell(0, 0);
Assert.assertTrue("No header available",
cell.getText().equalsIgnoreCase("header"));
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
index 8119c547d2..b69d762313 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSortIndicatorTest.java
@@ -19,9 +19,10 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridSortIndicatorTest extends MultiBrowserTest {
@@ -29,7 +30,7 @@ public class GridSortIndicatorTest extends MultiBrowserTest {
@Test
public void testIndicators() throws InterruptedException {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Clicking the left header cell should set ascending sort order for
// both columns.
grid.getHeaderCell(0, 0).click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
index df32e3ff67..b43b8a353c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSpacerDecoClipTest.java
@@ -21,10 +21,11 @@ import org.openqa.selenium.By;
import org.openqa.selenium.SearchContext;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.minitutorials.v7_5.ShowingExtraDataForRows;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* Test for "Grid detail row outline overflows" (#17826)
@@ -45,7 +46,7 @@ public class GridSpacerDecoClipTest extends MultiBrowserTest {
public void testNewSpacerClip() {
openTestURL();
- GridElement gridElement = $(LegacyGridElement.class).first();
+ GridElement gridElement = $(GridElement.class).first();
gridElement.scrollToRow(999);
GridElement.GridRowElement nextToLastRow = gridElement.getRow(998);
nextToLastRow.doubleClick();
@@ -65,7 +66,7 @@ public class GridSpacerDecoClipTest extends MultiBrowserTest {
public void testRemovedSpacerClip() throws InterruptedException {
openTestURL();
- GridElement gridElement = $(LegacyGridElement.class).first();
+ GridElement gridElement = $(GridElement.class).first();
gridElement.scrollToRow(999);
GridElement.GridRowElement lastRow = gridElement.getRow(999);
lastRow.doubleClick(); // Open lowest Row Details
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
index 66c9422424..0349335e0b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSubPixelProblemWrappingTest.java
@@ -19,10 +19,10 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridRowElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridSubPixelProblemWrappingTest extends MultiBrowserTest {
@@ -31,7 +31,7 @@ public class GridSubPixelProblemWrappingTest extends MultiBrowserTest {
public void addedRowShouldNotWrap() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
// Cells in first row should be at the same y coordinate as the row
assertRowAndCellTops(grid, 0);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
index 2c00295408..3265e29506 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSwitchRenderersTest.java
@@ -19,9 +19,10 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridSwitchRenderersTest extends MultiBrowserTest {
@@ -35,7 +36,7 @@ public class GridSwitchRenderersTest extends MultiBrowserTest {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertTrue(
"Initial rendering of column 1 is not unformatted text",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
index e1b4278499..46520d9f06 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeChangeTest.java
@@ -21,9 +21,10 @@ import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.remote.DesiredCapabilities;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridThemeChangeTest extends MultiBrowserTest {
@@ -38,13 +39,13 @@ public class GridThemeChangeTest extends MultiBrowserTest {
public void testThemeChange() {
openTestURL("debug");
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
int reindeerHeight = grid.getRow(0).getSize().getHeight();
grid.getCell(0, 0).click();
- grid = $(LegacyGridElement.class).first();
+ grid = $(GridElement.class).first();
int valoHeight = grid.getRow(0).getSize().getHeight();
Assert.assertTrue(
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
index 92f36cb5a5..977b304665 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
@@ -22,14 +22,14 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.GridElement.GridEditorElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserThemeTest;
-import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
+import com.vaadin.v7.testbench.customelements.DateFieldElement;
+import com.vaadin.v7.testbench.customelements.GridElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
@TestCategory("grid")
public class GridThemeUITest extends MultiBrowserThemeTest {
@@ -68,8 +68,7 @@ public class GridThemeUITest extends MultiBrowserThemeTest {
GridEditorElement editor = grid.getEditor();
- LegacyDateFieldElement dateField = editor
- .$(LegacyDateFieldElement.class).first();
+ DateFieldElement dateField = editor.$(DateFieldElement.class).first();
WebElement input = dateField.findElement(By.xpath("input"));
input.sendKeys("Invalid", Keys.TAB);
editor.save();
@@ -103,7 +102,7 @@ public class GridThemeUITest extends MultiBrowserThemeTest {
*/
private void selectPage(String string) {
$(NativeSelectElement.class).id("page").selectByText(string);
- grid = $(LegacyGridElement.class).first();
+ grid = $(GridElement.class).first();
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
index 01b735abd3..453c02a064 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWidthIncreaseTest.java
@@ -23,10 +23,11 @@ import org.junit.Test;
import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridWidthIncreaseTest extends MultiBrowserTest {
@@ -37,7 +38,7 @@ public class GridWidthIncreaseTest extends MultiBrowserTest {
public void testColumnsExpandWithGrid() throws IOException {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
double accuracy = 1.0d;
DesiredCapabilities cap = getDesiredCapabilities();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
index 7556e78b70..dc706c369f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithBrokenRendererTest.java
@@ -18,15 +18,16 @@ package com.vaadin.tests.components.grid;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridWithBrokenRendererTest extends SingleBrowserTest {
@Test
public void ensureRendered() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
assertRow(grid, 0, "FI", "", "Finland");
assertRow(grid, 1, "SE", "", "Sweden");
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
index 8a525b5cdd..b152e46428 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridWithLabelEditorTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridWithLabelEditorTest extends SingleBrowserTest {
@@ -31,6 +32,6 @@ public class GridWithLabelEditorTest extends SingleBrowserTest {
assertNoErrorNotifications();
assertEquals("LabelEditor content not correct.", "FooFoo",
- $(LegacyGridElement.class).first().getEditor().getField(0).getText());
+ $(GridElement.class).first().getEditor().getField(0).getText());
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
index 68decedb18..a84f119e1d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/InitialFrozenColumnsTest.java
@@ -24,6 +24,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class InitialFrozenColumnsTest extends MultiBrowserTest {
@@ -35,7 +36,7 @@ public class InitialFrozenColumnsTest extends MultiBrowserTest {
Assert.assertFalse("Notification was present",
isElementPresent(NotificationElement.class));
- WebElement cell = $(LegacyGridElement.class).first().getCell(0, 0);
+ WebElement cell = $(GridElement.class).first().getCell(0, 0);
assertTrue(cell.getAttribute("class").contains("frozen"));
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
index dcf780d589..13554bc36d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
@@ -18,10 +18,11 @@ package com.vaadin.tests.components.grid;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class JavaScriptRenderersTest extends MultiBrowserTest {
@@ -31,7 +32,7 @@ public class JavaScriptRenderersTest extends MultiBrowserTest {
setDebug(true);
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
GridCellElement cell_1_1 = grid.getCell(1, 1);
GridCellElement cell_2_2 = grid.getCell(2, 2);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/LegacyGridElement.java b/uitest/src/test/java/com/vaadin/tests/components/grid/LegacyGridElement.java
deleted file mode 100644
index 907c02660d..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/LegacyGridElement.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.grid;
-
-import com.vaadin.testbench.elements.GridElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * TestBench Element API for Grid
- *
- * @since
- *
- * @author Vaadin Ltd
- * TODO move to TestBench
- */
-@ServerClass("com.vaadin.ui.LegacyGrid")
-public class LegacyGridElement extends GridElement{
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
index 0293cee531..52e66331f2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullHeadersTest.java
@@ -18,8 +18,9 @@ package com.vaadin.tests.components.grid;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class NullHeadersTest extends SingleBrowserTest {
@@ -27,7 +28,7 @@ public class NullHeadersTest extends SingleBrowserTest {
public void gridWithNullHeadersShouldBeRendered() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertEquals(1, grid.getHeaderCount());
Assert.assertEquals(3, grid.getHeaderCells(0).size());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
index 381c7b8ce6..2893ed95d9 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/NullRenderersTest.java
@@ -19,10 +19,11 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.LabelElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class NullRenderersTest extends MultiBrowserTest {
@@ -51,11 +52,11 @@ public class NullRenderersTest extends MultiBrowserTest {
}
private GridElement findGridWithDefaults() {
- return $(LegacyGridElement.class).id("test-grid-defaults");
+ return $(GridElement.class).id("test-grid-defaults");
}
private GridElement findGridNoDefaults() {
- return $(LegacyGridElement.class).id("test-grid");
+ return $(GridElement.class).id("test-grid");
}
private LabelElement findDebugLabel() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
index f822d7de7f..d80d147e73 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/ProgrammaticEditorControlTest.java
@@ -19,10 +19,11 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class ProgrammaticEditorControlTest extends SingleBrowserTest {
@@ -30,7 +31,7 @@ public class ProgrammaticEditorControlTest extends SingleBrowserTest {
@Test
public void multipleOpenFromServerSide() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
ButtonElement editButton = $(ButtonElement.class).caption("Edit")
.first();
ButtonElement cancelButton = $(ButtonElement.class).caption("Cancel")
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
index 968f8ee091..9966eafc84 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SelectDuringInitTest.java
@@ -18,9 +18,10 @@ package com.vaadin.tests.components.grid;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class SelectDuringInitTest extends SingleBrowserTest {
@@ -29,7 +30,7 @@ public class SelectDuringInitTest extends SingleBrowserTest {
public void testSelectDuringInit() {
openTestURL();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertTrue(grid.getRow(1).isSelected());
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
index 9cf9a122e5..da9a72e6a7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/SortableHeaderStylesTest.java
@@ -18,8 +18,9 @@ package com.vaadin.tests.components.grid;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.OptionGroupElement;
+import com.vaadin.v7.testbench.customelements.OptionGroupElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class SortableHeaderStylesTest extends SingleBrowserTest {
@Test
@@ -44,7 +45,7 @@ public class SortableHeaderStylesTest extends SingleBrowserTest {
}
private boolean hasSortableStyle(int column) {
- return $(LegacyGridElement.class).first().getHeaderCell(0, column)
+ return $(GridElement.class).first().getHeaderCell(0, column)
.getAttribute("class").contains("sortable");
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
index 766be62b8c..0b2d216ade 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/WidgetRenderersTest.java
@@ -31,6 +31,7 @@ import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* TB tests for the various builtin widget-based renderers.
@@ -142,7 +143,7 @@ public class WidgetRenderersTest extends MultiBrowserTest {
}
GridCellElement getGridCell(int row, int col) {
- return $(LegacyGridElement.class).first().getCell(row, col);
+ return $(GridElement.class).first().getCell(row, col);
}
private void waitUntilTextUpdated(final WebElement button,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
index df615f5235..b55e3ec026 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicClientFeaturesTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* GridBasicClientFeatures.
@@ -65,12 +65,12 @@ public abstract class GridBasicClientFeaturesTest
}
@Override
- protected CustomGridElement getGridElement() {
+ protected GridElement getGridElement() {
if (composite) {
// Composite requires the basic client features widget for subparts
return ((TestBenchElement) findElement(
By.vaadin("//TestWidgetComponent")))
- .wrap(CustomGridElement.class);
+ .wrap(GridElement.class);
} else {
return super.getGridElement();
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
index 995fb64dcb..bd229cfc76 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridBasicFeaturesTest.java
@@ -30,8 +30,8 @@ import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
@@ -50,9 +50,9 @@ public abstract class GridBasicFeaturesTest extends MultiBrowserTest {
return GridBasicFeatures.class;
}
- protected CustomGridElement getGridElement() {
+ protected GridElement getGridElement() {
return ((TestBenchElement) findElement(By.id("testComponent")))
- .wrap(CustomGridElement.class);
+ .wrap(GridElement.class);
}
protected void scrollGridVerticallyTo(double px) {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
index e4f81e99f8..358d310190 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridDefaultTextRendererTest.java
@@ -23,20 +23,15 @@ import org.junit.Before;
import org.junit.Test;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
import com.vaadin.testbench.parallel.TestCategory;
+import com.vaadin.tests.components.grid.GridCellFocusOnResetSizeTest.MyGridElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class GridDefaultTextRendererTest extends MultiBrowserTest {
- @ServerClass("com.vaadin.tests.widgetset.server.TestWidgetComponent")
- public static class MyGridElement extends GridElement {
- // empty
- }
-
private GridElement grid;
@Before
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
index cb9b8c1389..2767f71578 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/GridHeightByRowOnInitTest.java
@@ -3,8 +3,8 @@ package com.vaadin.tests.components.grid.basicfeatures;
import org.junit.Test;
import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.components.grid.LegacyGridElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
@SuppressWarnings("all")
@TestCategory("grid")
@@ -13,7 +13,7 @@ public class GridHeightByRowOnInitTest extends MultiBrowserTest {
@Test
public void gridHeightIsMoreThanACoupleOfRows() {
openTestURL();
- int height = $(LegacyGridElement.class).first().getSize().getHeight();
+ int height = $(GridElement.class).first().getSize().getHeight();
assertGreater(
"Grid should be much taller than 150px (was " + height + "px)",
height, 150);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
index e7b9e5a31f..4ffa26a22d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridClientColumnPropertiesTest.java
@@ -24,11 +24,11 @@ import java.util.List;
import org.junit.Test;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
import com.vaadin.tests.widgetset.client.grid.GridBasicClientFeaturesWidget;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridClientColumnPropertiesTest
extends GridBasicClientFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
index 716d65d550..430a8ad5ce 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
@@ -35,8 +35,8 @@ import com.vaadin.shared.ui.grid.ScrollDestination;
import com.vaadin.testbench.By;
import com.vaadin.testbench.ElementQuery;
import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.FixedNotificationElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
-import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
public class GridDetailsClientTest extends GridBasicClientFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
index 13481105ba..5f793e6620 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridSidebarContentTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest;
-import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridSidebarContentTest extends GridBasicClientFeaturesTest {
@@ -53,7 +53,7 @@ public class GridSidebarContentTest extends GridBasicClientFeaturesTest {
@Test
public void testAddingCustomSidebarItem() {
openTestURL();
- CustomGridElement gridElement = getGridElement();
+ GridElement gridElement = getGridElement();
selectMenuPath("Component", "Sidebar", "Add item to end");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
deleted file mode 100644
index cc3821c769..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.grid.basicfeatures.element;
-
-import org.openqa.selenium.NoSuchElementException;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.GridElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.ui.LegacyGrid")
-public class CustomGridElement extends GridElement {
- /**
- * Gets the element that contains the details of a row.
- *
- * @since
- * @param rowIndex
- * the index of the row for the details
- * @return the element that contains the details of a row. <code>null</code>
- * if no widget is defined for the detials row
- * @throws NoSuchElementException
- * if the given details row is currently not open
- */
- public TestBenchElement getDetails(int rowIndex)
- throws NoSuchElementException {
- return getSubPart("#details[" + rowIndex + "]");
- }
-
- private TestBenchElement getSubPart(String subPartSelector) {
- return (TestBenchElement) findElement(By.vaadin(subPartSelector));
- }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
index d4e258d48a..d340e27c63 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridCellFocusAdjustmentTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
import org.openqa.selenium.Keys;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridCellFocusAdjustmentTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
index 80f04a051e..d9dfc783dd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridClearContainerTest.java
@@ -19,10 +19,10 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.components.grid.LegacyGridElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
/**
* Tests that removing and adding rows doesn't cause an infinite loop in the
@@ -40,7 +40,7 @@ public class GridClearContainerTest extends MultiBrowserTest {
openTestURL();
ButtonElement button = $(ButtonElement.class)
.caption("Clear and re-add").first();
- GridElement grid = $(LegacyGridElement.class).first();
+ GridElement grid = $(GridElement.class).first();
Assert.assertEquals(ERRORNOTE, "default", grid.getCell(0, 0).getText());
Assert.assertEquals(ERRORNOTE, "default", grid.getCell(1, 0).getText());
button.click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
index 977d6c3894..d80788b975 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridKeyboardNavigationTest.java
@@ -24,9 +24,9 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridKeyboardNavigationTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
index edc59cf5ec..6f4fea5eeb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridScrollTest.java
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
-import com.vaadin.tests.components.grid.LegacyGridElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridScrollTest extends GridBasicFeaturesTest {
@@ -39,17 +39,17 @@ public class GridScrollTest extends GridBasicFeaturesTest {
selectMenuPath("Component", "Size", "HeightMode Row");
selectMenuPath("Settings", "Clear log");
- $(LegacyGridElement.class).first().scrollToRow(40);
+ $(GridElement.class).first().scrollToRow(40);
assertEquals("Log row did not contain expected item request",
"0. Requested items 0 - 86", getLogRow(0));
assertEquals("There should be only one log row", " ", getLogRow(1));
selectMenuPath("Settings", "Clear log");
- $(LegacyGridElement.class).first().scrollToRow(100);
+ $(GridElement.class).first().scrollToRow(100);
assertEquals("Log row did not contain expected item request",
"0. Requested items 47 - 146", getLogRow(0));
assertEquals("There should be only one log row", " ", getLogRow(1));
selectMenuPath("Settings", "Clear log");
- $(LegacyGridElement.class).first().scrollToRow(300);
+ $(GridElement.class).first().scrollToRow(300);
assertEquals("Log row did not contain expected item request",
"0. Requested items 247 - 346", getLogRow(0));
assertEquals("There should be only one log row", " ", getLogRow(1));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
index cc71486341..fdf36e9e9e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSelectionTest.java
@@ -26,11 +26,11 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.GridElement.GridRowElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridSelectionTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
index 5824a43be0..bcfaab2be7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridSortingTest.java
@@ -31,10 +31,10 @@ import org.openqa.selenium.interactions.Actions;
import com.vaadin.shared.data.sort.SortDirection;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridSortingTest extends GridBasicFeaturesTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
index 7865dfebd8..424d62a712 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
@@ -31,12 +31,12 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.GridElement;
+
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.tests.components.grid.LegacyGridElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridStructureTest extends GridBasicFeaturesTest {
@@ -494,7 +494,7 @@ public class GridStructureTest extends GridBasicFeaturesTest {
// Wait until page is loaded completely.
int count = 0;
- while (!$(LegacyGridElement.class).exists()) {
+ while (!$(GridElement.class).exists()) {
if (count == 100) {
fail("Reloading page failed");
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
index 7ff432d5a1..5d81feb576 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/LoadingIndicatorTest.java
@@ -22,9 +22,9 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.ExpectedConditions;
-import com.vaadin.testbench.elements.GridElement;
-import com.vaadin.tests.components.grid.LegacyGridElement;
+
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class LoadingIndicatorTest extends GridBasicFeaturesTest {
@Test
@@ -34,7 +34,7 @@ public class LoadingIndicatorTest extends GridBasicFeaturesTest {
selectMenuPath("Component", "State", "Container delay", "2000");
- GridElement gridElement = $(LegacyGridElement.class).first();
+ GridElement gridElement = $(GridElement.class).first();
Assert.assertFalse(
"Loading indicator should not be visible before disabling waitForVaadin",
diff --git a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
index 2f903a371e..c677dcb1ce 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/gridlayout/GridLayoutAlignmentsTest.java
@@ -32,7 +32,7 @@ public class GridLayoutAlignmentsTest extends MultiBrowserTest {
private int middleY = 400 / 2 - 30 / 2;
private int middleX = middleY;
private int bottomX = 400 - 30;
- private int bottomY = bottomX;;
+ private int bottomY = bottomX;
@Override
protected boolean requireWindowFocusForIE() {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
index ed1cbbea71..09e149507f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectAddRemoveItemsTest.java
@@ -21,7 +21,7 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.ListSelectElement;
+import com.vaadin.v7.testbench.customelements.ListSelectElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class ListSelectAddRemoveItemsTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
index e63f10f987..08066e9d8c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectNoDomRebuildTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.ListSelectElement;
+import com.vaadin.v7.testbench.customelements.ListSelectElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class ListSelectNoDomRebuildTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
index 44cc4b86b8..be2d04f915 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/listselect/ListSelectPushSelectionChangesTest.java
@@ -24,8 +24,8 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.Select;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.ListSelectElement;
-import com.vaadin.testbench.elements.OptionGroupElement;
+import com.vaadin.v7.testbench.customelements.ListSelectElement;
+import com.vaadin.v7.testbench.customelements.OptionGroupElement;
import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
public class ListSelectPushSelectionChangesTest
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
index e105006a6c..35982dda9f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarNavigationMouseTest.java
@@ -3,23 +3,11 @@ package com.vaadin.tests.components.menubar;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elementsbase.ServerClass;
+import com.vaadin.testbench.customelements.MenuBarElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class MenuBarNavigationMouseTest extends MultiBrowserTest {
- @ServerClass("com.vaadin.ui.MenuBar")
- public static class MenuBarElement
- extends com.vaadin.testbench.elements.MenuBarElement {
-
- public void openMenuPath(String... captions) {
- for (String c : captions) {
- findElement(By.vaadin("#" + c)).click();
- }
- }
- }
-
@Override
protected Class<?> getUIClass() {
return MenuBarNavigation.class;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java
index b2f7994e9b..246c7aa09d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectNullTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.nativeselect;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
public class NativeSelectNullTest extends SingleBrowserTestPhantomJS2 {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
index 63ffca5057..518e9b40e1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/nativeselect/NativeSelectsFocusAndBlurListenerTests.java
@@ -20,7 +20,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
index fd4a651f63..8ce35fcc73 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/notification/NotificationsWaiAriaTest.java
@@ -22,11 +22,11 @@ import org.openqa.selenium.WebElement;
import com.vaadin.shared.ui.ui.NotificationRole;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter;
+import com.vaadin.v7.data.util.converter.StringToEnumConverter;
/**
* Unit test class for Notification ARIA (Accessible Rich Internet Applications)
@@ -58,7 +58,7 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
postfix.clear();
postfix.sendKeys("- press ESC to close");
- type.selectByText(LegacyStringToEnumConverter
+ type.selectByText(StringToEnumConverter
.enumToString(NotificationRole.ALERT, null));
show.click();
@@ -83,7 +83,7 @@ public class NotificationsWaiAriaTest extends MultiBrowserTest {
notification.close();
- type.selectByText(LegacyStringToEnumConverter
+ type.selectByText(StringToEnumConverter
.enumToString(NotificationRole.STATUS, null));
show.click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
index 70b5533b05..89a0412336 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/ErrorIndicatorTest.java
@@ -26,7 +26,7 @@ import org.openqa.selenium.interactions.internal.Coordinates;
import org.openqa.selenium.internal.Locatable;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class ErrorIndicatorTest extends MultiBrowserTest {
@@ -35,11 +35,11 @@ public class ErrorIndicatorTest extends MultiBrowserTest {
String tooltipText;
openTestURL();
- showTooltip($(LegacyTextFieldElement.class).first());
+ showTooltip($(TextFieldElement.class).first());
tooltipText = driver.findElement(By.className("v-tooltip")).getText();
assertEquals(tooltipText, "Vertical layout tooltip");
- showTooltip($(LegacyTextFieldElement.class).get(1));
+ showTooltip($(TextFieldElement.class).get(1));
tooltipText = driver.findElement(By.className("v-tooltip")).getText();
assertEquals(tooltipText, "Horizontal layout tooltip");
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
index 0e64b0c9f9..e2d5337238 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/EnumSelectTest.java
@@ -22,8 +22,8 @@ import org.junit.Test;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class EnumSelectTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
index b2b9a3e153..49b0f2fe0f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/select/SelectWithIntegersTest.java
@@ -18,7 +18,7 @@ package com.vaadin.tests.components.select;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.ListSelectElement;
+import com.vaadin.v7.testbench.customelements.ListSelectElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class SelectWithIntegersTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
index f098e50bbf..1d32dd585c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/AsyncPushUpdatesTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.NoSuchElementException;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
index e9e9d51578..3813db636c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
@@ -24,8 +24,9 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.tests.components.table.CustomTableElement.ContextMenuElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement.ContextMenuElement;
public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
@@ -33,7 +34,7 @@ public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
public void expandCorrectlyAfterCollapse() throws IOException {
openTestURL();
- CustomTableElement table = $(CustomTableElement.class).first();
+ TableElement table = $(TableElement.class).first();
// Hide col2 through UI
table.openCollapseMenu().getItem(1).click();
@@ -77,7 +78,7 @@ public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
@Test
public void collapseEvents() {
openTestURL();
- CustomTableElement table = $(CustomTableElement.class).first();
+ TableElement table = $(TableElement.class).first();
// Through menu
table.openCollapseMenu().getItem(0).click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
index 418ff76a01..476b53b497 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnReorderingWithManyColumnsTest.java
@@ -9,7 +9,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TableHeaderElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
index f8d1580a47..b40a085af4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ContainerSizeChangeTest.java
@@ -11,7 +11,7 @@ import org.openqa.selenium.NoSuchElementException;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ContainerSizeChangeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java b/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java
deleted file mode 100644
index 78262f2f8b..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.table;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.elements.TableElement;
-import com.vaadin.testbench.elementsbase.AbstractElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.ui.Table")
-public class CustomTableElement extends TableElement {
-
- public CollapseMenu openCollapseMenu() {
- getCollapseMenuToggle().click();
- WebElement cm = getDriver()
- .findElement(By.xpath("//*[@id='PID_VAADIN_CM']"));
- return wrapElement(cm, getCommandExecutor()).wrap(CollapseMenu.class);
- }
-
- public static class CollapseMenu extends ContextMenuElement {
- }
-
- public WebElement getCollapseMenuToggle() {
- return findElement(By.className("v-table-column-selector"));
- }
-
- public static class ContextMenuElement extends AbstractElement {
-
- public WebElement getItem(int index) {
- return findElement(
- By.xpath(".//table//tr[" + (index + 1) + "]//td/*"));
- }
-
- }
-
- public ContextMenuElement getContextMenu() {
- WebElement cm = getDriver().findElement(By.className("v-contextmenu"));
- return wrapElement(cm, getCommandExecutor())
- .wrap(ContextMenuElement.class);
- }
-
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
index c5838096bc..e1bb5db8ee 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/DisabledSortingTableTest.java
@@ -9,7 +9,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class DisabledSortingTableTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
index 3596920db6..0d1e39e36e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/EditableModeChangeTest.java
@@ -26,7 +26,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
index 3e5ab930ad..5134ac0461 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FocusOnSelectedItemTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
index 8bf65c0e7f..cb28fc9f0a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterClickTest.java
@@ -25,7 +25,7 @@ import org.junit.Test;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
index e12e72d7d6..c6ccab066b 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
index 3b770ade17..81e263b1df 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderClickTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
index 33ca73aee6..f99ec796d1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddleTest.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
import org.junit.Test;
import org.openqa.selenium.By;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
index 59407f3c74..f9f4189444 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderPositionWhenSortingTest.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.junit.Test;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
index 8188b0dfdb..fc9f525b81 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderRightClickAfterDragTest.java
@@ -22,7 +22,7 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.WindowElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
index dfad86625b..ad4dbee4b1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderSyncOnScrollTest.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
index 0f37db1b4a..a97c6808ee 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/HeaderUpdateWhenNoRowsTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
index 84471049b2..fd351bda3f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.CheckBoxElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ItemClickEventsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
index 67bf49597b..2bbed3a2c1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ItemClickEventsTestWithShiftOrCtrl.java
@@ -28,7 +28,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.CheckBoxElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
index 5a3e421bda..4ed014988d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTableTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
index c0119fadce..94f7542998 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/LongMultiselectTest.java
@@ -11,7 +11,7 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class LongMultiselectTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
index 1d2481ca3d..109c4f110a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/MemoryLeakTableTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
index d0bd6c29ad..7e2fd588df 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/OnlyCollapsibleInMenu.java
@@ -20,6 +20,7 @@ import org.junit.Test;
import com.vaadin.shared.ui.table.CollapseMenuContent;
import com.vaadin.tests.tb3.SingleBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
public class OnlyCollapsibleInMenu extends SingleBrowserTest {
@@ -31,7 +32,7 @@ public class OnlyCollapsibleInMenu extends SingleBrowserTest {
@Test
public void testOnlyCollapsibleInMenu() {
openTestURL();
- CustomTableElement table = $(CustomTableElement.class).first();
+ TableElement table = $(TableElement.class).first();
selectMenuPath("Component", "Columns", "Property 3", "Collapsible");
table.getCollapseMenuToggle().click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
index e201b2ad96..eee8fa4adc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ReloadWidgetsTest.java
@@ -9,7 +9,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ReloadWidgetsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
index fe6026ceb2..c5d5b5241e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllConstantViewportTest.java
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class SelectAllConstantViewportTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
index 25524ffaa5..655cbd6741 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectAllRowsTest.java
@@ -32,7 +32,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
index 8b5b54cfaa..b502280ae3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SelectableEditableTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.components.table;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class SelectableEditableTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
index 052c0be89a..dc09923065 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SetCurrentPageFirstItemIndexTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.NoSuchElementException;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
import junit.framework.Assert;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
index e2bc775c06..7840467460 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortLabelsInTableTest.java
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
index 6e7727a6e2..9557bd9e6e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/SortableHeaderStylesTest.java
@@ -18,8 +18,8 @@ package com.vaadin.tests.components.table;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.OptionGroupElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.OptionGroupElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class SortableHeaderStylesTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
index 3b5019c30a..a26ac1fd88 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableBlurFocusTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableBlurFocusTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
index 0f2bb1579d..8b3c7557d7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponentsTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
index f6a8c1d527..0442594d16 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnAddAndResizeTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableColumnAddAndResizeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
index 5403e8aff4..e98c223330 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
@@ -27,7 +27,7 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
index ceff8c1d82..9903739644 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnWidthsAndSortingTest.java
@@ -18,7 +18,7 @@ package com.vaadin.tests.components.table;
import org.junit.Assert;
import org.junit.Test;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableColumnWidthsAndSortingTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
index 558098e2f1..8e22e2ab38 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableContextMenuAndIconsTest.java
@@ -7,7 +7,7 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableContextMenuAndIconsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
index fe061ae3e0..ecda384a19 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDragColumnTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TableHeaderElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
index e2dab64da6..c9935775f3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableDropIndicatorValoTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
index 0211dd9bac..87501cb774 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableInIframeRowClickScrollJumpTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
index e53f0351bc..5a2fd1163e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableItemDescriptionGeneratorUITest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.TooltipTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
index 2f0ebda0b1..379dbcad37 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElementTest.java
@@ -25,8 +25,8 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
+import com.vaadin.v7.testbench.customelements.TableElement;
/**
* Regular click cases already covered by @LabelEmbeddedClickThroughForTableTest
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
index f7429d5e59..56503584b2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableNavigationPageDownTest.java
@@ -29,7 +29,7 @@ import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.support.ui.ExpectedCondition;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
index db14c49d35..1eea1ef91e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableParentEnabledStateChangeTest.java
@@ -19,7 +19,7 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TableRowElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
index 8a99bb4043..05131cced5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRepairsScrollPositionOnReAddingAllRowsTest.java
@@ -21,7 +21,7 @@ import static org.hamcrest.number.IsCloseTo.closeTo;
import org.junit.Before;
import org.junit.Test;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
index 1bb35b14e5..763f79f947 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowHeight2Test.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
index 250535ff0f..715cf51c7f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableRowScrolledBottomTest.java
@@ -25,7 +25,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
index 5c5d2b1719..1e892274ce 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollUpOnSelectTest.java
@@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
index 525660fc4c..cf5220abb0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableScrollsOnSelectionTest.java
@@ -4,7 +4,7 @@ import java.io.IOException;
import org.junit.Test;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableScrollsOnSelectionTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
index 1745c580c2..4b9869049e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSetUndefinedSizeTest.java
@@ -5,7 +5,7 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableSetUndefinedSizeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
index e587a37a71..c3de92d705 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableSortingIndicatorTest.java
@@ -19,7 +19,7 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
index caeb6dbd32..6ba6d70d33 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableToggleColumnVisibilityTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TableHeaderElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
index d26e9816e9..9f68aa6ecd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemIdTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
index 091c9866ae..a7c01f5e3d 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableWithPollingTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
index 902083fc92..1914c09f52 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/UpdateTableWhenUnfocusedTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class UpdateTableWhenUnfocusedTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
index 2850b3cf26..fc4b4205cc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textarea/TextAreaSizeResettedTest.java
@@ -16,7 +16,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
index 81e714f270..cb9b07f2e1 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/EnumTextFieldTest.java
@@ -20,27 +20,27 @@ import org.junit.Test;
import org.openqa.selenium.Keys;
import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class EnumTextFieldTest extends SingleBrowserTest {
@Test
public void validValues() {
openTestURL();
- $(LegacyTextFieldElement.class).first().clear();
- $(LegacyTextFieldElement.class).first().sendKeys("Value", Keys.TAB);
+ $(TextFieldElement.class).first().clear();
+ $(TextFieldElement.class).first().sendKeys("Value", Keys.TAB);
Assert.assertEquals("3. Value (valid)", getLogRow(0));
- $(LegacyTextFieldElement.class).first().clear();
- $(LegacyTextFieldElement.class).first().sendKeys("VaLuE");
- $(LegacyTextFieldElement.class).first().sendKeys(Keys.TAB);
+ $(TextFieldElement.class).first().clear();
+ $(TextFieldElement.class).first().sendKeys("VaLuE");
+ $(TextFieldElement.class).first().sendKeys(Keys.TAB);
Assert.assertEquals("5. Value (valid)", getLogRow(0));
- $(LegacyTextFieldElement.class).first().clear();
- $(LegacyTextFieldElement.class).first().sendKeys("The last value");
- $(LegacyTextFieldElement.class).first().sendKeys(Keys.TAB);
+ $(TextFieldElement.class).first().clear();
+ $(TextFieldElement.class).first().sendKeys("The last value");
+ $(TextFieldElement.class).first().sendKeys(Keys.TAB);
Assert.assertEquals("7. The last value (valid)", getLogRow(0));
- $(LegacyTextFieldElement.class).first().clear();
+ $(TextFieldElement.class).first().clear();
Assert.assertEquals("8. null (valid)", getLogRow(0));
}
@@ -48,10 +48,10 @@ public class EnumTextFieldTest extends SingleBrowserTest {
@Test
public void invalidValue() {
openTestURL();
- $(LegacyTextFieldElement.class).first().clear();
+ $(TextFieldElement.class).first().clear();
- $(LegacyTextFieldElement.class).first().sendKeys("bar");
- $(LegacyTextFieldElement.class).first().sendKeys(Keys.TAB);
+ $(TextFieldElement.class).first().sendKeys("bar");
+ $(TextFieldElement.class).first().sendKeys(Keys.TAB);
Assert.assertEquals("3. bar (INVALID)", getLogRow(0));
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
index 7519d2e75e..72af8d2243 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/LocaleChangeOnReadOnlyFieldTest.java
@@ -7,7 +7,7 @@ import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class LocaleChangeOnReadOnlyFieldTest extends MultiBrowserTest {
@@ -15,8 +15,7 @@ public class LocaleChangeOnReadOnlyFieldTest extends MultiBrowserTest {
public void localeIsChangedOnReadOnlyField() {
openTestURL();
- LegacyTextFieldElement textField = $(LegacyTextFieldElement.class)
- .first();
+ TextFieldElement textField = $(TextFieldElement.class).first();
assertThat(textField.getValue(), is("1,024,000"));
$(ButtonElement.class).caption("Change Locale").first().click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
index fd198d2bee..a7b4dcc69e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/textfield/RequiredTextFieldTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
/**
* Test for .v-required style
@@ -46,7 +46,7 @@ public class RequiredTextFieldTest extends MultiBrowserTest {
}
private String getStyles() {
- return $(LegacyTextFieldElement.class).first().getAttribute("class");
+ return $(TextFieldElement.class).first().getAttribute("class");
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
index e784f990f3..857ad95e95 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/tree/TreeHtmlContentAllowedTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TreeElement;
+import com.vaadin.v7.testbench.customelements.TreeElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
public class TreeHtmlContentAllowedTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
index 684b41e333..4cdbb6b8a7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/DisappearingComponentsTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.TreeTableElement;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
index e8676fcedf..1636fed769 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableContainerHierarchicalWrapperTest.java
@@ -22,7 +22,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.TreeTableElement;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
index 66513098a2..b3d96356db 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableItemDescriptionGeneratorUITest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TreeTableElement;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
import com.vaadin.tests.tb3.TooltipTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
index 469b94f518..d3faa80017 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableOutOfSyncTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.TreeTableElement;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
index 217184454f..4afdcdfbcd 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesPageLength0Test.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TreeTableElement;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
index 9620c01395..d14c0b1cd0 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTablePartialUpdatesTest.java
@@ -27,7 +27,7 @@ import org.openqa.selenium.support.ui.ExpectedConditions;
import com.vaadin.testbench.By;
import com.vaadin.testbench.commands.TestBenchElementCommands;
-import com.vaadin.testbench.elements.TreeTableElement;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
index c5d8661d80..76d8337092 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableScrollOnExpandTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.TreeTableElement;
+import com.vaadin.v7.testbench.customelements.TreeTableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TreeTableScrollOnExpandTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
index 2786e52849..e00c49ae1a 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import org.openqa.selenium.remote.DesiredCapabilities;
-import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
import com.vaadin.testbench.parallel.Browser;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
index 8ee6c85f19..2ac943b0f2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationTest.java
@@ -22,7 +22,7 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
-import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
index 80cd426077..c0eabbe7e3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
@@ -4,7 +4,7 @@ import org.junit.Assert;
import org.junit.Test;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class UIPollingTest extends MultiBrowserTest {
@@ -23,7 +23,7 @@ public class UIPollingTest extends MultiBrowserTest {
driver.getPageSource().contains("20. 10000ms has passed"));
}
- public LegacyTextFieldElement getTextField() {
- return $(LegacyTextFieldElement.class).first();
+ public TextFieldElement getTextField() {
+ return $(TextFieldElement.class).first();
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
index 9b38a11b25..7a9bd5e818 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/uitest/ThemeTest.java
@@ -8,39 +8,18 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.By;
+import com.vaadin.testbench.customelements.DateFieldElement;
+import com.vaadin.testbench.customelements.FixedNotificationElement;
+import com.vaadin.testbench.customelements.WindowElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
-import com.vaadin.testbench.elements.DateFieldElement;
-import com.vaadin.testbench.elements.TableElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
+import com.vaadin.testbench.elements.TabSheetElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
-import com.vaadin.tests.tb3.newelements.WindowElement;
public abstract class ThemeTest extends MultiBrowserTest {
- @ServerClass("com.vaadin.ui.DateField")
- public static class MyDateFieldElement extends DateFieldElement {
- public void openPopup() {
- findElement(By.tagName("button")).click();
- }
- }
-
- @ServerClass("com.vaadin.ui.TabSheet")
- public static class TabSheetElement
- extends com.vaadin.testbench.elements.TabSheetElement {
- @Override
- public void openTab(String tabCaption) {
- super.openTab(tabCaption);
- /* Layouting takes a moment after tab has been opened. */
- try {
- Thread.sleep(300);
- } catch (InterruptedException e) {
- }
- }
- }
-
@Override
protected boolean requireWindowFocusForIE() {
return true;
@@ -66,70 +45,80 @@ public abstract class ThemeTest extends MultiBrowserTest {
compareScreen("labels");
// Buttons tab
- themeTabSheet.openTab("Buttons");
+ openTab(themeTabSheet, "Buttons");
compareScreen("buttons");
// Embedded tab
- themeTabSheet.openTab("Embedded");
+ openTab(themeTabSheet, "Embedded");
compareScreen("embedded");
// Dates tab
- themeTabSheet.openTab("Dates");
+ openTab(themeTabSheet, "Dates");
testDates();
// TextFields tab
- themeTabSheet.openTab("TextFields");
+ openTab(themeTabSheet, "TextFields");
compareScreen("textfields");
// Selects tab
- themeTabSheet.openTab("Selects");
+ openTab(themeTabSheet, "Selects");
testSelects();
// Sliders tab
- themeTabSheet.openTab("Sliders");
+ openTab(themeTabSheet, "Sliders");
compareScreen("sliders");
// Uploads tab
- themeTabSheet.openTab("Uploads");
+ openTab(themeTabSheet, "Uploads");
compareScreen("uploads");
// Forms tab
- themeTabSheet.openTab("Forms");
+ openTab(themeTabSheet, "Forms");
compareScreen("forms");
// Tables tab
- themeTabSheet.openTab("Tables");
+ openTab(themeTabSheet, "Tables");
testTables();
// Trees tab
- themeTabSheet.openTab("Trees");
+ openTab(themeTabSheet, "Trees");
compareScreen("trees");
// TreeTable tab
- themeTabSheet.openTab("TreeTable");
+ openTab(themeTabSheet, "TreeTable");
compareScreen("treetable");
// Layouts tab
- themeTabSheet.openTab("Layouts");
+ openTab(themeTabSheet, "Layouts");
compareScreen("layouts");
// TabSheets tab
- themeTabSheet.openTab("TabSheets");
+ openTab(themeTabSheet, "TabSheets");
compareScreen("tabsheets");
// Accordions tab
- themeTabSheet.openTab("Accordions");
+ openTab(themeTabSheet, "Accordions");
compareScreen("accordions");
// Windows tab
- themeTabSheet.openTab("Windows");
+ openTab(themeTabSheet, "Windows");
testWindows();
// Notifications tab
- themeTabSheet.openTab("Notifications");
+ openTab(themeTabSheet, "Notifications");
testNotifications();
}
+ private void openTab(TabSheetElement themeTabSheet, String string) {
+ themeTabSheet.openTab(string);
+ /* Layouting takes a moment after tab has been opened. */
+ try {
+ Thread.sleep(300);
+ } catch (InterruptedException e) {
+ }
+
+ }
+
private void testNotifications() throws IOException {
testNotification(0, "notification-humanized");
testNotification(1, "notification-warning");
@@ -198,13 +187,13 @@ public abstract class ThemeTest extends MultiBrowserTest {
private void testDates() throws IOException {
compareScreen("dates");
- $(MyDateFieldElement.class).id("datefield0").openPopup();
+ $(DateFieldElement.class).id("datefield0").openPopup();
compareScreen("dates-first-popup");
- $(MyDateFieldElement.class).id("datefield1").openPopup();
+ $(DateFieldElement.class).id("datefield1").openPopup();
compareScreen("dates-second-popup");
- $(MyDateFieldElement.class).id("datefield2").openPopup();
+ $(DateFieldElement.class).id("datefield2").openPopup();
compareScreen("dates-third-popup");
- $(MyDateFieldElement.class).id("datefield3").openPopup();
+ $(DateFieldElement.class).id("datefield3").openPopup();
compareScreen("dates-fourth-popup");
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
index 4bef25587c..34ac732ab3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/ComboboxScrollableWindowTest.java
@@ -23,9 +23,9 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.testbench.commands.TestBenchElementCommands;
+import com.vaadin.testbench.customelements.WindowElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
-import com.vaadin.tests.tb3.newelements.WindowElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
/**
* Tests that a ComboBox at the bottom of a Window remains visible when clicked.
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
index c9bf3fbb55..eda1d213ae 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/GridInWindowTest.java
@@ -17,9 +17,9 @@ package com.vaadin.tests.components.window;
import org.junit.Test;
+import com.vaadin.testbench.customelements.WindowElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.tests.tb3.newelements.WindowElement;
public class GridInWindowTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java
index 00587800ea..b671222411 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizeRestoreWindowWithManagedLayoutTest.java
@@ -19,9 +19,9 @@ import org.junit.Assert;
import org.junit.Test;
import org.openqa.selenium.Dimension;
+import com.vaadin.testbench.customelements.WindowElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.WindowElement;
public class MaximizeRestoreWindowWithManagedLayoutTest
extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java
index 13e79915fa..46f9773454 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/MaximizedWindowOrderTest.java
@@ -6,9 +6,9 @@ import static org.junit.Assert.assertThat;
import org.junit.Test;
+import com.vaadin.testbench.customelements.WindowElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.WindowElement;
public class MaximizedWindowOrderTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
index cebb4ba181..61efcc2a9f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/OpenModalWindowAndFocusFieldTest.java
@@ -20,7 +20,7 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class OpenModalWindowAndFocusFieldTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
index d779d77895..473bf5c1b3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowCaptionTest.java
@@ -21,9 +21,9 @@ import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
+import com.vaadin.testbench.customelements.WindowElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
-import com.vaadin.tests.tb3.newelements.WindowElement;
public class WindowCaptionTest extends SingleBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
index c6f1409f9b..95ae5aba84 100644
--- a/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/containers/sqlcontainer/TableQueryWithNonUniqueFirstPrimaryKeyTest.java
@@ -9,7 +9,7 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class TableQueryWithNonUniqueFirstPrimaryKeyTest
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
index 91ba975ae5..6bdbfe718e 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/GridContextClickTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
import org.openqa.selenium.WebElement;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.tests.components.grid.LegacyGridElement;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class GridContextClickTest extends AbstractContextClickTest {
@@ -29,13 +29,13 @@ public class GridContextClickTest extends AbstractContextClickTest {
public void testBodyContextClickWithTypedListener() {
addOrRemoveTypedListener();
- contextClick($(LegacyGridElement.class).first().getCell(0, 0));
+ contextClick($(GridElement.class).first().getCell(0, 0));
assertEquals(
"1. ContextClickEvent value: Lisa Schneider, propertyId: address, section: BODY",
getLogRow(0));
- contextClick($(LegacyGridElement.class).first().getCell(0, 3));
+ contextClick($(GridElement.class).first().getCell(0, 3));
assertEquals(
"2. ContextClickEvent value: Lisa Schneider, propertyId: lastName, section: BODY",
@@ -46,13 +46,13 @@ public class GridContextClickTest extends AbstractContextClickTest {
public void testHeaderContextClickWithTypedListener() {
addOrRemoveTypedListener();
- contextClick($(LegacyGridElement.class).first().getHeaderCell(0, 0));
+ contextClick($(GridElement.class).first().getHeaderCell(0, 0));
assertEquals(
"1. ContextClickEvent value: Address, propertyId: address, section: HEADER",
getLogRow(0));
- contextClick($(LegacyGridElement.class).first().getHeaderCell(0, 3));
+ contextClick($(GridElement.class).first().getHeaderCell(0, 3));
assertEquals(
"2. ContextClickEvent value: Last Name, propertyId: lastName, section: HEADER",
@@ -63,13 +63,13 @@ public class GridContextClickTest extends AbstractContextClickTest {
public void testFooterContextClickWithTypedListener() {
addOrRemoveTypedListener();
- contextClick($(LegacyGridElement.class).first().getFooterCell(0, 0));
+ contextClick($(GridElement.class).first().getFooterCell(0, 0));
assertEquals(
"1. ContextClickEvent value: , propertyId: address, section: FOOTER",
getLogRow(0));
- contextClick($(LegacyGridElement.class).first().getFooterCell(0, 3));
+ contextClick($(GridElement.class).first().getFooterCell(0, 3));
assertEquals(
"2. ContextClickEvent value: , propertyId: lastName, section: FOOTER",
@@ -82,7 +82,7 @@ public class GridContextClickTest extends AbstractContextClickTest {
$(ButtonElement.class).caption("Remove all content").first().click();
- contextClick($(LegacyGridElement.class).first(), 100, 100);
+ contextClick($(GridElement.class).first(), 100, 100);
assertEquals(
"1. ContextClickEvent value: , propertyId: null, section: BODY",
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
index a9cad05252..9da14c1331 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTest.java
@@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
public class TableContextClickTest extends TableContextClickTestBase {
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
index 1fcf1663ad..84cf12a4dd 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TableContextClickTestBase.java
@@ -17,7 +17,7 @@ package com.vaadin.tests.contextclick;
import static org.junit.Assert.assertEquals;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
public abstract class TableContextClickTestBase
extends AbstractContextClickTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
index 99cb978859..f91b579d35 100644
--- a/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/contextclick/TreeContextClickTest.java
@@ -24,7 +24,7 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TreeElement;
+import com.vaadin.v7.testbench.customelements.TreeElement;
public class TreeContextClickTest extends AbstractContextClickTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
index 4e7a311139..fe3207c248 100644
--- a/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/converter/ConverterThatEnforcesAFormatTest.java
@@ -5,9 +5,8 @@ import org.openqa.selenium.Keys;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
-import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class ConverterThatEnforcesAFormatTest extends MultiBrowserTest {
@@ -17,7 +16,7 @@ public class ConverterThatEnforcesAFormatTest extends MultiBrowserTest {
public void setup() throws Exception {
super.setup();
openTestURL();
- field = $(LegacyTextFieldElement.class).first();
+ field = $(TextFieldElement.class).first();
}
@Test
diff --git a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java b/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java
deleted file mode 100644
index 90ac1c3a27..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.customelements;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.elements.ProgressBarElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.ui.ProgressBar")
-public class CustomProgressBarElement extends ProgressBarElement {
-
- public double getValue() {
- WebElement indicator = findElement(
- By.className("v-progressbar-indicator"));
- String width = getStyleAttribute(indicator, "width");
- if (!width.endsWith("%")) {
- return 0;
- }
-
- return Double.parseDouble(width.replace("%", "")) / 100.0;
- }
-
- /**
- * @since 7.5.6
- * @param indicator
- * @param string
- * @return
- */
- private String getStyleAttribute(WebElement element, String styleName) {
- String style = element.getAttribute("style");
- String[] styles = style.split(";");
- for (String s : styles) {
- if (s.startsWith(styleName + ":")) {
- return s.substring(styleName.length() + 1).trim();
- }
- }
-
- return null;
- }
-
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
index 2bceb905c4..9193cba6a2 100644
--- a/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/dd/DnDOnSubtreeTest.java
@@ -8,7 +8,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.By;
import com.vaadin.testbench.TestBenchElement;
-import com.vaadin.testbench.elements.TreeElement;
+import com.vaadin.v7.testbench.customelements.TreeElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class DnDOnSubtreeTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
index db05e8b725..ff430d29de 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java
@@ -26,13 +26,12 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.interactions.Actions;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.GridElement;
import com.vaadin.testbench.elements.GridElement.GridCellElement;
import com.vaadin.testbench.elements.GridElement.GridEditorElement;
import com.vaadin.testbench.parallel.TestCategory;
-import com.vaadin.tests.components.grid.LegacyGridElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
+import com.vaadin.v7.testbench.customelements.DateFieldElement;
+import com.vaadin.v7.testbench.customelements.GridElement;
@TestCategory("grid")
public class BasicCrudGridEditorRowTest extends MultiBrowserTest {
@@ -41,7 +40,7 @@ public class BasicCrudGridEditorRowTest extends MultiBrowserTest {
@Before
public void openTest() {
openTestURL();
- grid = $(LegacyGridElement.class).first();
+ grid = $(GridElement.class).first();
}
@@ -62,8 +61,7 @@ public class BasicCrudGridEditorRowTest extends MultiBrowserTest {
new Actions(getDriver()).doubleClick(ritaBirthdate).perform();
GridEditorElement editor = grid.getEditor();
- LegacyDateFieldElement dateField = editor
- .$(LegacyDateFieldElement.class).first();
+ DateFieldElement dateField = editor.$(DateFieldElement.class).first();
WebElement input = dateField.findElement(By.xpath("input"));
// input.click();
input.sendKeys("Invalid", Keys.TAB);
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
index 6954c2cf4f..cab06c5c4e 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridTest.java
@@ -23,8 +23,8 @@ import org.junit.Test;
import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor;
import com.vaadin.testbench.elements.AbstractComponentElement;
import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.tests.components.grid.LegacyGridElement;
import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2;
+import com.vaadin.v7.testbench.customelements.GridElement;
public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 {
@@ -48,7 +48,7 @@ public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 {
openTestURL();
// Select row
- $(LegacyGridElement.class).first().getCell(2, 2).click();
+ $(GridElement.class).first().getCell(2, 2).click();
List<TextFieldElement> textFields = getFieldsLayout()
.$(TextFieldElement.class).all();
@@ -59,7 +59,7 @@ public class BasicCrudGridTest extends SingleBrowserTestPhantomJS2 {
}
// Deselect row
- $(LegacyGridElement.class).first().getCell(2, 2).click();
+ $(GridElement.class).first().getCell(2, 2).click();
for (TextFieldElement e : textFields) {
Assert.assertEquals("TextField should be empty", "", e.getValue());
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
index eac7a699b5..479795e18c 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudTableTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import com.vaadin.testbench.AbstractHasTestBenchCommandExecutor;
import com.vaadin.testbench.elements.AbstractComponentElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
index 25d41e9d01..9b7ebd8016 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicPersonFormTest.java
@@ -18,16 +18,15 @@ package com.vaadin.tests.fieldgroup;
import org.junit.Assert;
import com.vaadin.testbench.TestBenchElement;
+import com.vaadin.testbench.customelements.FixedNotificationElement;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TableRowElement;
-import com.vaadin.testbench.elements.TextAreaElement;
-import com.vaadin.testbench.elements.TextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
import com.vaadin.tests.data.bean.Sex;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public abstract class BasicPersonFormTest extends MultiBrowserTest {
@@ -47,7 +46,7 @@ public abstract class BasicPersonFormTest extends MultiBrowserTest {
}
protected TextFieldElement getFirstNameField() {
- return $(LegacyTextFieldElement.class).caption("First Name").first();
+ return $(TextFieldElement.class).caption("First Name").first();
}
protected TextAreaElement getLastNameArea() {
@@ -55,11 +54,11 @@ public abstract class BasicPersonFormTest extends MultiBrowserTest {
}
protected TextFieldElement getEmailField() {
- return $(LegacyTextFieldElement.class).caption("Email").first();
+ return $(TextFieldElement.class).caption("Email").first();
}
protected TextFieldElement getAgeField() {
- return $(LegacyTextFieldElement.class).caption("Age").first();
+ return $(TextFieldElement.class).caption("Age").first();
}
protected TableElement getGenderTable() {
@@ -67,7 +66,7 @@ public abstract class BasicPersonFormTest extends MultiBrowserTest {
}
protected TextFieldElement getDeceasedField() {
- return $(LegacyTextFieldElement.class).caption("Deceased").first();
+ return $(TextFieldElement.class).caption("Deceased").first();
}
protected void showBeanValues() {
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
index 7ce92a2d45..ec11ea22f5 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java
@@ -6,10 +6,10 @@ import org.openqa.selenium.WebElement;
import com.vaadin.testbench.By;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyDateFieldElement;
-import com.vaadin.v7.tests.elements.LegacyInlineDateFieldElement;
-import com.vaadin.v7.tests.elements.LegacyPopupDateFieldElement;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.DateFieldElement;
+import com.vaadin.v7.testbench.customelements.InlineDateFieldElement;
+import com.vaadin.v7.testbench.customelements.PopupDateFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class DateFormTest extends MultiBrowserTest {
@@ -28,19 +28,19 @@ public class DateFormTest extends MultiBrowserTest {
"v-inline-datefield-calendarpanel-day-selected"));
Assert.assertEquals("Unexpected TextField contents,",
"Jan 20, 1984 4:34:49 PM",
- $(LegacyTextFieldElement.class).first().getValue());
+ $(TextFieldElement.class).first().getValue());
}
protected String getDateFieldValue() {
- return $(LegacyDateFieldElement.class).first().getValue();
+ return $(DateFieldElement.class).first().getValue();
}
protected String getPopupDateFieldValue() {
- return $(LegacyPopupDateFieldElement.class).first().getValue();
+ return $(PopupDateFieldElement.class).first().getValue();
}
protected WebElement getInlineDateFieldCalendarPanel() {
- return $(LegacyInlineDateFieldElement.class).first()
+ return $(InlineDateFieldElement.class).first()
.findElement(By.className("v-inline-datefield-calendarpanel"));
}
diff --git a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
index f2917229e5..d0472bf5fb 100644
--- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/MultipleValidationErrorsTest.java
@@ -7,9 +7,8 @@ import org.junit.Test;
import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class MultipleValidationErrorsTest extends MultiBrowserTest {
@@ -18,8 +17,8 @@ public class MultipleValidationErrorsTest extends MultiBrowserTest {
}
private void clearTextField(String caption) {
- TextFieldElement textField = $(LegacyTextFieldElement.class)
- .caption(caption).first();
+ TextFieldElement textField = $(TextFieldElement.class).caption(caption)
+ .first();
textField.clear();
}
diff --git a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
index de981d43ea..d832bbfb2d 100644
--- a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.openqa.selenium.Keys;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.tests.tb3.newelements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
public class FontIconsTest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
index 3ee8ae6997..55c8885891 100644
--- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized.Parameters;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.ParameterizedTB3Runner;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPasswordFieldElement.java b/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPasswordFieldElement.java
deleted file mode 100644
index e03747e359..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPasswordFieldElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.tests.legacyelements;
-
-import com.vaadin.testbench.elements.PasswordFieldElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.LegacyPasswordField")
-public class LegacyPasswordFieldElement extends PasswordFieldElement {
-
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
index 546d79e322..fd9a8163b0 100644
--- a/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/navigator/NavigationTest.java
@@ -8,7 +8,7 @@ import org.junit.Test;
import com.vaadin.testbench.By;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.elements.TableRowElement;
import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.SingleBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
index 255b69947e..0e9dd0ca83 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/PushConfigurationTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedCondition;
-import com.vaadin.testbench.elements.NativeSelectElement;
+import com.vaadin.v7.testbench.customelements.NativeSelectElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
index 95c03d9959..7bb4a72ce4 100644
--- a/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/push/SendMultibyteCharactersTest.java
@@ -3,7 +3,7 @@ package com.vaadin.tests.push;
import org.junit.Test;
import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
import com.vaadin.testbench.parallel.TestCategory;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java
deleted file mode 100644
index 8e07b61e26..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.vaadin.tests.tb3.newelements;
-
-import java.util.List;
-
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.ui.Calendar")
-public class CalendarElement
- extends com.vaadin.testbench.elements.CalendarElement {
- public List<WebElement> getWeekNumbers() {
- return findElements(By.className("v-calendar-week-number"));
- }
-
- public boolean hasMonthView() {
- return isElementPresent(By.className("v-calendar-week-numbers"));
- }
-
- public boolean hasWeekView() {
- return isElementPresent(By.className("v-calendar-header-week"));
- }
-
- public List<WebElement> getDayNumbers() {
- return findElements(By.className("v-calendar-day-number"));
- }
-
- public List<WebElement> getMonthDays() {
- return findElements(By.className("v-calendar-month-day"));
- }
-
- public boolean hasDayView() {
- return getDayHeaders().size() == 1;
- }
-
- public List<WebElement> getDayHeaders() {
- return findElements(By.className("v-calendar-header-day"));
- }
-
- public void back() {
- findElement(By.className("v-calendar-back")).click();
- }
-
- public void next() {
- findElement(By.className("v-calendar-next")).click();
- }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
deleted file mode 100644
index f1f16d3e00..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.vaadin.tests.tb3.newelements;
-
-import org.junit.Assert;
-import org.openqa.selenium.WebElement;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.ui.ComboBox")
-public class ComboBoxElement
- extends com.vaadin.testbench.elements.ComboBoxElement {
-
- private static org.openqa.selenium.By bySuggestionPopup = By
- .vaadin("#popup");
-
- public WebElement getInputField() {
- return findElement(By.vaadin("#textbox"));
- }
-
- @Override
- public String getText() {
- return getInputField().getAttribute("value");
- }
-
- @Override
- public void clear() {
- getInputField().clear();
- }
-
- public WebElement getSuggestionPopup() {
- return findElement(bySuggestionPopup);
- }
-
- @Override
- public void sendKeys(CharSequence... keysToSend) {
- sendKeys(50, keysToSend);
- }
-
- /**
- * Use this method to simulate typing into an element, which may set its
- * value.
- *
- * @param delay
- * delay after sending each individual key (mainly needed for
- * PhantomJS)
- * @param keysToSend
- * keys to type into the element
- */
- public void sendKeys(int delay, CharSequence... keysToSend) {
- WebElement input = getInputField();
-
- for (CharSequence key : keysToSend) {
- input.sendKeys(key);
- try {
- Thread.sleep(delay);
- } catch (InterruptedException e) {
- Assert.fail(e.getMessage());
- }
- }
- }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
deleted file mode 100644
index b10ea2bed8..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.vaadin.tests.tb3.newelements;
-
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elements.NotificationElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.ui.Notification")
-public class FixedNotificationElement extends NotificationElement {
- @Override
- public String getCaption() {
- WebElement popup = findElement(By.className("popupContent"));
- WebElement caption = popup.findElement(By.tagName("h1"));
- return caption.getText();
- }
-
- @Override
- public void close() {
- click(5, 5);
- WebDriverWait wait = new WebDriverWait(getDriver(), 10);
- wait.until(ExpectedConditions
- .not(ExpectedConditions.presenceOfAllElementsLocatedBy(
- By.className("v-Notification"))));
- }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java b/uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java
deleted file mode 100644
index 784d203ab0..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.vaadin.tests.tb3.newelements;
-
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-
-import com.vaadin.testbench.By;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/*
- Suggestions for new elemental api for Window
- */
-@ServerClass("com.vaadin.ui.Window")
-public class WindowElement extends com.vaadin.testbench.elements.WindowElement {
-
- private final String restoreBoxClass = "v-window-restorebox";
- private final String maximizeBoxClass = "v-window-maximizebox";
- private final String closeBoxClass = "v-window-closebox";
-
- public void restore() {
- if (isMaximized()) {
- getRestoreButton().click();
- } else {
- throw new AssertionError(
- "Window is not maximized, cannot be restored.");
- }
- }
-
- private boolean isMaximized() {
- return isElementPresent(By.className(restoreBoxClass));
- }
-
- private WebElement getRestoreButton() {
- return findElement(By.className("v-window-restorebox"));
- }
-
- public void maximize() {
- if (!isMaximized()) {
- getMaximizeButton().click();
- } else {
- throw new AssertionError(
- "Window is already maximized, cannot maximize.");
- }
- }
-
- private WebElement getMaximizeButton() {
- return findElement(By.className(maximizeBoxClass));
- }
-
- public void move(int xOffset, int yOffset) {
- Actions action = new Actions(getDriver());
- action.moveToElement(
- findElement(org.openqa.selenium.By.className("v-window-wrap")),
- 5, 5);
- action.clickAndHold();
- action.moveByOffset(xOffset, yOffset);
- action.release();
- action.build().perform();
- }
-
- /**
- * @return the caption of the window
- */
- @Override
- public String getCaption() {
- return findElement(By.className("v-window-header")).getText();
- }
-
- private WebElement getCloseButton() {
- return findElement(By.className(closeBoxClass));
- }
-
- public void close() {
- getCloseButton().click();
-
- }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
index e847b66ac5..2d6985fd8d 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
@@ -24,10 +24,10 @@ import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.v7.testbench.customelements.ComboBoxElement;
import com.vaadin.testbench.elements.EmbeddedElement;
import com.vaadin.testbench.elements.MenuBarElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.testbench.parallel.Browser;
import com.vaadin.testbench.parallel.BrowserUtil;
import com.vaadin.tests.tb3.MultiBrowserTest;
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
index 92bff1da9b..de695cdf96 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/CollapsibleTableColumnTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
-import com.vaadin.testbench.elements.TableElement;
+import com.vaadin.v7.testbench.customelements.TableElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
index 4bdd9fc0f1..ae0c2009ac 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoDefaultCaptionWidthTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertThat;
import org.junit.Test;
-import com.vaadin.testbench.elements.ColorPickerElement;
+import com.vaadin.v7.testbench.customelements.ColorPickerElement;
import com.vaadin.tests.components.colorpicker.DefaultCaptionWidthTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
index cdb6000840..4ed6e10a52 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/ValoThemeUITest.java
@@ -23,7 +23,7 @@ import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.CheckBoxElement;
import com.vaadin.testbench.elements.CssLayoutElement;
import com.vaadin.testbench.elements.LabelElement;
-import com.vaadin.testbench.elements.TreeElement;
+import com.vaadin.v7.testbench.customelements.TreeElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
public class ValoThemeUITest extends MultiBrowserTest {
diff --git a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
index 3bb02a7abf..77cd2b669f 100644
--- a/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tooltip/ValidatorCaptionTooltipTest.java
@@ -17,9 +17,8 @@ package com.vaadin.tests.tooltip;
import org.junit.Test;
-import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.tests.tb3.TooltipTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
/**
* Test to see if validators create error tooltips correctly.
@@ -31,7 +30,7 @@ public class ValidatorCaptionTooltipTest extends TooltipTest {
public void validatorWithError() throws Exception {
openTestURL();
- TextFieldElement field = $(LegacyTextFieldElement.class).get(0);
+ TextFieldElement field = $(TextFieldElement.class).get(0);
String fieldValue = field.getAttribute("value");
String expected = "Valid value is between 0 and 100. " + fieldValue
+ " is not.";
@@ -41,7 +40,7 @@ public class ValidatorCaptionTooltipTest extends TooltipTest {
@Test
public void validatorWithoutError() throws Exception {
openTestURL();
- TextFieldElement field = $(LegacyTextFieldElement.class).get(1);
+ TextFieldElement field = $(TextFieldElement.class).get(1);
checkTooltip(field, null);
}
}
diff --git a/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
index 6f2cb10b6f..3e88bf62db 100644
--- a/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/validation/ValidationOfRequiredEmptyFieldsTest.java
@@ -11,10 +11,9 @@ import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elements.TextFieldElement;
import com.vaadin.testbench.elements.VerticalLayoutElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
-import com.vaadin.v7.tests.elements.LegacyTextFieldElement;
+import com.vaadin.v7.testbench.customelements.TextFieldElement;
public class ValidationOfRequiredEmptyFieldsTest extends MultiBrowserTest {
@@ -90,11 +89,11 @@ public class ValidationOfRequiredEmptyFieldsTest extends MultiBrowserTest {
}
private TextFieldElement getRequiredMessageField() {
- return $(LegacyTextFieldElement.class).all().get(0);
+ return $(TextFieldElement.class).all().get(0);
}
private TextFieldElement getTargetTextField() {
- return $(LegacyTextFieldElement.class).all().get(1);
+ return $(TextFieldElement.class).all().get(1);
}
private WebElement getRequiredCheckbox() {
diff --git a/uitest/src/test/java/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java b/uitest/src/test/java/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
index fa1a902367..1fd3ecc01e 100644
--- a/uitest/src/test/java/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/widgetset/server/OverriddenDecendantsTest.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.junit.Test;
-import com.vaadin.testbench.elements.TextAreaElement;
+import com.vaadin.v7.testbench.customelements.TextAreaElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
/**
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyCheckBoxElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyCheckBoxElement.java
deleted file mode 100644
index 27421c00c9..0000000000
--- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyCheckBoxElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.tests.elements;
-
-import com.vaadin.testbench.elements.CheckBoxElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.LegacyCheckBox")
-public class LegacyCheckBoxElement extends CheckBoxElement {
-
-}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java
deleted file mode 100644
index a599cf7ff2..0000000000
--- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.tests.elements;
-
-import com.vaadin.testbench.elements.DateFieldElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * @author Vaadin Ltd
- *
- */
-@ServerClass("com.vaadin.v7.ui.LegacyDateField")
-public class LegacyDateFieldElement extends DateFieldElement {
-
-}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java
deleted file mode 100644
index 7bfcd826c8..0000000000
--- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.tests.elements;
-
-import com.vaadin.testbench.elements.InlineDateFieldElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * @author Vaadin Ltd
- *
- */
-@ServerClass("com.vaadin.v7.ui.LegacyInlineDateField")
-public class LegacyInlineDateFieldElement extends InlineDateFieldElement {
-
-}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java
deleted file mode 100644
index ea27aa8811..0000000000
--- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.v7.tests.elements;
-
-import com.vaadin.testbench.elements.PopupDateFieldElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-/**
- * @author Vaadin Ltd
- *
- */
-@ServerClass("com.vaadin.v7.ui.LegacyPopupDateField")
-public class LegacyPopupDateFieldElement extends PopupDateFieldElement {
-
-}
diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyTextFieldElement.java b/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyTextFieldElement.java
deleted file mode 100644
index be56a2ef58..0000000000
--- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyTextFieldElement.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.vaadin.v7.tests.elements;
-
-import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.testbench.elementsbase.ServerClass;
-
-@ServerClass("com.vaadin.v7.ui.LegacyTextField")
-public class LegacyTextFieldElement extends TextFieldElement {
-
-}