diff options
1611 files changed, 6825 insertions, 6778 deletions
diff --git a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java index eca56612cb..19b13f53d6 100644 --- a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java @@ -16,10 +16,10 @@ package com.vaadin.client.legacy.ui; import com.vaadin.client.ui.customfield.CustomFieldConnector; -import com.vaadin.legacy.ui.LegacyCustomField; import com.vaadin.shared.ui.Connect; +import com.vaadin.v7.ui.CustomField; -@Connect(value = LegacyCustomField.class) +@Connect(value = CustomField.class) public class LegacyCustomFieldConnector extends CustomFieldConnector { } diff --git a/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java b/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java index c8a4762928..f3e46e9b01 100644 --- a/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java +++ b/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java @@ -17,9 +17,9 @@ package com.vaadin.client.v7.ui.checkbox; import com.vaadin.client.ui.checkbox.CheckBoxConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.ui.LegacyCheckBox; +import com.vaadin.v7.ui.CheckBox; -@Connect(LegacyCheckBox.class) +@Connect(CheckBox.class) public class LegacyCheckBoxConnector extends CheckBoxConnector { } diff --git a/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java b/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java index 1c3f89d693..d2fda689f1 100644 --- a/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java @@ -19,10 +19,10 @@ package com.vaadin.client.v7.ui.passwordfield; import com.vaadin.client.v7.ui.VLegacyPasswordField; import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.ui.LegacyPasswordField; +import com.vaadin.v7.ui.PasswordField; @Deprecated -@Connect(LegacyPasswordField.class) +@Connect(PasswordField.class) public class LegacyPasswordFieldConnector extends LegacyTextFieldConnector { @Override diff --git a/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java b/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java index 7a2c583779..92ae3a47da 100644 --- a/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java +++ b/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java @@ -28,10 +28,10 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.TextField; @Deprecated -@Connect(value = LegacyTextField.class, loadStyle = LoadStyle.EAGER) +@Connect(value = TextField.class, loadStyle = LoadStyle.EAGER) public class LegacyTextFieldConnector extends AbstractFieldConnector implements Paintable { diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java index fad8918c92..d0d2b6196b 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ButtonRendererConnector.java @@ -28,7 +28,7 @@ import elemental.json.JsonObject; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.ui.renderers.ButtonRenderer.class) +@Connect(com.vaadin.v7.ui.renderers.ButtonRenderer.class) public class ButtonRendererConnector extends ClickableRendererConnector<String> { diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java index 4b8c3872da..4eb56376f4 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/DateRendererConnector.java @@ -28,7 +28,7 @@ import com.vaadin.shared.ui.Connect; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.ui.renderers.DateRenderer.class) +@Connect(com.vaadin.v7.ui.renderers.DateRenderer.class) public class DateRendererConnector extends TextRendererConnector { // No implementation needed } diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java index 000a24af00..49874c84b4 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/DetailComponentManagerConnector.java @@ -18,7 +18,7 @@ package com.vaadin.client.connectors; import com.vaadin.client.ServerConnector; import com.vaadin.client.extensions.AbstractExtensionConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.ui.LegacyGrid.DetailComponentManager; +import com.vaadin.v7.ui.Grid.DetailComponentManager; /** * Client-side connector for the DetailComponentManager of Grid. diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java index 045f51f508..b30557885a 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/GridConnector.java @@ -95,7 +95,6 @@ import com.vaadin.shared.ui.grid.GridStaticSectionState; import com.vaadin.shared.ui.grid.GridStaticSectionState.CellState; import com.vaadin.shared.ui.grid.GridStaticSectionState.RowState; import com.vaadin.shared.ui.grid.ScrollDestination; -import com.vaadin.ui.LegacyGrid; import elemental.json.JsonObject; import elemental.json.JsonValue; @@ -111,7 +110,7 @@ import elemental.json.JsonValue; * @since 7.4 * @author Vaadin Ltd */ -@Connect(LegacyGrid.class) +@Connect(com.vaadin.v7.ui.Grid.class) public class GridConnector extends AbstractHasComponentsConnector implements SimpleManagedLayout, DeferredWorker { diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java index 7949eeab3c..d71cb28a7d 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ImageRendererConnector.java @@ -32,7 +32,7 @@ import elemental.json.JsonValue; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.ui.renderers.ImageRenderer.class) +@Connect(com.vaadin.v7.ui.renderers.ImageRenderer.class) public class ImageRendererConnector extends ClickableRendererConnector<String> { @Override diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java index 1515f1aead..4bd618dacd 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/JavaScriptRendererConnector.java @@ -30,7 +30,7 @@ import com.vaadin.client.widget.grid.CellReference; import com.vaadin.client.widget.grid.RendererCellReference; import com.vaadin.shared.JavaScriptExtensionState; import com.vaadin.shared.ui.Connect; -import com.vaadin.ui.renderers.AbstractJavaScriptRenderer; +import com.vaadin.v7.ui.renderers.AbstractJavaScriptRenderer; import elemental.json.JsonObject; import elemental.json.JsonValue; diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java index e7494737cb..7a13863a9e 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/MultiSelectionModelConnector.java @@ -46,7 +46,7 @@ import com.vaadin.shared.ui.grid.GridState; import com.vaadin.shared.ui.grid.Range; import com.vaadin.shared.ui.grid.selection.MultiSelectionModelServerRpc; import com.vaadin.shared.ui.grid.selection.MultiSelectionModelState; -import com.vaadin.ui.LegacyGrid.MultiSelectionModel; +import com.vaadin.v7.ui.Grid.MultiSelectionModel; import elemental.json.JsonObject; diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java index 1a080f5082..b3fbb16e6b 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/NoSelectionModelConnector.java @@ -19,7 +19,7 @@ import com.vaadin.client.ServerConnector; import com.vaadin.client.widget.grid.selection.SelectionModel; import com.vaadin.client.widget.grid.selection.SelectionModelNone; import com.vaadin.shared.ui.Connect; -import com.vaadin.ui.LegacyGrid.NoSelectionModel; +import com.vaadin.v7.ui.Grid.NoSelectionModel; import elemental.json.JsonObject; diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java index ff16047b0d..6383594ca2 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/NumberRendererConnector.java @@ -28,7 +28,7 @@ import com.vaadin.shared.ui.Connect; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.ui.renderers.NumberRenderer.class) +@Connect(com.vaadin.v7.ui.renderers.NumberRenderer.class) public class NumberRendererConnector extends TextRendererConnector { // no implementation needed } diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java index 5687d031aa..57bafc69ba 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/ProgressBarRendererConnector.java @@ -24,7 +24,7 @@ import com.vaadin.shared.ui.Connect; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.ui.renderers.ProgressBarRenderer.class) +@Connect(com.vaadin.v7.ui.renderers.ProgressBarRenderer.class) public class ProgressBarRendererConnector extends AbstractGridRendererConnector<Double> { diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java index 52fa8a2e48..d33cf72a33 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/RpcDataSourceConnector.java @@ -42,7 +42,7 @@ import elemental.json.JsonObject; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.server.communication.data.RpcDataProviderExtension.class) +@Connect(com.vaadin.v7.server.communication.data.RpcDataProviderExtension.class) public class RpcDataSourceConnector extends AbstractExtensionConnector { /** diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java index 980c4458d4..84f0633e9b 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/SingleSelectionModelConnector.java @@ -27,7 +27,7 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.grid.GridState; import com.vaadin.shared.ui.grid.selection.SingleSelectionModelServerRpc; import com.vaadin.shared.ui.grid.selection.SingleSelectionModelState; -import com.vaadin.ui.LegacyGrid.SingleSelectionModel; +import com.vaadin.v7.ui.Grid.SingleSelectionModel; import elemental.json.JsonObject; diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java index d3a289ec3e..faa09fda13 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/TextRendererConnector.java @@ -24,7 +24,7 @@ import com.vaadin.shared.ui.Connect; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.ui.renderers.TextRenderer.class) +@Connect(com.vaadin.v7.ui.renderers.TextRenderer.class) public class TextRendererConnector extends AbstractGridRendererConnector<String> { @Override diff --git a/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java b/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java index 95c47dd242..8888c1041b 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/connectors/UnsafeHtmlRendererConnector.java @@ -25,7 +25,7 @@ import com.vaadin.shared.ui.Connect; * @since 7.4 * @author Vaadin Ltd */ -@Connect(com.vaadin.ui.renderers.HtmlRenderer.class) +@Connect(com.vaadin.v7.ui.renderers.HtmlRenderer.class) public class UnsafeHtmlRendererConnector extends AbstractGridRendererConnector<String> { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java b/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java index 44cbcf28f6..814767e19f 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/VFilterSelect.java @@ -182,7 +182,7 @@ public class VFilterSelect extends Composite /** * Gets the style set for this suggestion item. Styles are typically set - * by a server-side {@link com.vaadin.ui.ComboBox.ItemStyleGenerator}. + * by a server-side {@link com.vaadin.v7.ui.ComboBox.ItemStyleGenerator}. * The returned style is prefixed by <code>v-filterselect-item-</code>. * * @since 7.5.6 diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java index f97ba9d14a..8f6118eed6 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/calendar/CalendarConnector.java @@ -72,7 +72,7 @@ import com.vaadin.shared.ui.calendar.CalendarEventId; import com.vaadin.shared.ui.calendar.CalendarServerRpc; import com.vaadin.shared.ui.calendar.CalendarState; import com.vaadin.shared.ui.calendar.DateConstants; -import com.vaadin.ui.Calendar; +import com.vaadin.v7.ui.Calendar; /** * Handles communication between Calendar on the server side and diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java index 828cc689c7..6c1bee17a0 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java @@ -24,11 +24,11 @@ import com.vaadin.client.ui.VColorPickerArea; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc; -import com.vaadin.ui.ColorPickerArea; +import com.vaadin.v7.ui.ColorPickerArea; /** * A class that defines an implementation for a color picker connector. Connects - * the server side {@link com.vaadin.ui.ColorPickerArea} with the client side + * the server side {@link com.vaadin.v7.ui.ColorPickerArea} with the client side * counterpart {@link VColorPickerArea} * * @since 7.0.0 diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java index 6254e7adbe..cc917a044e 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java @@ -23,11 +23,11 @@ import com.vaadin.client.ui.VColorPicker; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc; -import com.vaadin.ui.ColorPicker; +import com.vaadin.v7.ui.ColorPicker; /** * A class that defines default implementation for a color picker connector. - * Connects the server side {@link com.vaadin.ui.ColorPicker} with the client + * Connects the server side {@link com.vaadin.v7.ui.ColorPicker} with the client * side counterpart {@link VColorPicker} * * @since 7.0.0 diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java index c05449d7bd..98ebfa086c 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java @@ -26,12 +26,12 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.colorpicker.ColorPickerGradientServerRpc; import com.vaadin.shared.ui.colorpicker.ColorPickerGradientState; -import com.vaadin.ui.components.colorpicker.ColorPickerGradient; +import com.vaadin.v7.ui.components.colorpicker.ColorPickerGradient; /** * A class that defines the default implementation for a color picker gradient * connector. Connects the server side - * {@link com.vaadin.ui.components.colorpicker.ColorPickerGradient} with the + * {@link com.vaadin.v7.ui.components.colorpicker.ColorPickerGradient} with the * client side counterpart {@link VColorPickerGradient} * * @since 7.0.0 diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java index cd0a3d1466..b842154e40 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java @@ -26,12 +26,12 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.colorpicker.ColorPickerGridServerRpc; import com.vaadin.shared.ui.colorpicker.ColorPickerGridState; -import com.vaadin.ui.components.colorpicker.ColorPickerGrid; +import com.vaadin.v7.ui.components.colorpicker.ColorPickerGrid; /** * A class that defines the default implementation for a color picker grid * connector. Connects the server side - * {@link com.vaadin.ui.components.colorpicker.ColorPickerGrid} with the client + * {@link com.vaadin.v7.ui.components.colorpicker.ColorPickerGrid} with the client * side counterpart {@link VColorPickerGrid} * * @since 7.0.0 diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java index f6dff893f5..672e428802 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/combobox/ComboBoxConnector.java @@ -35,7 +35,7 @@ import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; import com.vaadin.shared.ui.combobox.ComboBoxState; -import com.vaadin.ui.ComboBox; +import com.vaadin.v7.ui.ComboBox; @Connect(ComboBox.class) public class ComboBoxConnector extends AbstractFieldConnector diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java index b02f8df147..cd4bf13ba0 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VIsOverId.java @@ -21,7 +21,7 @@ package com.vaadin.client.ui.dd; import com.vaadin.client.ComponentConnector; import com.vaadin.client.UIDL; import com.vaadin.shared.ui.dd.AcceptCriterion; -import com.vaadin.ui.AbstractSelect; +import com.vaadin.v7.ui.AbstractSelect; @AcceptCriterion(AbstractSelect.TargetItemIs.class) final public class VIsOverId extends VAcceptCriterion { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java index 6992ebcaad..f8bfe075a3 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/dd/VItemIdIs.java @@ -21,7 +21,7 @@ package com.vaadin.client.ui.dd; import com.vaadin.client.ComponentConnector; import com.vaadin.client.UIDL; import com.vaadin.shared.ui.dd.AcceptCriterion; -import com.vaadin.ui.AbstractSelect; +import com.vaadin.v7.ui.AbstractSelect; @AcceptCriterion(AbstractSelect.AcceptItem.class) final public class VItemIdIs extends VAcceptCriterion { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java index a69043548b..e288c088a9 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/listselect/ListSelectConnector.java @@ -19,7 +19,7 @@ package com.vaadin.client.ui.listselect; import com.vaadin.client.ui.VListSelect; import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.ui.ListSelect; +import com.vaadin.v7.ui.ListSelect; @Connect(ListSelect.class) public class ListSelectConnector extends OptionGroupBaseConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java index 1780d20c69..0063116cdb 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java @@ -20,7 +20,7 @@ import com.vaadin.client.ui.ConnectorFocusAndBlurHandler; import com.vaadin.client.ui.VNativeSelect; import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.ui.NativeSelect; +import com.vaadin.v7.ui.NativeSelect; @Connect(NativeSelect.class) public class NativeSelectConnector extends OptionGroupBaseConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java index 3dd3b897a5..e8164632b4 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java @@ -27,7 +27,7 @@ import com.vaadin.client.ui.VOptionGroup; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.optiongroup.OptionGroupState; -import com.vaadin.ui.OptionGroup; +import com.vaadin.v7.ui.OptionGroup; @Connect(OptionGroup.class) public class OptionGroupConnector extends OptionGroupBaseConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java index a8aeb79d07..2ea59046c7 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java @@ -27,7 +27,7 @@ import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.textarea.RichTextAreaState; import com.vaadin.shared.util.SharedUtil; -import com.vaadin.ui.RichTextArea; +import com.vaadin.v7.ui.RichTextArea; @Connect(value = RichTextArea.class, loadStyle = LoadStyle.LAZY) public class RichTextAreaConnector extends AbstractFieldConnector diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java index ccfb715291..8bd2418aea 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/table/TableConnector.java @@ -51,7 +51,7 @@ import com.vaadin.shared.ui.table.TableConstants.Section; import com.vaadin.shared.ui.table.TableServerRpc; import com.vaadin.shared.ui.table.TableState; -@Connect(com.vaadin.ui.Table.class) +@Connect(com.vaadin.v7.ui.Table.class) public class TableConnector extends AbstractFieldConnector implements HasComponentsConnector, ConnectorHierarchyChangeHandler, Paintable, DirectionalManagedLayout, PostLayoutListener, diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java b/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java index 20433dd960..c3b2185de8 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/table/VTableLazyInitItemIdentifiers.java @@ -17,7 +17,7 @@ package com.vaadin.client.ui.table; import com.vaadin.client.ui.dd.VLazyInitItemIdentifiers; import com.vaadin.shared.ui.dd.AcceptCriterion; -import com.vaadin.ui.Table; +import com.vaadin.v7.ui.Table; @AcceptCriterion(Table.TableDropCriterion.class) public final class VTableLazyInitItemIdentifiers diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java index e081a0e0a4..75b6ba21ee 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/textarea/TextAreaConnector.java @@ -24,7 +24,7 @@ import com.vaadin.client.ui.VTextArea; import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.textarea.TextAreaState; -import com.vaadin.ui.TextArea; +import com.vaadin.v7.ui.TextArea; @Connect(TextArea.class) public class TextAreaConnector extends LegacyTextFieldConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java index c28a58aaad..173048ec1e 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/TreeConnector.java @@ -40,7 +40,7 @@ import com.vaadin.shared.ui.MultiSelectMode; import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.shared.ui.tree.TreeServerRpc; import com.vaadin.shared.ui.tree.TreeState; -import com.vaadin.ui.Tree; +import com.vaadin.v7.ui.Tree; @Connect(Tree.class) public class TreeConnector extends AbstractComponentConnector diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java index 34b8428582..8f38a8cfb4 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTargetInSubtree.java @@ -26,7 +26,7 @@ import com.vaadin.client.ui.dd.VAcceptCriterion; import com.vaadin.client.ui.dd.VDragAndDropManager; import com.vaadin.client.ui.dd.VDragEvent; import com.vaadin.shared.ui.dd.AcceptCriterion; -import com.vaadin.ui.Tree; +import com.vaadin.v7.ui.Tree; @AcceptCriterion(Tree.TargetInSubtree.class) final public class VTargetInSubtree extends VAcceptCriterion { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java index 46089af16e..e4ba64e12a 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/tree/VTreeLazyInitItemIdentifiers.java @@ -17,7 +17,7 @@ package com.vaadin.client.ui.tree; import com.vaadin.client.ui.dd.VLazyInitItemIdentifiers; import com.vaadin.shared.ui.dd.AcceptCriterion; -import com.vaadin.ui.Tree; +import com.vaadin.v7.ui.Tree; @AcceptCriterion(Tree.TreeDropCriterion.class) public final class VTreeLazyInitItemIdentifiers diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java index 77074d4cb5..7c1cac61c6 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/treetable/TreeTableConnector.java @@ -29,7 +29,7 @@ import com.vaadin.client.ui.table.TableConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.treetable.TreeTableConstants; import com.vaadin.shared.ui.treetable.TreeTableState; -import com.vaadin.ui.TreeTable; +import com.vaadin.v7.ui.TreeTable; @Connect(TreeTable.class) public class TreeTableConnector extends TableConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java b/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java index 81e32e5711..5e05dae166 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java @@ -23,7 +23,7 @@ import com.vaadin.client.ui.VTwinColSelect; import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.twincolselect.TwinColSelectState; -import com.vaadin.ui.TwinColSelect; +import com.vaadin.v7.ui.TwinColSelect; @Connect(TwinColSelect.class) public class TwinColSelectConnector extends OptionGroupBaseConnector diff --git a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java index 6687baa6d4..ee62b03588 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyDateFieldConnector.java @@ -17,13 +17,13 @@ package com.vaadin.client.v7.ui; import com.vaadin.client.ui.datefield.DateFieldConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.ui.LegacyDateField; +import com.vaadin.v7.ui.DateField; /** * @author Vaadin Ltd * */ -@Connect(LegacyDateField.class) +@Connect(DateField.class) @Deprecated public class LegacyDateFieldConnector extends DateFieldConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java index 5fb5b7a5dd..60459ff9c0 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyInlineDateFieldConnector.java @@ -17,13 +17,13 @@ package com.vaadin.client.v7.ui; import com.vaadin.client.ui.datefield.InlineDateFieldConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.ui.LegacyInlineDateField; +import com.vaadin.v7.ui.InlineDateField; /** * @author Vaadin Ltd * */ -@Connect(LegacyInlineDateField.class) +@Connect(InlineDateField.class) @Deprecated public class LegacyInlineDateFieldConnector extends InlineDateFieldConnector { diff --git a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java index 9da986d879..15311ade5f 100644 --- a/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/client/v7/ui/LegacyPopupDateFieldConnector.java @@ -17,14 +17,14 @@ package com.vaadin.client.v7.ui; import com.vaadin.client.ui.datefield.PopupDateFieldConnector; import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.ui.LegacyPopupDateField; +import com.vaadin.v7.ui.PopupDateField; /** * @author Vaadin Ltd * */ @Deprecated -@Connect(LegacyPopupDateField.class) +@Connect(PopupDateField.class) public class LegacyPopupDateFieldConnector extends PopupDateFieldConnector { } diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java index 96e4621761..bee3f7c80b 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/BeanFieldGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroup.java @@ -13,29 +13,29 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.beans.IntrospectionException; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import com.vaadin.data.Item; -import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.BeanUtil; -import com.vaadin.v7.data.validator.LegacyBeanValidator; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.BeanItem; +import com.vaadin.v7.data.validator.BeanValidator; +import com.vaadin.v7.ui.Field; public class BeanFieldGroup<T> extends FieldGroup { private final Class<T> beanType; private static Boolean beanValidationImplementationAvailable = null; - private final Map<LegacyField<?>, LegacyBeanValidator> defaultValidators; + private final Map<Field<?>, BeanValidator> defaultValidators; public BeanFieldGroup(Class<T> beanType) { this.beanType = beanType; - this.defaultValidators = new HashMap<LegacyField<?>, LegacyBeanValidator>(); + this.defaultValidators = new HashMap<Field<?>, BeanValidator>(); } @Override @@ -150,35 +150,35 @@ public class BeanFieldGroup<T> extends FieldGroup { } @Override - public void bind(LegacyField field, Object propertyId) { + public void bind(Field field, Object propertyId) { ensureNestedPropertyAdded(propertyId); super.bind(field, propertyId); } @Override - public <T extends LegacyField> T buildAndBind(String caption, + public <T extends Field> T buildAndBind(String caption, Object propertyId, Class<T> fieldType) throws BindException { ensureNestedPropertyAdded(propertyId); return super.buildAndBind(caption, propertyId, fieldType); } @Override - public void unbind(LegacyField<?> field) throws BindException { + public void unbind(Field<?> field) throws BindException { super.unbind(field); - LegacyBeanValidator removed = defaultValidators.remove(field); + BeanValidator removed = defaultValidators.remove(field); if (removed != null) { field.removeValidator(removed); } } @Override - protected void configureField(LegacyField<?> field) { + protected void configureField(Field<?> field) { super.configureField(field); // Add Bean validators if there are annotations if (isBeanValidationImplementationAvailable() && !defaultValidators.containsKey(field)) { - LegacyBeanValidator validator = new LegacyBeanValidator(beanType, + BeanValidator validator = new BeanValidator(beanType, getPropertyId(field).toString()); field.addValidator(validator); if (field.getLocale() != null) { @@ -227,7 +227,7 @@ public class BeanFieldGroup<T> extends FieldGroup { * @param bean * the bean to be bound * @param objectWithMemberFields - * the class that contains {@link LegacyField}s for bean + * the class that contains {@link Field}s for bean * properties * @return the bean field group used to make binding */ @@ -249,7 +249,7 @@ public class BeanFieldGroup<T> extends FieldGroup { * @param bean * the bean to be bound * @param objectWithMemberFields - * the class that contains {@link LegacyField}s for bean + * the class that contains {@link Field}s for bean * properties * @return the bean field group used to make binding */ diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java index d752aa78d2..0042cd8113 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/Caption.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/Caption.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java index 24c97eedc5..8b0b6cfcaa 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactory.java @@ -13,28 +13,28 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.util.Date; import java.util.EnumSet; -import com.vaadin.data.Item; -import com.vaadin.data.fieldgroup.FieldGroup.BindException; -import com.vaadin.ui.AbstractSelect; -import com.vaadin.ui.ComboBox; -import com.vaadin.ui.ListSelect; -import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.OptionGroup; -import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Table; -import com.vaadin.v7.ui.LegacyAbstractField; -import com.vaadin.v7.ui.LegacyAbstractTextField; -import com.vaadin.v7.ui.LegacyCheckBox; -import com.vaadin.v7.ui.LegacyDateField; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyInlineDateField; -import com.vaadin.v7.ui.LegacyPopupDateField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.fieldgroup.FieldGroup.BindException; +import com.vaadin.v7.ui.AbstractField; +import com.vaadin.v7.ui.AbstractSelect; +import com.vaadin.v7.ui.AbstractTextField; +import com.vaadin.v7.ui.CheckBox; +import com.vaadin.v7.ui.ComboBox; +import com.vaadin.v7.ui.Field; +import com.vaadin.v7.ui.DateField; +import com.vaadin.v7.ui.InlineDateField; +import com.vaadin.v7.ui.PopupDateField; +import com.vaadin.v7.ui.ListSelect; +import com.vaadin.v7.ui.NativeSelect; +import com.vaadin.v7.ui.OptionGroup; +import com.vaadin.v7.ui.RichTextArea; +import com.vaadin.v7.ui.Table; +import com.vaadin.v7.ui.TextField; /** * This class contains a basic implementation for {@link FieldGroupFieldFactory} @@ -64,8 +64,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { } @Override - public <T extends LegacyField> T createField(Class<?> type, - Class<T> fieldType) { + public <T extends Field> T createField(Class<?> type, Class<T> fieldType) { if (Enum.class.isAssignableFrom(type)) { return createEnumField(type, fieldType); } else if (Date.class.isAssignableFrom(type)) { @@ -74,9 +73,9 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { || boolean.class.isAssignableFrom(type)) { return createBooleanField(fieldType); } - if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) { + if (AbstractTextField.class.isAssignableFrom(fieldType)) { return fieldType.cast(createAbstractTextField( - fieldType.asSubclass(LegacyAbstractTextField.class))); + fieldType.asSubclass(AbstractTextField.class))); } else if (fieldType == RichTextArea.class) { return fieldType.cast(createRichTextArea()); } @@ -90,7 +89,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { return rta; } - private <T extends LegacyField> T createEnumField(Class<?> type, + private <T extends Field> T createEnumField(Class<?> type, Class<T> fieldType) { // Determine first if we should (or can) create a select for the enum Class<AbstractSelect> selectClass = null; @@ -104,26 +103,26 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { AbstractSelect s = createCompatibleSelect(selectClass); populateWithEnumData(s, (Class<? extends Enum>) type); return (T) s; - } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) { + } else if (AbstractTextField.class.isAssignableFrom(fieldType)) { return (T) createAbstractTextField( - (Class<? extends LegacyAbstractTextField>) fieldType); + (Class<? extends AbstractTextField>) fieldType); } return null; } - private <T extends LegacyField> T createDateField(Class<?> type, + private <T extends Field> T createDateField(Class<?> type, Class<T> fieldType) { - LegacyAbstractField field; + AbstractField field; - if (LegacyInlineDateField.class.isAssignableFrom(fieldType)) { - field = new LegacyInlineDateField(); + if (InlineDateField.class.isAssignableFrom(fieldType)) { + field = new InlineDateField(); } else if (anyField(fieldType) - || LegacyDateField.class.isAssignableFrom(fieldType)) { - field = new LegacyPopupDateField(); - } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) { + || DateField.class.isAssignableFrom(fieldType)) { + field = new PopupDateField(); + } else if (AbstractTextField.class.isAssignableFrom(fieldType)) { field = createAbstractTextField( - (Class<? extends LegacyAbstractTextField>) fieldType); + (Class<? extends AbstractTextField>) fieldType); } else { return null; } @@ -163,8 +162,7 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { * @return true if any LegacyAbstractField can be assigned to the field */ protected boolean anyField(Class<?> fieldType) { - return fieldType == LegacyField.class - || fieldType == LegacyAbstractField.class; + return fieldType == Field.class || fieldType == AbstractField.class; } /** @@ -173,27 +171,27 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { * the type of the field * @return true if any AbstractSelect can be assigned to the field */ - protected boolean anySelect(Class<? extends LegacyField> fieldType) { + protected boolean anySelect(Class<? extends Field> fieldType) { return anyField(fieldType) || fieldType == AbstractSelect.class; } - protected <T extends LegacyField> T createBooleanField(Class<T> fieldType) { - if (fieldType.isAssignableFrom(LegacyCheckBox.class)) { - LegacyCheckBox cb = new LegacyCheckBox(null); + protected <T extends Field> T createBooleanField(Class<T> fieldType) { + if (fieldType.isAssignableFrom(CheckBox.class)) { + CheckBox cb = new CheckBox(null); cb.setImmediate(true); return (T) cb; - } else if (LegacyAbstractTextField.class.isAssignableFrom(fieldType)) { + } else if (AbstractTextField.class.isAssignableFrom(fieldType)) { return (T) createAbstractTextField( - (Class<? extends LegacyAbstractTextField>) fieldType); + (Class<? extends AbstractTextField>) fieldType); } return null; } - protected <T extends LegacyAbstractTextField> T createAbstractTextField( + protected <T extends AbstractTextField> T createAbstractTextField( Class<T> fieldType) { - if (fieldType == LegacyAbstractTextField.class) { - fieldType = (Class<T>) LegacyTextField.class; + if (fieldType == AbstractTextField.class) { + fieldType = (Class<T>) TextField.class; } try { T field = fieldType.newInstance(); @@ -218,11 +216,10 @@ public class DefaultFieldGroupFieldFactory implements FieldGroupFieldFactory { * @return A field capable of editing the data or null if no field could be * created */ - protected <T extends LegacyField> T createDefaultField(Class<?> type, + protected <T extends Field> T createDefaultField(Class<?> type, Class<T> fieldType) { - if (fieldType.isAssignableFrom(LegacyTextField.class)) { - return fieldType - .cast(createAbstractTextField(LegacyTextField.class)); + if (fieldType.isAssignableFrom(TextField.class)) { + return fieldType.cast(createAbstractTextField(TextField.class)); } return null; } diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java index 1254009cfc..07eb9f27c8 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroup.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; @@ -25,14 +25,14 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.TransactionalPropertyWrapper; -import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.ui.LegacyAbstractField; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.data.util.TransactionalPropertyWrapper; +import com.vaadin.v7.ui.AbstractField; +import com.vaadin.v7.ui.DefaultFieldFactory; +import com.vaadin.v7.ui.Field; /** * FieldGroup provides an easy way of binding fields to data and handling @@ -59,8 +59,8 @@ public class FieldGroup implements Serializable { private boolean enabled = true; private boolean readOnly = false; - private HashMap<Object, LegacyField<?>> propertyIdToField = new HashMap<Object, LegacyField<?>>(); - private LinkedHashMap<LegacyField<?>, Object> fieldToPropertyId = new LinkedHashMap<LegacyField<?>, Object>(); + private HashMap<Object, Field<?>> propertyIdToField = new HashMap<Object, Field<?>>(); + private LinkedHashMap<Field<?>, Object> fieldToPropertyId = new LinkedHashMap<Field<?>, Object>(); private List<CommitHandler> commitHandlers = new ArrayList<CommitHandler>(); /** @@ -97,7 +97,7 @@ public class FieldGroup implements Serializable { public void setItemDataSource(Item itemDataSource) { this.itemDataSource = itemDataSource; - for (LegacyField<?> f : fieldToPropertyId.keySet()) { + for (Field<?> f : fieldToPropertyId.keySet()) { bind(f, fieldToPropertyId.get(f)); } } @@ -122,7 +122,7 @@ public class FieldGroup implements Serializable { * * @see #setBuffered(boolean) for more details on buffered mode * - * @see LegacyField#isBuffered() + * @see Field#isBuffered() * @return true if buffered mode is on, false otherwise * */ @@ -141,7 +141,7 @@ public class FieldGroup implements Serializable { * The default is to use buffered mode. * </p> * - * @see LegacyField#setBuffered(boolean) + * @see Field#setBuffered(boolean) * @param buffered * true to turn on buffered mode, false otherwise */ @@ -151,7 +151,7 @@ public class FieldGroup implements Serializable { } this.buffered = buffered; - for (LegacyField<?> field : getFields()) { + for (Field<?> field : getFields()) { field.setBuffered(buffered); } } @@ -177,7 +177,7 @@ public class FieldGroup implements Serializable { */ public void setEnabled(boolean fieldsEnabled) { enabled = fieldsEnabled; - for (LegacyField<?> field : getFields()) { + for (Field<?> field : getFields()) { field.setEnabled(fieldsEnabled); } } @@ -207,7 +207,7 @@ public class FieldGroup implements Serializable { */ public void setReadOnly(boolean fieldsReadOnly) { readOnly = fieldsReadOnly; - for (LegacyField<?> field : getFields()) { + for (Field<?> field : getFields()) { if (field.getPropertyDataSource() == null || !field.getPropertyDataSource().isReadOnly()) { field.setReadOnly(fieldsReadOnly); @@ -225,7 +225,7 @@ public class FieldGroup implements Serializable { * * @return A collection with all bound Fields */ - public Collection<LegacyField<?>> getFields() { + public Collection<Field<?>> getFields() { return fieldToPropertyId.keySet(); } @@ -245,7 +245,7 @@ public class FieldGroup implements Serializable { * If the field is null or the property id is already bound to * another field by this field binder */ - public void bind(LegacyField<?> field, Object propertyId) + public void bind(Field<?> field, Object propertyId) throws BindException { throwIfFieldIsNull(field, propertyId); throwIfPropertyIdAlreadyBound(field, propertyId); @@ -285,7 +285,7 @@ public class FieldGroup implements Serializable { return new TransactionalPropertyWrapper<T>(itemProperty); } - private void throwIfFieldIsNull(LegacyField<?> field, Object propertyId) { + private void throwIfFieldIsNull(Field<?> field, Object propertyId) { if (field == null) { throw new BindException(String.format( "Cannot bind property id '%s' to a null field.", @@ -293,7 +293,7 @@ public class FieldGroup implements Serializable { } } - private void throwIfPropertyIdAlreadyBound(LegacyField<?> field, + private void throwIfPropertyIdAlreadyBound(Field<?> field, Object propertyId) { if (propertyIdToField.containsKey(propertyId) && propertyIdToField.get(propertyId) != field) { @@ -340,7 +340,7 @@ public class FieldGroup implements Serializable { * If the field is not bound by this field binder or not bound * to the correct property id */ - public void unbind(LegacyField<?> field) throws BindException { + public void unbind(Field<?> field) throws BindException { Object propertyId = fieldToPropertyId.get(field); if (propertyId == null) { throw new BindException( @@ -376,7 +376,7 @@ public class FieldGroup implements Serializable { * @param field * The field to update */ - protected void configureField(LegacyField<?> field) { + protected void configureField(Field<?> field) { field.setBuffered(isBuffered()); field.setEnabled(isEnabled()); @@ -472,7 +472,7 @@ public class FieldGroup implements Serializable { try { firePreCommitEvent(); - Map<LegacyField<?>, InvalidValueException> invalidValueExceptions = commitFields(); + Map<Field<?>, InvalidValueException> invalidValueExceptions = commitFields(); if (invalidValueExceptions.isEmpty()) { firePostCommitEvent(); @@ -495,10 +495,10 @@ public class FieldGroup implements Serializable { * @return a propertyId to validation exception map which is empty if all * commits succeeded */ - private Map<LegacyField<?>, InvalidValueException> commitFields() { - Map<LegacyField<?>, InvalidValueException> invalidValueExceptions = new HashMap<LegacyField<?>, InvalidValueException>(); + private Map<Field<?>, InvalidValueException> commitFields() { + Map<Field<?>, InvalidValueException> invalidValueExceptions = new HashMap<Field<?>, InvalidValueException>(); - for (LegacyField<?> f : fieldToPropertyId.keySet()) { + for (Field<?> f : fieldToPropertyId.keySet()) { try { f.commit(); } catch (InvalidValueException e) { @@ -517,7 +517,7 @@ public class FieldGroup implements Serializable { */ public static class FieldGroupInvalidValueException extends InvalidValueException { - private Map<LegacyField<?>, InvalidValueException> invalidValueExceptions; + private Map<Field<?>, InvalidValueException> invalidValueExceptions; /** * Constructs a new exception with the specified validation exceptions. @@ -526,7 +526,7 @@ public class FieldGroup implements Serializable { * a property id to exception map */ public FieldGroupInvalidValueException( - Map<LegacyField<?>, InvalidValueException> invalidValueExceptions) { + Map<Field<?>, InvalidValueException> invalidValueExceptions) { super(null, invalidValueExceptions.values().toArray( new InvalidValueException[invalidValueExceptions.size()])); this.invalidValueExceptions = invalidValueExceptions; @@ -538,13 +538,13 @@ public class FieldGroup implements Serializable { * * @return a map with all the invalid value exceptions */ - public Map<LegacyField<?>, InvalidValueException> getInvalidFields() { + public Map<Field<?>, InvalidValueException> getInvalidFields() { return invalidValueExceptions; } } private void startTransactions() throws CommitException { - for (LegacyField<?> f : fieldToPropertyId.keySet()) { + for (Field<?> f : fieldToPropertyId.keySet()) { Property.Transactional<?> property = (Property.Transactional<?>) f .getPropertyDataSource(); if (property == null) { @@ -557,13 +557,13 @@ public class FieldGroup implements Serializable { } private void commitTransactions() { - for (LegacyField<?> f : fieldToPropertyId.keySet()) { + for (Field<?> f : fieldToPropertyId.keySet()) { ((Property.Transactional<?>) f.getPropertyDataSource()).commit(); } } private void rollbackTransactions() { - for (LegacyField<?> f : fieldToPropertyId.keySet()) { + for (Field<?> f : fieldToPropertyId.keySet()) { try { ((Property.Transactional<?>) f.getPropertyDataSource()) .rollback(); @@ -610,7 +610,7 @@ public class FieldGroup implements Serializable { * */ public void discard() { - for (LegacyField<?> f : fieldToPropertyId.keySet()) { + for (Field<?> f : fieldToPropertyId.keySet()) { try { f.discard(); } catch (Exception e) { @@ -629,7 +629,7 @@ public class FieldGroup implements Serializable { * @return The field that is bound to the property id or null if no field is * bound to that property id */ - public LegacyField<?> getField(Object propertyId) { + public Field<?> getField(Object propertyId) { return propertyIdToField.get(propertyId); } @@ -641,7 +641,7 @@ public class FieldGroup implements Serializable { * @return The property id that is bound to the field or null if the field * is not bound to any property id by this FieldBinder */ - public Object getPropertyId(LegacyField<?> field) { + public Object getPropertyId(Field<?> field) { return fieldToPropertyId.get(field); } @@ -745,14 +745,14 @@ public class FieldGroup implements Serializable { /** * Checks the validity of the bound fields. * <p> - * Call the {@link LegacyField#validate()} for the fields to get the + * Call the {@link Field#validate()} for the fields to get the * individual error messages. * * @return true if all bound fields are valid, false otherwise. */ public boolean isValid() { try { - for (LegacyField<?> field : getFields()) { + for (Field<?> field : getFields()) { field.validate(); } return true; @@ -767,7 +767,7 @@ public class FieldGroup implements Serializable { * @return true if at least one field has been modified, false otherwise */ public boolean isModified() { - for (LegacyField<?> field : getFields()) { + for (Field<?> field : getFields()) { if (field.isModified()) { return true; } @@ -801,7 +801,7 @@ public class FieldGroup implements Serializable { * Binds member fields found in the given object. * <p> * This method processes all (Java) member fields whose type extends - * {@link LegacyField} and that can be mapped to a property id. Property id + * {@link Field} and that can be mapped to a property id. Property id * mapping is done based on the field name or on a @{@link PropertyId} * annotation on the field. All non-null fields for which a property id can * be determined are bound to the property id. @@ -841,7 +841,7 @@ public class FieldGroup implements Serializable { * that have not been initialized. * <p> * This method processes all (Java) member fields whose type extends - * {@link LegacyField} and that can be mapped to a property id. Property ids + * {@link Field} and that can be mapped to a property id. Property ids * are searched in the following order: @{@link PropertyId} annotations, * exact field name matches and the case-insensitive matching that ignores * underscores. Fields that are not initialized (null) are built using the @@ -886,7 +886,7 @@ public class FieldGroup implements Serializable { * member fields that have not been initialized. * <p> * This method processes all (Java) member fields whose type extends - * {@link LegacyField} and that can be mapped to a property id. Property ids + * {@link Field} and that can be mapped to a property id. Property ids * are searched in the following order: @{@link PropertyId} annotations, * exact field name matches and the case-insensitive matching that ignores * underscores. Fields that are not initialized (null) are built using the @@ -907,7 +907,7 @@ public class FieldGroup implements Serializable { for (java.lang.reflect.Field memberField : getFieldsInDeclareOrder( objectClass)) { - if (!LegacyField.class.isAssignableFrom(memberField.getType())) { + if (!Field.class.isAssignableFrom(memberField.getType())) { // Process next field continue; } @@ -915,7 +915,7 @@ public class FieldGroup implements Serializable { PropertyId propertyIdAnnotation = memberField .getAnnotation(PropertyId.class); - Class<? extends LegacyField> fieldType = (Class<? extends LegacyField>) memberField + Class<? extends Field> fieldType = (Class<? extends Field>) memberField .getType(); Object propertyId = null; @@ -945,11 +945,11 @@ public class FieldGroup implements Serializable { continue; } - LegacyField<?> field; + Field<?> field; try { // Get the field from the object - field = (LegacyField<?>) ReflectTools.getJavaFieldValue( - objectWithMemberFields, memberField, LegacyField.class); + field = (Field<?>) ReflectTools.getJavaFieldValue( + objectWithMemberFields, memberField, Field.class); } catch (Exception e) { // If we cannot determine the value, just skip the field and try // the next one @@ -1082,12 +1082,12 @@ public class FieldGroup implements Serializable { * @return a map with all the invalid value exceptions. Can be empty but * not null */ - public Map<LegacyField<?>, InvalidValueException> getInvalidFields() { + public Map<Field<?>, InvalidValueException> getInvalidFields() { if (getCause() instanceof FieldGroupInvalidValueException) { return ((FieldGroupInvalidValueException) getCause()) .getInvalidFields(); } - return new HashMap<LegacyField<?>, InvalidValueException>(); + return new HashMap<Field<?>, InvalidValueException>(); } /** @@ -1137,7 +1137,7 @@ public class FieldGroup implements Serializable { * If there is a problem while building or binding * @return The created and bound field */ - public LegacyField<?> buildAndBind(Object propertyId) throws BindException { + public Field<?> buildAndBind(Object propertyId) throws BindException { String caption = DefaultFieldFactory .createCaptionByPropertyId(propertyId); return buildAndBind(caption, propertyId); @@ -1155,11 +1155,11 @@ public class FieldGroup implements Serializable { * @throws BindException * If there is a problem while building or binding * @return The created and bound field. Can be any type of - * {@link LegacyField}. + * {@link Field}. */ - public LegacyField<?> buildAndBind(String caption, Object propertyId) + public Field<?> buildAndBind(String caption, Object propertyId) throws BindException { - return buildAndBind(caption, propertyId, LegacyField.class); + return buildAndBind(caption, propertyId, Field.class); } /** @@ -1174,10 +1174,10 @@ public class FieldGroup implements Serializable { * @throws BindException * If the field could not be created * @return The created and bound field. Can be any type of - * {@link LegacyField}. + * {@link Field}. */ - public <T extends LegacyField> T buildAndBind(String caption, + public <T extends Field> T buildAndBind(String caption, Object propertyId, Class<T> fieldType) throws BindException { Class<?> type = getPropertyType(propertyId); @@ -1191,7 +1191,7 @@ public class FieldGroup implements Serializable { * Creates a field based on the given data type. * <p> * The data type is the type that we want to edit using the field. The field - * type is the type of field we want to create, can be {@link LegacyField} + * type is the type of field we want to create, can be {@link Field} * if any LegacyField is good. * </p> * @@ -1205,7 +1205,7 @@ public class FieldGroup implements Serializable { * @throws BindException * If the field could not be created */ - protected <T extends LegacyField> T build(String caption, Class<?> dataType, + protected <T extends Field> T build(String caption, Class<?> dataType, Class<T> fieldType) throws BindException { T field = getFieldFactory().createField(dataType, fieldType); if (field == null) { @@ -1247,9 +1247,9 @@ public class FieldGroup implements Serializable { * @since 7.4 */ public void clear() { - for (LegacyField<?> f : getFields()) { - if (f instanceof LegacyAbstractField) { - ((LegacyAbstractField) f).clear(); + for (Field<?> f : getFields()) { + if (f instanceof AbstractField) { + ((AbstractField) f).clear(); } } diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java index a80d51c6df..275f96761a 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/FieldGroupFieldFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/FieldGroupFieldFactory.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.io.Serializable; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.Field; /** * Factory interface for creating new LegacyField-instances based on the data @@ -34,10 +34,10 @@ public interface FieldGroupFieldFactory extends Serializable { * The type that we want to edit using the field * @param fieldType * The type of field we want to create. If set to - * {@link LegacyField} then any type of field is accepted + * {@link Field} then any type of field is accepted * @return A field that can be assigned to the given fieldType and that is * capable of editing the given type of data */ - <T extends LegacyField> T createField(Class<?> dataType, + <T extends Field> T createField(Class<?> dataType, Class<T> fieldType); } diff --git a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/PropertyId.java index 6476635829..09426bc811 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/fieldgroup/PropertyId.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/fieldgroup/PropertyId.java @@ -13,24 +13,24 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.Field; /** - * Defines the custom property name to be bound to a {@link LegacyField} using + * Defines the custom property name to be bound to a {@link Field} using * {@link FieldGroup} or {@link BeanFieldGroup}. * <p> * The automatic data binding in FieldGroup and BeanFieldGroup relies on a * naming convention by default: properties of an item are bound to similarly * named field components in given a editor object. If you want to map a * property with a different name (ID) to a - * {@link com.vaadin.client.ui.LegacyField}, you can use this annotation for the + * {@link com.vaadin.client.ui.Field}, you can use this annotation for the * member fields, with the name (ID) of the desired property as the parameter. * <p> * In following usage example, the text field would be bound to property "foo" diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java index 995e2f8675..4b004d95fa 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractBeanContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractBeanContainer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.Collection; @@ -23,19 +23,19 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Filterable; -import com.vaadin.data.Container.PropertySetChangeNotifier; -import com.vaadin.data.Container.SimpleFilterable; -import com.vaadin.data.Container.Sortable; -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.Property.ValueChangeNotifier; -import com.vaadin.data.util.MethodProperty.MethodException; -import com.vaadin.data.util.filter.SimpleStringFilter; -import com.vaadin.data.util.filter.UnsupportedFilterException; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Filterable; +import com.vaadin.v7.data.Container.PropertySetChangeNotifier; +import com.vaadin.v7.data.Container.SimpleFilterable; +import com.vaadin.v7.data.Container.Sortable; +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.Property.ValueChangeNotifier; +import com.vaadin.v7.data.util.MethodProperty.MethodException; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; /** * An abstract base class for in-memory containers for JavaBeans. @@ -524,7 +524,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> * added at the very end of the unfiltered container and not after the last * visible item if filtering is used. * - * @see com.vaadin.data.Container#addItem(Object) + * @see com.com.vaadin.v7.data.Container#addItem(Object) */ protected BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) { if (!validateBean(bean)) { @@ -536,7 +536,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean after the given bean. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object) + * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object) */ protected BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId, IDTYPE newItemId, BEANTYPE bean) { @@ -795,7 +795,7 @@ public abstract class AbstractBeanContainer<IDTYPE, BEANTYPE> /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Deprecated @Override diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java index 1995102345..f57da653a5 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractContainer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.Collection; @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.EventObject; import java.util.LinkedList; -import com.vaadin.data.Container; +import com.vaadin.v7.data.Container; /** * Abstract container class that manages event listeners and sending events to @@ -98,7 +98,7 @@ public abstract class AbstractContainer implements Container { * {@link PropertySetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener) + * @see PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener) */ protected void addPropertySetChangeListener( Container.PropertySetChangeListener listener) { @@ -111,7 +111,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Deprecated protected void addListener(Container.PropertySetChangeListener listener) { @@ -123,7 +123,7 @@ public abstract class AbstractContainer implements Container { * {@link PropertySetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see PropertySetChangeNotifier#removeListener(com.vaadin.data.Container. + * @see PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container. * PropertySetChangeListener) */ protected void removePropertySetChangeListener( @@ -135,7 +135,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Deprecated protected void removeListener( @@ -150,7 +150,7 @@ public abstract class AbstractContainer implements Container { * {@link ItemSetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener) + * @see ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener) */ protected void addItemSetChangeListener( Container.ItemSetChangeListener listener) { @@ -163,7 +163,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Deprecated protected void addListener(Container.ItemSetChangeListener listener) { @@ -175,7 +175,7 @@ public abstract class AbstractContainer implements Container { * {@link ItemSetChangeNotifier}, override with the corresponding public * method and implement the interface to use this. * - * @see ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener) + * @see ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener) */ protected void removeItemSetChangeListener( Container.ItemSetChangeListener listener) { @@ -186,7 +186,7 @@ public abstract class AbstractContainer implements Container { /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Deprecated protected void removeListener(Container.ItemSetChangeListener listener) { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java index 43b65ab75e..78c908f78a 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/AbstractInMemoryContainer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.Collection; @@ -25,11 +25,11 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import com.vaadin.data.Container; -import com.vaadin.data.Container.ItemSetChangeNotifier; -import com.vaadin.data.Item; -import com.vaadin.data.util.filter.SimpleStringFilter; -import com.vaadin.data.util.filter.UnsupportedFilterException; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.ItemSetChangeNotifier; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; /** * Abstract {@link Container} class that handles common functionality for @@ -67,18 +67,18 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * <code>sort(Object[], boolean[])</code>. * * To implement {@link Filterable}, subclasses need to implement the methods - * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)} + * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)} * (calling {@link #addFilter(Filter)}), * {@link Filterable#removeAllContainerFilters()} (calling * {@link #removeAllFilters()}) and - * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)} - * (calling {@link #removeFilter(com.vaadin.data.Container.Filter)}). + * {@link Filterable#removeContainerFilter(com.com.vaadin.v7.data.Container.Filter)} + * (calling {@link #removeFilter(com.com.vaadin.v7.data.Container.Filter)}). * * To implement {@link SimpleFilterable}, subclasses also need to implement the * methods * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)} * and {@link SimpleFilterable#removeContainerFilters(Object)} calling - * {@link #addFilter(com.vaadin.data.Container.Filter)} and + * {@link #addFilter(com.com.vaadin.v7.data.Container.Filter)} and * {@link #removeFilters(Object)} respectively. * * @param <ITEMIDTYPE> @@ -444,7 +444,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE // ItemSetChangeNotifier /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Deprecated @Override @@ -466,7 +466,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Deprecated @Override @@ -566,7 +566,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * be in-memory filterable. * * This can be used to implement - * {@link Filterable#addContainerFilter(com.vaadin.data.Container.Filter)} + * {@link Filterable#addContainerFilter(com.com.vaadin.v7.data.Container.Filter)} * and optionally also * {@link SimpleFilterable#addContainerFilter(Object, String, boolean, boolean)} * (with {@link SimpleStringFilter}). @@ -606,7 +606,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * Remove a specific container filter and re-filter the view (if necessary). * * This can be used to implement - * {@link Filterable#removeContainerFilter(com.vaadin.data.Container.Filter)} + * {@link Filterable#removeContainerFilter(com.com.vaadin.v7.data.Container.Filter)} * . */ protected void removeFilter(Filter filter) { @@ -718,7 +718,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * Subclasses should call this from a public * {@link #sort(Object[], boolean[])} method when implementing Sortable. * - * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], + * @see com.com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[], * boolean[]) */ protected void sortContainer(Object[] propertyId, boolean[] ascending) { @@ -1142,7 +1142,7 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * Set the internal collection of filters without performing filtering. * * This method is mostly for internal use, use - * {@link #addFilter(com.vaadin.data.Container.Filter)} and + * {@link #addFilter(com.com.vaadin.v7.data.Container.Filter)} and * <code>remove*Filter*</code> (which also re-filter the container) instead * when possible. * diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java index 01a5256199..0127adbfee 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanContainer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Collection; @@ -40,7 +40,7 @@ import java.util.Collection; * * <p> * If a bean id resolver is set using - * {@link #setBeanIdResolver(com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver)} + * {@link #setBeanIdResolver(com.vaadin.v7.data.util.AbstractBeanContainer.BeanIdResolver)} * or {@link #setBeanIdProperty(Object)}, the methods {@link #addBean(Object)}, * {@link #addBeanAfter(Object, Object)}, {@link #addBeanAt(int, Object)} and * {@link #addAll(java.util.Collection)} can be used to add items to the @@ -78,7 +78,7 @@ public class BeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean to the Container. * - * @see com.vaadin.data.Container#addItem(Object) + * @see com.com.vaadin.v7.data.Container#addItem(Object) */ @Override public BeanItem<BEANTYPE> addItem(IDTYPE itemId, BEANTYPE bean) { @@ -92,7 +92,7 @@ public class BeanContainer<IDTYPE, BEANTYPE> /** * Adds the bean after the given item id. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object) + * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object) */ @Override public BeanItem<BEANTYPE> addItemAfter(IDTYPE previousItemId, diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java index 2725606a4d..78ec807fd1 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItem.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.beans.PropertyDescriptor; import java.lang.reflect.Method; @@ -26,6 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import com.vaadin.data.util.BeanUtil; + /** * A wrapper class for adding the Item interface to any Java Bean. * diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java index 66e553164d..1e75901b04 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/BeanItemContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/BeanItemContainer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Collection; @@ -186,7 +186,7 @@ public class BeanItemContainer<BEANTYPE> * @param newItemId * the bean (of type BT) to add (not null) * - * @see com.vaadin.data.Container.Ordered#addItemAfter(Object, Object) + * @see com.com.vaadin.v7.data.Container.Ordered#addItemAfter(Object, Object) */ @Override @SuppressWarnings("unchecked") @@ -219,7 +219,7 @@ public class BeanItemContainer<BEANTYPE> * * The bean is used both as the item contents and as the item identifier. * - * @see com.vaadin.data.Container#addItem(Object) + * @see com.com.vaadin.v7.data.Container#addItem(Object) */ @Override @SuppressWarnings("unchecked") @@ -232,7 +232,7 @@ public class BeanItemContainer<BEANTYPE> * * The bean is used both as the item contents and as the item identifier. * - * @see com.vaadin.data.Container#addItem(Object) + * @see com.com.vaadin.v7.data.Container#addItem(Object) */ @Override public BeanItem<BEANTYPE> addBean(BEANTYPE bean) { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java index 9e108cd615..308a1e9fd2 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/ContainerHierarchicalWrapper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapper.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.Arrays; @@ -27,14 +27,14 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.LinkedList; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; /** * <p> * A wrapper class for adding external hierarchy to containers not implementing - * the {@link com.vaadin.data.Container.Hierarchical} interface. + * the {@link com.vaadin.v7.data.Container.Hierarchical} interface. * </p> * * <p> @@ -356,7 +356,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, * this method fails and <code>false</code> is returned; the children must * be first explicitly removed with * {@link #setParent(Object itemId, Object newParentId)} or - * {@link com.vaadin.data.Container#removeItem(Object itemId)}. + * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}. * </p> * * @param itemId @@ -736,7 +736,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -761,7 +761,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -786,7 +786,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -811,7 +811,7 @@ public class ContainerHierarchicalWrapper implements Container.Hierarchical, /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java index 46b4f4bcd4..7800a6ff50 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/FilesystemContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/FilesystemContainer.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.File; import java.io.FilenameFilter; @@ -30,11 +30,11 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; import com.vaadin.server.Resource; import com.vaadin.util.FileTypeResolver; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; /** * A hierarchical container wrapper for a filesystem. @@ -739,7 +739,7 @@ public class FilesystemContainer implements Container.Hierarchical { /** * Filesystem container does not support adding new properties. * - * @see com.vaadin.data.Item#addItemProperty(Object, Property) + * @see com.vaadin.v7.data.Item#addItemProperty(Object, Property) */ @Override public boolean addItemProperty(Object id, Property property) @@ -751,7 +751,7 @@ public class FilesystemContainer implements Container.Hierarchical { /** * Filesystem container does not support removing properties. * - * @see com.vaadin.data.Item#removeItemProperty(Object) + * @see com.vaadin.v7.data.Item#removeItemProperty(Object) */ @Override public boolean removeItemProperty(Object id) diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java index 8d7a1512f9..cfa061db02 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/GeneratedPropertyContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/GeneratedPropertyContainer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.ArrayList; @@ -27,12 +27,12 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; import com.vaadin.data.sort.SortOrder; -import com.vaadin.data.util.filter.UnsupportedFilterException; import com.vaadin.shared.data.sort.SortDirection; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; /** * Container wrapper that adds support for generated properties. This container diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java index 115fd91791..04940918de 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/HierarchicalContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainer.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Collection; import java.util.Collections; @@ -26,8 +26,8 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import com.vaadin.data.Container; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; /** * A specialized Container whose contents can be accessed like it was a @@ -194,7 +194,7 @@ public class HierarchicalContainer extends IndexedContainer * this method fails and <code>false</code> is returned; the children must * be first explicitly removed with * {@link #setParent(Object itemId, Object newParentId)} or - * {@link com.vaadin.data.Container#removeItem(Object itemId)}. + * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}. * </p> * * @param itemId @@ -431,7 +431,7 @@ public class HierarchicalContainer extends IndexedContainer @Override protected void fireItemSetChange( - com.vaadin.data.Container.ItemSetChangeEvent event) { + com.vaadin.v7.data.Container.ItemSetChangeEvent event) { if (contentsChangeEventsOn()) { super.fireItemSetChange(event); } else { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java index 4ff253394a..cbec3a2327 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/IndexedContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/IndexedContainer.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.ArrayList; @@ -29,11 +29,11 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.filter.SimpleStringFilter; -import com.vaadin.data.util.filter.UnsupportedFilterException; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; /** * An implementation of the <code>{@link Container.Indexed}</code> interface @@ -50,7 +50,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException; * <li>Sends all needed events on content changes. * </ul> * - * @see com.vaadin.data.Container + * @see com.vaadin.v7.data.Container * * @author Vaadin Ltd. * @since 3.0 @@ -503,7 +503,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Deprecated @Override @@ -519,7 +519,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Deprecated @Override @@ -543,7 +543,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -567,7 +567,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -818,7 +818,7 @@ public class IndexedContainer * properties at container level. See * {@link IndexedContainer#addContainerProperty(Object, Class, Object)} * - * @see com.vaadin.data.Item#addProperty(Object, Property) + * @see com.vaadin.v7.data.Item#addProperty(Object, Property) */ @Override public boolean addItemProperty(Object id, Property property) @@ -832,7 +832,7 @@ public class IndexedContainer * properties at container level. See * {@link IndexedContainer#removeContainerProperty(Object)} * - * @see com.vaadin.data.Item#removeProperty(Object) + * @see com.vaadin.v7.data.Item#removeProperty(Object) */ @Override public boolean removeItemProperty(Object id) @@ -1009,7 +1009,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1031,7 +1031,7 @@ public class IndexedContainer /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java index d3559b5652..fe9af78922 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheFlushNotifier.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheFlushNotifier.java @@ -13,7 +13,7 @@ * 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 java.io.Serializable; import java.lang.ref.ReferenceQueue; @@ -21,9 +21,9 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; -import com.vaadin.data.util.sqlcontainer.query.FreeformQuery; -import com.vaadin.data.util.sqlcontainer.query.QueryDelegate; -import com.vaadin.data.util.sqlcontainer.query.TableQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate; +import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; /** * CacheFlushNotifier is a simple static notification mechanism to inform other diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheMap.java index 77919f72b2..f986e7db51 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/CacheMap.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/CacheMap.java @@ -13,7 +13,7 @@ * 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 java.util.LinkedHashMap; import java.util.Map; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java index e7d83e118d..d437cc9b33 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ColumnProperty.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ColumnProperty.java @@ -13,15 +13,15 @@ * 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 java.sql.Date; import java.sql.Time; import java.sql.Timestamp; import java.util.logging.Logger; -import com.vaadin.data.Property; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; /** * ColumnProperty represents the value of one column in a RowItem. In addition diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java index 1a29d531bc..887aa9c458 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/OptimisticLockException.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/OptimisticLockException.java @@ -13,9 +13,9 @@ * 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.TableQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; /** * An OptimisticLockException is thrown when trying to update or delete a row diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java index 367135782f..2a6cca6fc6 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowId.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowId.java @@ -13,7 +13,7 @@ * 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; public class ReadOnlyRowId extends RowId { private static final long serialVersionUID = -2626764781642012467L; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/Reference.java index ce6680089d..a80b07aca2 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/Reference.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/Reference.java @@ -13,7 +13,7 @@ * 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 java.io.Serializable; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java index 5f78df79e1..0181dac2b3 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowId.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowId.java @@ -13,7 +13,7 @@ * 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 java.io.Serializable; import java.util.Arrays; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java index ffc8bfc6f7..b8039e1e68 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/RowItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/RowItem.java @@ -13,14 +13,14 @@ * 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 java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; /** * RowItem represents one row of a result set obtained from a QueryDelegate. diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java index dde57d3610..b2d5b91746 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLContainer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainer.java @@ -13,7 +13,7 @@ * 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 java.io.IOException; import java.sql.ResultSet; @@ -32,19 +32,19 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -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.filter.Compare.Equal; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.filter.UnsupportedFilterException; -import com.vaadin.data.util.sqlcontainer.query.OrderBy; -import com.vaadin.data.util.sqlcontainer.query.QueryDelegate; -import com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener; -import com.vaadin.data.util.sqlcontainer.query.TableQuery; -import com.vaadin.data.util.sqlcontainer.query.generator.MSSQLGenerator; -import com.vaadin.data.util.sqlcontainer.query.generator.OracleGenerator; +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.filter.Compare.Equal; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; +import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; +import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate; +import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener; +import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.MSSQLGenerator; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.OracleGenerator; public class SQLContainer implements Container, Container.Filterable, Container.Indexed, Container.Sortable, Container.ItemSetChangeNotifier { @@ -1592,7 +1592,7 @@ public class SQLContainer implements Container, Container.Filterable, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -1618,7 +1618,7 @@ public class SQLContainer implements Container, Container.Filterable, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java index 2abe45d5fc..3939f7ab08 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/SQLUtil.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/SQLUtil.java @@ -13,7 +13,7 @@ * 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 java.io.Serializable; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java index 5cd3e6fac8..78c3339f05 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/TemporaryRowId.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/TemporaryRowId.java @@ -13,7 +13,7 @@ * 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; public class TemporaryRowId extends RowId { private static final long serialVersionUID = -641983830469018329L; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java index cf50a641de..55ab7f041a 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPool.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPool.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.connection; +package com.vaadin.v7.data.util.sqlcontainer.connection; import java.sql.Connection; import java.sql.SQLException; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java index 842a264caa..fce1d8aa25 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/JDBCConnectionPool.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/JDBCConnectionPool.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.connection; +package com.vaadin.v7.data.util.sqlcontainer.connection; import java.io.Serializable; import java.sql.Connection; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java index 9cf02a9e68..fb4444a436 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPool.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.connection; +package com.vaadin.v7.data.util.sqlcontainer.connection; import java.io.IOException; import java.sql.Connection; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java index 586fe28171..dc582dd120 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/AbstractTransactionalQuery.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/AbstractTransactionalQuery.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.io.Serializable; import java.sql.Connection; @@ -22,7 +22,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; /** * Common base class for database query classes that handle connections and diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java index 8066d563a4..53006ce849 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQuery.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQuery.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.io.IOException; import java.sql.Connection; @@ -26,12 +26,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.RowItem; -import com.vaadin.data.util.sqlcontainer.SQLContainer; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.util.sqlcontainer.SQLContainer; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; @SuppressWarnings("serial") public class FreeformQuery extends AbstractTransactionalQuery diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java index fac0b1ab45..7af783256f 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryDelegate.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryDelegate.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.io.Serializable; import java.sql.Connection; import java.sql.SQLException; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; public interface FreeformQueryDelegate extends Serializable { /** diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java index 884a303684..d658ea7188 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/FreeformStatementDelegate.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformStatementDelegate.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; /** * FreeformStatementDelegate is an extension to FreeformQueryDelegate that diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java index ed57967772..c6315f12dc 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/OrderBy.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/OrderBy.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.io.Serializable; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java index 16e04a7da0..cc4c9f5668 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/QueryDelegate.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryDelegate.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.io.Serializable; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.RowId; -import com.vaadin.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.RowId; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; public interface QueryDelegate extends Serializable { /** diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java index 959c494634..a8a84ea086 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/TableQuery.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQuery.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.io.IOException; import java.sql.Connection; @@ -32,19 +32,19 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Compare.Equal; -import com.vaadin.data.util.sqlcontainer.ColumnProperty; -import com.vaadin.data.util.sqlcontainer.OptimisticLockException; -import com.vaadin.data.util.sqlcontainer.RowId; -import com.vaadin.data.util.sqlcontainer.RowItem; -import com.vaadin.data.util.sqlcontainer.SQLUtil; -import com.vaadin.data.util.sqlcontainer.TemporaryRowId; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -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.SQLGenerator; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Compare.Equal; +import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty; +import com.vaadin.v7.data.util.sqlcontainer.OptimisticLockException; +import com.vaadin.v7.data.util.sqlcontainer.RowId; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.util.sqlcontainer.SQLUtil; +import com.vaadin.v7.data.util.sqlcontainer.TemporaryRowId; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +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.SQLGenerator; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; @SuppressWarnings("serial") public class TableQuery extends AbstractTransactionalQuery @@ -835,7 +835,7 @@ public class TableQuery extends AbstractTransactionalQuery /** * @deprecated As of 7.0, replaced by - * {@link #addRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} + * {@link #addRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} **/ @Override @Deprecated @@ -855,7 +855,7 @@ public class TableQuery extends AbstractTransactionalQuery /** * @deprecated As of 7.0, replaced by - * {@link #removeRowIdChangeListener(com.vaadin.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} + * {@link #removeRowIdChangeListener(com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate.RowIdChangeListener)} **/ @Override @Deprecated diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java index 9c05545e41..5439258f32 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/DefaultSQLGenerator.java @@ -13,20 +13,20 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator; +package com.vaadin.v7.data.util.sqlcontainer.query.generator; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.ColumnProperty; -import com.vaadin.data.util.sqlcontainer.RowItem; -import com.vaadin.data.util.sqlcontainer.SQLUtil; -import com.vaadin.data.util.sqlcontainer.TemporaryRowId; -import com.vaadin.data.util.sqlcontainer.query.OrderBy; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.util.sqlcontainer.SQLUtil; +import com.vaadin.v7.data.util.sqlcontainer.TemporaryRowId; +import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.StringDecorator; /** * Generates generic SQL that is supported by HSQLDB, MySQL and PostgreSQL. diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java index baddc60e3f..fd4f0bcfbe 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/MSSQLGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/MSSQLGenerator.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator; +package com.vaadin.v7.data.util.sqlcontainer.query.generator; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.query.OrderBy; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; @SuppressWarnings("serial") public class MSSQLGenerator extends DefaultSQLGenerator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java index 0097b5017c..64a0c22d97 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/OracleGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/OracleGenerator.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator; +package com.vaadin.v7.data.util.sqlcontainer.query.generator; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.query.OrderBy; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; @SuppressWarnings("serial") public class OracleGenerator extends DefaultSQLGenerator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java index 6011346b78..1841c0a23b 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/SQLGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/SQLGenerator.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator; +package com.vaadin.v7.data.util.sqlcontainer.query.generator; import java.io.Serializable; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.RowItem; -import com.vaadin.data.util.sqlcontainer.query.OrderBy; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; /** * The SQLGenerator interface is meant to be implemented for each different SQL diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java index 43cfb597bb..fe8240cd42 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/StatementHelper.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/StatementHelper.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator; +package com.vaadin.v7.data.util.sqlcontainer.query.generator; import java.io.Serializable; import java.math.BigDecimal; diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java index 6eab9f5596..ef958459fb 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/AndTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/AndTranslator.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.And; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.And; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class AndTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java index 2cdecd1e6d..7e491925a3 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/BetweenTranslator.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Between; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Between; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class BetweenTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java index bcb348dc8a..44e5a7ee14 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/CompareTranslator.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Compare; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Compare; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class CompareTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java index e593146550..4bd1807600 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/FilterTranslator.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; import java.io.Serializable; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public interface FilterTranslator extends Serializable { public boolean translatesFilter(Filter filter); diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java index dd7a90828a..d2dda82232 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/IsNullTranslator.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.IsNull; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.IsNull; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class IsNullTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java index 3c27240e9e..bd41aa1abf 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/LikeTranslator.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class LikeTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java index fe98ca24b6..83110e2f41 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/NotTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/NotTranslator.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.IsNull; -import com.vaadin.data.util.filter.Not; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.IsNull; +import com.vaadin.v7.data.util.filter.Not; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class NotTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java index 2f30acc89f..61fad7b559 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/OrTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/OrTranslator.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Or; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Or; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class OrTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java index b8fb306076..c7ed3f91ae 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/QueryBuilder.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class QueryBuilder implements Serializable { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java index 312adc5ed7..bb47fbd826 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/SimpleStringTranslator.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.filter.SimpleStringFilter; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class SimpleStringTranslator implements FilterTranslator { diff --git a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java index f8005f4290..72c841fe0a 100644 --- a/compatibility-server/src/main/java/com/vaadin/data/util/sqlcontainer/query/generator/filter/StringDecorator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/sqlcontainer/query/generator/filter/StringDecorator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query.generator.filter; +package com.vaadin.v7.data.util.sqlcontainer.query.generator.filter; import java.io.Serializable; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java index c0eb3b5fa3..340b34237d 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractStringValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractStringValidator.java @@ -28,8 +28,8 @@ package com.vaadin.v7.data.validator; * @since 5.4 */ @SuppressWarnings("serial") -public abstract class LegacyAbstractStringValidator - extends LegacyAbstractValidator<String> { +public abstract class AbstractStringValidator + extends AbstractValidator<String> { /** * Constructs a validator for strings. @@ -43,7 +43,7 @@ public abstract class LegacyAbstractStringValidator * the message to be included in an {@link InvalidValueException} * (with "{0}" replaced by the value that failed validation). */ - public LegacyAbstractStringValidator(String errorMessage) { + public AbstractStringValidator(String errorMessage) { super(errorMessage); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java index 8c1cc56010..8f900961df 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyAbstractValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/AbstractValidator.java @@ -44,7 +44,7 @@ import com.vaadin.v7.data.Validator; * @author Vaadin Ltd. * @since 5.4 */ -public abstract class LegacyAbstractValidator<T> implements Validator { +public abstract class AbstractValidator<T> implements Validator { /** * Error message that is included in an {@link InvalidValueException} if @@ -59,7 +59,7 @@ public abstract class LegacyAbstractValidator<T> implements Validator { * the message to be included in an {@link InvalidValueException} * (with "{0}" replaced by the value that failed validation). */ - public LegacyAbstractValidator(String errorMessage) { + public AbstractValidator(String errorMessage) { this.errorMessage = errorMessage; } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java index dfc107280f..9afd816ac0 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBeanValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BeanValidator.java @@ -44,7 +44,7 @@ import com.vaadin.v7.data.Validator; * @author Petri Hakala * @author Henri Sara */ -public class LegacyBeanValidator implements Validator { +public class BeanValidator implements Validator { private static final long serialVersionUID = 1L; private static ValidatorFactory factory; @@ -97,7 +97,7 @@ public class LegacyBeanValidator implements Validator { * @param propertyName * property to validate */ - public LegacyBeanValidator(Class<?> beanClass, String propertyName) { + public BeanValidator(Class<?> beanClass, String propertyName) { this.beanClass = beanClass; this.propertyName = propertyName; locale = Locale.getDefault(); @@ -169,7 +169,7 @@ public class LegacyBeanValidator implements Validator { /** * Returns a shared Validator instance to use. An instance is created using * the validator factory if necessary and thereafter reused by the - * {@link LegacyBeanValidator} instance. + * {@link BeanValidator} instance. * * @return the JSR-303 {@link javax.validation.Validator} to use */ diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigDecimalRangeValidator.java index 72c959e773..652e33e12e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigDecimalRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigDecimalRangeValidator.java @@ -24,8 +24,8 @@ import java.math.BigDecimal; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyBigDecimalRangeValidator - extends LegacyRangeValidator<BigDecimal> { +public class BigDecimalRangeValidator + extends RangeValidator<BigDecimal> { /** * Creates a validator for checking that an BigDecimal is within a given @@ -43,7 +43,7 @@ public class LegacyBigDecimalRangeValidator * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyBigDecimalRangeValidator(String errorMessage, + public BigDecimalRangeValidator(String errorMessage, BigDecimal minValue, BigDecimal maxValue) { super(errorMessage, BigDecimal.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigIntegerRangeValidator.java index 363a9bb82c..62ec012344 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyBigIntegerRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/BigIntegerRangeValidator.java @@ -24,8 +24,8 @@ import java.math.BigInteger; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyBigIntegerRangeValidator - extends LegacyRangeValidator<BigInteger> { +public class BigIntegerRangeValidator + extends RangeValidator<BigInteger> { /** * Creates a validator for checking that an BigInteger is within a given @@ -43,7 +43,7 @@ public class LegacyBigIntegerRangeValidator * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyBigIntegerRangeValidator(String errorMessage, + public BigIntegerRangeValidator(String errorMessage, BigInteger minValue, BigInteger maxValue) { super(errorMessage, BigInteger.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ByteRangeValidator.java index 14694c4a52..4bbb1b3290 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyByteRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ByteRangeValidator.java @@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> { +public class ByteRangeValidator extends RangeValidator<Byte> { /** * Creates a validator for checking that an Byte is within a given range. @@ -39,7 +39,7 @@ public class LegacyByteRangeValidator extends LegacyRangeValidator<Byte> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyByteRangeValidator(String errorMessage, Byte minValue, + public ByteRangeValidator(String errorMessage, Byte minValue, Byte maxValue) { super(errorMessage, Byte.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java index ecf4d121f2..2827c401ed 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyCompositeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/CompositeValidator.java @@ -34,7 +34,7 @@ import com.vaadin.v7.data.Validator; * @since 3.0 */ @SuppressWarnings("serial") -public class LegacyCompositeValidator implements Validator { +public class CompositeValidator implements Validator { public enum CombinationMode { /** @@ -78,7 +78,7 @@ public class LegacyCompositeValidator implements Validator { * Construct a composite validator in <code>AND</code> mode without error * message. */ - public LegacyCompositeValidator() { + public CompositeValidator() { this(CombinationMode.AND, ""); } @@ -88,7 +88,7 @@ public class LegacyCompositeValidator implements Validator { * @param mode * @param errorMessage */ - public LegacyCompositeValidator(CombinationMode mode, String errorMessage) { + public CompositeValidator(CombinationMode mode, String errorMessage) { setErrorMessage(errorMessage); setMode(mode); } @@ -243,9 +243,9 @@ public class LegacyCompositeValidator implements Validator { if (validatorType.isAssignableFrom(v.getClass())) { found.add(v); } - if (v instanceof LegacyCompositeValidator - && ((LegacyCompositeValidator) v).getMode() == MODE_AND) { - final Collection<Validator> c = ((LegacyCompositeValidator) v) + if (v instanceof CompositeValidator + && ((CompositeValidator) v).getMode() == MODE_AND) { + final Collection<Validator> c = ((CompositeValidator) v) .getSubValidators(validatorType); if (c != null) { found.addAll(c); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DateRangeValidator.java index 94cc2f78e7..f46f8d989e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDateRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DateRangeValidator.java @@ -31,7 +31,7 @@ import com.vaadin.shared.ui.datefield.Resolution; * @author Vaadin Ltd. * @since 7.0 */ -public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> { +public class DateRangeValidator extends RangeValidator<Date> { /** * Creates a validator for checking that an Date is within a given range. @@ -53,7 +53,7 @@ public class LegacyDateRangeValidator extends LegacyRangeValidator<Date> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyDateRangeValidator(String errorMessage, Date minValue, + public DateRangeValidator(String errorMessage, Date minValue, Date maxValue, Resolution resolution) { super(errorMessage, Date.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleRangeValidator.java index 7416ad60e6..1a6d8cd208 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleRangeValidator.java @@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator; * @since 7.0 */ @SuppressWarnings("serial") -public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> { +public class DoubleRangeValidator extends RangeValidator<Double> { /** * Creates a validator for checking that an Double is within a given range. @@ -39,7 +39,7 @@ public class LegacyDoubleRangeValidator extends LegacyRangeValidator<Double> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyDoubleRangeValidator(String errorMessage, Double minValue, + public DoubleRangeValidator(String errorMessage, Double minValue, Double maxValue) { super(errorMessage, Double.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java index fcc94f6e7c..0d0dd8ff40 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyDoubleValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/DoubleValidator.java @@ -15,23 +15,23 @@ */ package com.vaadin.v7.data.validator; -import com.vaadin.data.Property; -import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.converter.StringToDoubleConverter; /** * String validator for a double precision floating point number. See - * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for + * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for * more information. * * @author Vaadin Ltd. * @since 5.4 - * @deprecated As of 7.0. Use a {@link LegacyStringToDoubleConverter} converter + * @deprecated As of 7.0. Use a {@link StringToDoubleConverter} converter * on the field instead or bind the field to a {@link Property} of * type {@link Double}. */ @Deprecated @SuppressWarnings("serial") -public class LegacyDoubleValidator extends LegacyAbstractStringValidator { +public class DoubleValidator extends AbstractStringValidator { /** * Creates a validator for checking that a string can be parsed as an @@ -40,11 +40,11 @@ public class LegacyDoubleValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. * @deprecated As of 7.0. Use a Double converter on the field instead and/or - * use a {@link LegacyDoubleRangeValidator} for validating that + * use a {@link DoubleRangeValidator} for validating that * the value is inside a given range. */ @Deprecated - public LegacyDoubleValidator(String errorMessage) { + public DoubleValidator(String errorMessage) { super(errorMessage); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java index 836ff5ff15..7d87eda52e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyEmailValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/EmailValidator.java @@ -20,7 +20,7 @@ package com.vaadin.v7.data.validator; * complete according to RFC 822 but handles the vast majority of valid e-mail * addresses correctly. * - * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} + * See {@link com.vaadin.v7.data.validator.AbstractStringValidator} * for more information. * * <p> @@ -33,7 +33,7 @@ package com.vaadin.v7.data.validator; * @since 5.4 */ @SuppressWarnings("serial") -public class LegacyEmailValidator extends LegacyRegexpValidator { +public class EmailValidator extends RegexpValidator { /** * Creates a validator for checking that a string is a syntactically valid @@ -42,7 +42,7 @@ public class LegacyEmailValidator extends LegacyRegexpValidator { * @param errorMessage * the message to display in case the value does not validate. */ - public LegacyEmailValidator(String errorMessage) { + public EmailValidator(String errorMessage) { super("^([a-zA-Z0-9_\\.\\-+])+@(([a-zA-Z0-9-])+\\.)+([a-zA-Z0-9]{2,4})+$", true, errorMessage); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/FloatRangeValidator.java index 9dc27d3727..c63b4a51a2 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyFloatRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/FloatRangeValidator.java @@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> { +public class FloatRangeValidator extends RangeValidator<Float> { /** * Creates a validator for checking that an Float is within a given range. @@ -39,7 +39,7 @@ public class LegacyFloatRangeValidator extends LegacyRangeValidator<Float> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyFloatRangeValidator(String errorMessage, Float minValue, + public FloatRangeValidator(String errorMessage, Float minValue, Float maxValue) { super(errorMessage, Float.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerRangeValidator.java index 09de051e1d..48fa420f06 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerRangeValidator.java @@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator; * @since 5.4 */ @SuppressWarnings("serial") -public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> { +public class IntegerRangeValidator extends RangeValidator<Integer> { /** * Creates a validator for checking that an Integer is within a given range. @@ -39,7 +39,7 @@ public class LegacyIntegerRangeValidator extends LegacyRangeValidator<Integer> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyIntegerRangeValidator(String errorMessage, Integer minValue, + public IntegerRangeValidator(String errorMessage, Integer minValue, Integer maxValue) { super(errorMessage, Integer.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java index 34d2e7e76b..b5f671b6f1 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyIntegerValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/IntegerValidator.java @@ -15,23 +15,23 @@ */ package com.vaadin.v7.data.validator; -import com.vaadin.data.Property; -import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.converter.StringToIntegerConverter; /** * String validator for integers. See - * {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} for + * {@link com.vaadin.v7.data.validator.AbstractStringValidator} for * more information. * * @author Vaadin Ltd. * @since 5.4 - * @deprecated As of 7.0. Use a {@link LegacyStringToIntegerConverter} converter + * @deprecated As of 7.0. Use a {@link StringToIntegerConverter} converter * on the field instead or bind the field to a {@link Property} of * type {@link Integer}. */ @SuppressWarnings("serial") @Deprecated -public class LegacyIntegerValidator extends LegacyAbstractStringValidator { +public class IntegerValidator extends AbstractStringValidator { /** * Creates a validator for checking that a string can be parsed as an @@ -40,11 +40,11 @@ public class LegacyIntegerValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. * @deprecated As of 7.0. Use an Integer converter on the field instead - * and/or use an {@link LegacyIntegerRangeValidator} for + * and/or use an {@link IntegerRangeValidator} for * validating that the value is inside a given range. */ @Deprecated - public LegacyIntegerValidator(String errorMessage) { + public IntegerValidator(String errorMessage) { super(errorMessage); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LongRangeValidator.java index 8e5523b46a..440961430c 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyLongRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LongRangeValidator.java @@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> { +public class LongRangeValidator extends RangeValidator<Long> { /** * Creates a validator for checking that an Long is within a given range. @@ -39,7 +39,7 @@ public class LegacyLongRangeValidator extends LegacyRangeValidator<Long> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyLongRangeValidator(String errorMessage, Long minValue, + public LongRangeValidator(String errorMessage, Long minValue, Long maxValue) { super(errorMessage, Long.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java index 282f5baf29..60e1cb4550 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyNullValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/NullValidator.java @@ -26,7 +26,7 @@ import com.vaadin.v7.data.Validator; * @since 3.0 */ @SuppressWarnings("serial") -public class LegacyNullValidator implements Validator { +public class NullValidator implements Validator { private boolean onlyNullAllowed; @@ -40,7 +40,7 @@ public class LegacyNullValidator implements Validator { * @param onlyNullAllowed * Are only nulls allowed? */ - public LegacyNullValidator(String errorMessage, boolean onlyNullAllowed) { + public NullValidator(String errorMessage, boolean onlyNullAllowed) { setErrorMessage(errorMessage); setNullAllowed(onlyNullAllowed); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RangeValidator.java index 27830be7dd..c4749ae2a6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RangeValidator.java @@ -21,10 +21,10 @@ package com.vaadin.v7.data.validator; * * Verifies that the value is of the given type and within the (optionally) * given limits. Typically you want to use a sub class of this like - * {@link LegacyIntegerRangeValidator}, {@link LegacyDoubleRangeValidator} or - * {@link LegacyDateRangeValidator} in applications. + * {@link IntegerRangeValidator}, {@link DoubleRangeValidator} or + * {@link DateRangeValidator} in applications. * <p> - * Note that {@link LegacyRangeValidator} always accept null values. Make a + * Note that {@link RangeValidator} always accept null values. Make a * field required to ensure that no empty values are accepted or override * {@link #isValidValue(Comparable)}. * </p> @@ -35,8 +35,8 @@ package com.vaadin.v7.data.validator; * @author Vaadin Ltd. * @since 7.0 */ -public class LegacyRangeValidator<T extends Comparable> - extends LegacyAbstractValidator<T> { +public class RangeValidator<T extends Comparable> + extends AbstractValidator<T> { private T minValue = null; private boolean minValueIncluded = true; @@ -56,7 +56,7 @@ public class LegacyRangeValidator<T extends Comparable> * @param maxValue * The maximum value that should be accepted or null for no limit */ - public LegacyRangeValidator(String errorMessage, Class<T> type, T minValue, + public RangeValidator(String errorMessage, Class<T> type, T minValue, T maxValue) { super(errorMessage); this.type = type; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java index 0649dd2f13..a9af0d0167 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyRegexpValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/RegexpValidator.java @@ -27,7 +27,7 @@ import java.util.regex.Pattern; * {@link java.util.regex.Pattern#sum} * </p> * <p> - * See {@link com.vaadin.v7.data.validator.LegacyAbstractStringValidator} + * See {@link com.vaadin.v7.data.validator.AbstractStringValidator} * for more information. * </p> * <p> @@ -40,7 +40,7 @@ import java.util.regex.Pattern; * @since 5.4 */ @SuppressWarnings("serial") -public class LegacyRegexpValidator extends LegacyAbstractStringValidator { +public class RegexpValidator extends AbstractStringValidator { private Pattern pattern; private boolean complete; @@ -55,7 +55,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. */ - public LegacyRegexpValidator(String regexp, String errorMessage) { + public RegexpValidator(String regexp, String errorMessage) { this(regexp, true, errorMessage); } @@ -71,7 +71,7 @@ public class LegacyRegexpValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. */ - public LegacyRegexpValidator(String regexp, boolean complete, + public RegexpValidator(String regexp, boolean complete, String errorMessage) { super(errorMessage); pattern = Pattern.compile(regexp); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ShortRangeValidator.java index e23575e4d9..2bf89cbca8 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyShortRangeValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/ShortRangeValidator.java @@ -22,7 +22,7 @@ package com.vaadin.v7.data.validator; * @since 7.4 */ @SuppressWarnings("serial") -public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> { +public class ShortRangeValidator extends RangeValidator<Short> { /** * Creates a validator for checking that an Short is within a given range. @@ -39,7 +39,7 @@ public class LegacyShortRangeValidator extends LegacyRangeValidator<Short> { * @param maxValue * The maximum value to accept or null for no limit */ - public LegacyShortRangeValidator(String errorMessage, Short minValue, + public ShortRangeValidator(String errorMessage, Short minValue, Short maxValue) { super(errorMessage, Short.class, minValue, maxValue); } diff --git a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/StringLengthValidator.java index 4bf7d430ba..dc863ab31a 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/data/validator/LegacyStringLengthValidator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/validator/StringLengthValidator.java @@ -24,7 +24,7 @@ package com.vaadin.v7.data.validator; * @since 3.0 */ @SuppressWarnings("serial") -public class LegacyStringLengthValidator extends LegacyAbstractStringValidator { +public class StringLengthValidator extends AbstractStringValidator { private Integer minLength = null; @@ -38,7 +38,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator { * @param errorMessage * the message to display in case the value does not validate. */ - public LegacyStringLengthValidator(String errorMessage) { + public StringLengthValidator(String errorMessage) { super(errorMessage); } @@ -60,7 +60,7 @@ public class LegacyStringLengthValidator extends LegacyAbstractStringValidator { * Are null strings permissible? This can be handled better by * setting a field as required or not. */ - public LegacyStringLengthValidator(String errorMessage, Integer minLength, + public StringLengthValidator(String errorMessage, Integer minLength, Integer maxLength, boolean allowNull) { this(errorMessage); setMinLength(minLength); diff --git a/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/DataGenerator.java index f7459a7dd3..ee71b587f9 100644 --- a/compatibility-server/src/main/java/com/vaadin/server/communication/data/DataGenerator.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/DataGenerator.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server.communication.data; +package com.vaadin.v7.server.communication.data; import java.io.Serializable; -import com.vaadin.data.Item; -import com.vaadin.ui.LegacyGrid.AbstractGridExtension; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.ui.Grid.AbstractGridExtension; import elemental.json.JsonObject; diff --git a/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java index 341c3f1a45..dce3eb1cfa 100644 --- a/compatibility-server/src/main/java/com/vaadin/server/communication/data/RpcDataProviderExtension.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/server/communication/data/RpcDataProviderExtension.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.server.communication.data; +package com.vaadin.v7.server.communication.data; import java.io.Serializable; import java.util.ArrayList; @@ -26,18 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Indexed; -import com.vaadin.data.Container.Indexed.ItemAddEvent; -import com.vaadin.data.Container.Indexed.ItemRemoveEvent; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Container.ItemSetChangeNotifier; -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.Property.ValueChangeNotifier; import com.vaadin.server.AbstractExtension; import com.vaadin.server.ClientConnector; import com.vaadin.server.KeyMapper; @@ -45,8 +33,20 @@ import com.vaadin.shared.data.DataProviderRpc; import com.vaadin.shared.data.DataRequestRpc; import com.vaadin.shared.ui.grid.GridState; import com.vaadin.shared.ui.grid.Range; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.Column; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Indexed; +import com.vaadin.v7.data.Container.Indexed.ItemAddEvent; +import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Container.ItemSetChangeNotifier; +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.Property.ValueChangeNotifier; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.Column; import elemental.json.Json; import elemental.json.JsonArray; @@ -151,7 +151,7 @@ public class RpcDataProviderExtension extends AbstractExtension { /** * A class to listen to changes in property values in the Container added - * with {@link LegacyGrid#setContainerDatasource(Container.Indexed)}, and notifies + * with {@link Grid#setContainerDatasource(Container.Indexed)}, and notifies * the data source to update the client-side representation of the modified * item. * <p> @@ -164,8 +164,8 @@ public class RpcDataProviderExtension extends AbstractExtension { * value changes, an instance of this class needs to be attached to each and * every Item's Property in the container. * - * @see LegacyGrid#addValueChangeListener(Container, Object, Object) - * @see LegacyGrid#valueChangeListeners + * @see Grid#addValueChangeListener(Container, Object, Object) + * @see Grid#valueChangeListeners */ private class GridValueChangeListener implements ValueChangeListener { private final Object itemId; @@ -408,14 +408,14 @@ public class RpcDataProviderExtension extends AbstractExtension { } /** - * Makes the data source available to the given {@link LegacyGrid} component. + * Makes the data source available to the given {@link Grid} component. * * @param component * the remote data grid component to extend * @param columnKeys * the key mapper for columns */ - public void extend(LegacyGrid component) { + public void extend(Grid component) { super.extend(component); } @@ -568,7 +568,7 @@ public class RpcDataProviderExtension extends AbstractExtension { .removeItemSetChangeListener(itemListener); } - } else if (!(parent instanceof LegacyGrid)) { + } else if (!(parent instanceof Grid)) { throw new IllegalStateException( "Grid is the only accepted parent type"); } @@ -626,7 +626,7 @@ public class RpcDataProviderExtension extends AbstractExtension { return activeItemHandler.keyMapper; } - protected LegacyGrid getGrid() { - return (LegacyGrid) getParent(); + protected Grid getGrid() { + return (Grid) getParent(); } } diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java index d7d12c6d03..da03136593 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractColorPicker.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractColorPicker.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.lang.reflect.Method; @@ -25,14 +25,16 @@ import org.jsoup.nodes.Element; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc; import com.vaadin.shared.ui.colorpicker.ColorPickerState; +import com.vaadin.ui.AbstractComponent; +import com.vaadin.ui.UI; import com.vaadin.ui.Window.CloseEvent; import com.vaadin.ui.Window.CloseListener; -import com.vaadin.ui.components.colorpicker.ColorChangeEvent; -import com.vaadin.ui.components.colorpicker.ColorChangeListener; -import com.vaadin.ui.components.colorpicker.ColorPickerPopup; -import com.vaadin.ui.components.colorpicker.ColorSelector; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.ui.components.colorpicker.ColorChangeEvent; +import com.vaadin.v7.ui.components.colorpicker.ColorChangeListener; +import com.vaadin.v7.ui.components.colorpicker.ColorPickerPopup; +import com.vaadin.v7.ui.components.colorpicker.ColorSelector; /** * An abstract class that defines default implementation for a color picker diff --git a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java index 5411a63c15..b7b241598b 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/AbstractSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.util.ArrayList; @@ -31,10 +31,6 @@ import java.util.Set; import org.jsoup.nodes.Element; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; @@ -51,21 +47,26 @@ import com.vaadin.server.VaadinSession; import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.ui.Component; +import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; import com.vaadin.ui.declarative.DesignFormatter; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.data.util.converter.LegacyConverterUtil; -import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.data.util.converter.ConverterUtil; /** * <p> * A class representing a selection of items the user has selected in a UI. The - * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a - * {@link com.vaadin.data.Container}. + * set of choices is presented as a set of {@link com.com.vaadin.v7.data.Item}s + * in a {@link com.com.vaadin.v7.data.Container}. * </p> * * <p> @@ -79,7 +80,7 @@ import com.vaadin.v7.ui.LegacyAbstractField; */ @SuppressWarnings("serial") // TODO currently cannot specify type more precisely in case of multi-select -public abstract class AbstractSelect extends LegacyAbstractField<Object> +public abstract class AbstractSelect extends AbstractField<Object> implements Container, Container.Viewer, Container.PropertySetChangeListener, Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier, @@ -643,7 +644,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Gets the selected item id or in multiselect mode a set of selected ids. * - * @see com.vaadin.v7.ui.LegacyAbstractField#getValue() + * @see com.vaadin.v7.ui.AbstractField#getValue() */ @Override public Object getValue() { @@ -683,7 +684,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * * @param newValue * the New selected item or collection of selected items. - * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object) + * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object) */ @Override public void setValue(Object newValue) throws Property.ReadOnlyException { @@ -710,13 +711,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * True if caller is sure that repaint is not needed. * @param ignoreReadOnly * True if read-only check should be omitted. - * @see com.vaadin.v7.ui.LegacyAbstractField#setValue(java.lang.Object, + * @see com.vaadin.v7.ui.AbstractField#setValue(java.lang.Object, * java.lang.Boolean) */ @Override protected void setValue(Object newFieldValue, boolean repaintIsNotNeeded, boolean ignoreReadOnly) - throws com.vaadin.data.Property.ReadOnlyException, + throws com.vaadin.v7.data.Property.ReadOnlyException, ConversionException, InvalidValueException { if (isMultiSelect()) { if (newFieldValue == null) { @@ -774,7 +775,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * * @param propertyId * the Id identifying the property. - * @see com.vaadin.data.Container#getType(java.lang.Object) + * @see com.com.vaadin.v7.data.Container#getType(java.lang.Object) */ @Override public Class<?> getType(Object propertyId) { @@ -814,7 +815,8 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * Gets the Property identified by the given itemId and propertyId from the * Container * - * @see com.vaadin.data.Container#getContainerProperty(Object, Object) + * @see com.com.vaadin.v7.data.Container#getContainerProperty(Object, + * Object) */ @Override public Property getContainerProperty(Object itemId, Object propertyId) { @@ -829,7 +831,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * returns false. * * @return True if the operation succeeded. - * @see com.vaadin.data.Container#addContainerProperty(java.lang.Object, + * @see com.com.vaadin.v7.data.Container#addContainerProperty(java.lang.Object, * java.lang.Class, java.lang.Object) */ @Override @@ -851,7 +853,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * returns false. * * @return True if the operation succeeded. - * @see com.vaadin.data.Container#removeAllItems() + * @see com.com.vaadin.v7.data.Container#removeAllItems() */ @Override public boolean removeAllItems() throws UnsupportedOperationException { @@ -873,7 +875,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * method. if the creation fails, null is returned. * * @return the Id of the created item or null in case of failure. - * @see com.vaadin.data.Container#addItem() + * @see com.com.vaadin.v7.data.Container#addItem() */ @Override public Object addItem() throws UnsupportedOperationException { @@ -898,7 +900,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * @param itemId * the Identification of the item to be created. * @return the Created item with the given id, or null in case of failure. - * @see com.vaadin.data.Container#addItem(java.lang.Object) + * @see com.com.vaadin.v7.data.Container#addItem(java.lang.Object) */ @Override public Item addItem(Object itemId) throws UnsupportedOperationException { @@ -1005,7 +1007,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * returns false. * * @return True if the operation succeeded. - * @see com.vaadin.data.Container#removeContainerProperty(java.lang.Object) + * @see com.com.vaadin.v7.data.Container#removeContainerProperty(java.lang.Object) */ @Override public boolean removeContainerProperty(Object propertyId) @@ -1026,7 +1028,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> * As a side-effect the fields value (selection) is set to null due old * selection not necessary exists in new Container. * - * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container) + * @see com.com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container) * * @param newDataSource * the new data source. @@ -1085,7 +1087,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Gets the viewing data-source container. * - * @see com.vaadin.data.Container.Viewer#getContainerDataSource() + * @see com.com.vaadin.v7.data.Container.Viewer#getContainerDataSource() */ @Override public Container getContainerDataSource() { @@ -1263,10 +1265,10 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> private String idToCaption(Object itemId) { try { - LegacyConverter<String, Object> c = (LegacyConverter<String, Object>) LegacyConverterUtil + Converter<String, Object> c = (Converter<String, Object>) ConverterUtil .getConverter(String.class, itemId.getClass(), getSession()); - return LegacyConverterUtil.convertFromModel(itemId, String.class, c, + return ConverterUtil.convertFromModel(itemId, String.class, c, getLocale()); } catch (Exception e) { return itemId.toString(); @@ -1563,7 +1565,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Notifies this listener that the Containers contents has changed. * - * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent) + * @see com.com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.com.vaadin.v7.data.Container.PropertySetChangeEvent) */ @Override public void containerPropertySetChange( @@ -1574,7 +1576,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Adds a new Property set change listener for this Container. * - * @see com.vaadin.data.Container.PropertySetChangeNotifier#addListener(com.vaadin.data.Container.PropertySetChangeListener) + * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener) */ @Override public void addPropertySetChangeListener( @@ -1587,7 +1589,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -1598,7 +1600,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Removes a previously registered Property set change listener. * - * @see com.vaadin.data.Container.PropertySetChangeNotifier#removeListener(com.vaadin.data.Container.PropertySetChangeListener) + * @see com.com.vaadin.v7.data.Container.PropertySetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener) */ @Override public void removePropertySetChangeListener( @@ -1613,7 +1615,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(com.com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -1624,7 +1626,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Adds an Item set change listener for the object. * - * @see com.vaadin.data.Container.ItemSetChangeNotifier#addListener(com.vaadin.data.Container.ItemSetChangeListener) + * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#addListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener) */ @Override public void addItemSetChangeListener( @@ -1637,7 +1639,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -1648,7 +1650,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Removes the Item set change listener from the object. * - * @see com.vaadin.data.Container.ItemSetChangeNotifier#removeListener(com.vaadin.data.Container.ItemSetChangeListener) + * @see com.com.vaadin.v7.data.Container.ItemSetChangeNotifier#removeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener) */ @Override public void removeItemSetChangeListener( @@ -1663,7 +1665,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(com.com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -1696,7 +1698,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Lets the listener know a Containers Item set has changed. * - * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent) + * @see com.com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.com.vaadin.v7.data.Container.ItemSetChangeEvent) */ @Override public void containerItemSetChange(Container.ItemSetChangeEvent event) { @@ -1753,7 +1755,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Gets the Property where the event occurred. * - * @see com.vaadin.data.Container.ItemSetChangeEvent#getContainer() + * @see com.com.vaadin.v7.data.Container.ItemSetChangeEvent#getContainer() */ @Override public Container getContainer() { @@ -1775,7 +1777,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Retrieves the Container whose contents have been modified. * - * @see com.vaadin.data.Container.PropertySetChangeEvent#getContainer() + * @see com.com.vaadin.v7.data.Container.PropertySetChangeEvent#getContainer() */ @Override public Container getContainer() { @@ -1874,7 +1876,7 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> /** * Notifies the component that it is connected to an application. * - * @see com.vaadin.v7.ui.LegacyAbstractField#attach() + * @see com.vaadin.v7.ui.AbstractField#attach() */ @Override public void attach() { @@ -1987,13 +1989,13 @@ public abstract class AbstractSelect extends LegacyAbstractField<Object> @Override public void valueChange( - com.vaadin.data.Property.ValueChangeEvent event) { + com.vaadin.v7.data.Property.ValueChangeEvent event) { markAsDirty(); } @Override public void itemPropertySetChange( - com.vaadin.data.Item.PropertySetChangeEvent event) { + com.vaadin.v7.data.Item.PropertySetChangeEvent event) { markAsDirty(); } diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java index 1a2c7ef716..5c6e0de421 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/Calendar.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Calendar.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.lang.reflect.Method; import java.text.DateFormat; @@ -41,8 +41,6 @@ import java.util.logging.Logger; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; -import com.vaadin.data.Container; -import com.vaadin.data.util.BeanItemContainer; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.dd.DropHandler; @@ -55,41 +53,45 @@ import com.vaadin.shared.ui.calendar.CalendarEventId; import com.vaadin.shared.ui.calendar.CalendarServerRpc; import com.vaadin.shared.ui.calendar.CalendarState; import com.vaadin.shared.ui.calendar.DateConstants; -import com.vaadin.ui.components.calendar.CalendarComponentEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardHandler; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler; -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.EventResize; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardHandler; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent; -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.CalendarDateRange; -import com.vaadin.ui.components.calendar.CalendarTargetDetails; -import com.vaadin.ui.components.calendar.ContainerEventProvider; -import com.vaadin.ui.components.calendar.event.BasicEventProvider; -import com.vaadin.ui.components.calendar.event.CalendarEditableEventProvider; -import com.vaadin.ui.components.calendar.event.CalendarEvent; -import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeEvent; -import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeListener; -import com.vaadin.ui.components.calendar.event.CalendarEventProvider; -import com.vaadin.ui.components.calendar.handler.BasicBackwardHandler; -import com.vaadin.ui.components.calendar.handler.BasicDateClickHandler; -import com.vaadin.ui.components.calendar.handler.BasicEventMoveHandler; -import com.vaadin.ui.components.calendar.handler.BasicEventResizeHandler; -import com.vaadin.ui.components.calendar.handler.BasicForwardHandler; -import com.vaadin.ui.components.calendar.handler.BasicWeekClickHandler; +import com.vaadin.ui.AbstractComponent; +import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.util.BeanItemContainer; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler; +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.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.EventResize; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent; +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.CalendarDateRange; +import com.vaadin.v7.ui.components.calendar.CalendarTargetDetails; +import com.vaadin.v7.ui.components.calendar.ContainerEventProvider; +import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider; +import com.vaadin.v7.ui.components.calendar.event.CalendarEditableEventProvider; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeEvent; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeListener; +import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; +import com.vaadin.v7.ui.components.calendar.handler.BasicBackwardHandler; +import com.vaadin.v7.ui.components.calendar.handler.BasicDateClickHandler; +import com.vaadin.v7.ui.components.calendar.handler.BasicEventMoveHandler; +import com.vaadin.v7.ui.components.calendar.handler.BasicEventResizeHandler; +import com.vaadin.v7.ui.components.calendar.handler.BasicForwardHandler; +import com.vaadin.v7.ui.components.calendar.handler.BasicWeekClickHandler; /** * <p> @@ -1521,7 +1523,7 @@ public class Calendar extends AbstractComponent * Use this method if you are adding a container which uses the default * property ids like {@link BeanItemContainer} for instance. If you are * using custom properties instead use - * {@link Calendar#setContainerDataSource(com.vaadin.data.Container.Indexed, Object, Object, Object, Object, Object)} + * {@link Calendar#setContainerDataSource(com.vaadin.v7.data.Container.Indexed, Object, Object, Object, Object, Object)} * * Please note that the container must be sorted by date! * diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPicker.java index 67002373d0..34b03a2447 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/ColorPicker.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPicker.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import com.vaadin.shared.ui.colorpicker.Color; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPickerArea.java index c4f3971259..624d567ec7 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/ColorPickerArea.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ColorPickerArea.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import com.vaadin.shared.ui.colorpicker.Color; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java index a78823d9a3..50b6ac505c 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/ComboBox.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.util.ArrayList; @@ -24,8 +24,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.vaadin.data.Container; -import com.vaadin.data.util.filter.SimpleStringFilter; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; @@ -38,6 +36,9 @@ import com.vaadin.server.Resource; import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; import com.vaadin.shared.ui.combobox.ComboBoxState; import com.vaadin.shared.ui.combobox.FilteringMode; +import com.vaadin.ui.Component; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; /** * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's @@ -794,7 +795,7 @@ public class ComboBox extends AbstractSelect * * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or * {@link TwinColSelect} instead - * @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean) + * @see com.vaadin.v7.ui.AbstractSelect#setMultiSelect(boolean) * @throws UnsupportedOperationException * if trying to activate multiselect mode */ @@ -813,7 +814,7 @@ public class ComboBox extends AbstractSelect * @deprecated As of 7.0, use {@link ListSelect}, {@link OptionGroup} or * {@link TwinColSelect} instead * - * @see com.vaadin.ui.AbstractSelect#isMultiSelect() + * @see com.vaadin.v7.ui.AbstractSelect#isMultiSelect() * * @return false */ diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java index 0d094c28bf..b02e7b87a4 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyDateField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java @@ -27,7 +27,6 @@ import java.util.logging.Logger; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; @@ -42,10 +41,11 @@ import com.vaadin.ui.Component; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.validator.LegacyDateRangeValidator; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.validator.DateRangeValidator; /** * <p> @@ -54,11 +54,11 @@ import com.vaadin.v7.data.validator.LegacyDateRangeValidator; * </p> * <p> * Since <code>DateField</code> extends <code>LegacyAbstractField</code> it - * implements the {@link com.vaadin.data.Buffered}interface. + * implements the {@link com.vaadin.v7.data.Buffered}interface. * </p> * <p> * A <code>DateField</code> is in write-through mode by default, so - * {@link com.vaadin.v7.ui.LegacyAbstractField#setWriteThrough(boolean)}must + * {@link com.vaadin.v7.ui.AbstractField#setWriteThrough(boolean)}must * be called to enable buffering. * </p> * @@ -66,7 +66,7 @@ import com.vaadin.v7.data.validator.LegacyDateRangeValidator; * @since 3.0 */ @SuppressWarnings("serial") -public class LegacyDateField extends LegacyAbstractField<Date> implements +public class DateField extends AbstractField<Date> implements FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, LegacyComponent { /** @@ -157,7 +157,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements private String dateOutOfRangeMessage = "Date is out of allowed range"; - private LegacyDateRangeValidator currentRangeValidator; + private DateRangeValidator currentRangeValidator; /** * Determines whether the ValueChangeEvent should be fired. Used to prevent @@ -180,7 +180,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements /** * Constructs an empty <code>DateField</code> with no caption. */ - public LegacyDateField() { + public DateField() { } /** @@ -189,7 +189,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * @param caption * the caption of the datefield. */ - public LegacyDateField(String caption) { + public DateField(String caption) { setCaption(caption); } @@ -202,7 +202,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * @param dataSource * the Property to be edited with this editor. */ - public LegacyDateField(String caption, Property dataSource) { + public DateField(String caption, Property dataSource) { this(dataSource); setCaption(caption); } @@ -214,7 +214,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * @param dataSource * the Property to be edited with this editor. */ - public LegacyDateField(Property dataSource) + public DateField(Property dataSource) throws IllegalArgumentException { if (!Date.class.isAssignableFrom(dataSource.getType())) { throw new IllegalArgumentException( @@ -229,7 +229,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * Constructs a new <code>DateField</code> with the given caption and * initial text contents. The editor constructed this way will not be bound * to a Property unless - * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)} + * {@link com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(Property)} * is called to bind it. * * @param caption @@ -237,7 +237,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * @param value * the Date value. */ - public LegacyDateField(String caption, Date value) { + public DateField(String caption, Date value) { setValue(value); setCaption(caption); } @@ -421,7 +421,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements currentRangeValidator = null; } if (getRangeStart() != null || getRangeEnd() != null) { - currentRangeValidator = new LegacyDateRangeValidator( + currentRangeValidator = new DateRangeValidator( dateOutOfRangeMessage, getRangeStart(resolution), getRangeEnd(resolution), null); addValidator(currentRangeValidator); @@ -555,7 +555,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * this case the invalid text remains in the DateField. */ markAsDirty(); - } catch (LegacyConverter.ConversionException e) { + } catch (Converter.ConversionException e) { /* * Datefield now contains some text that could't be parsed @@ -650,9 +650,9 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * to keep the old value and indicate an error */ protected Date handleUnparsableDateString(String dateString) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { currentParseErrorMessage = null; - throw new LegacyConverter.ConversionException(getParseErrorMessage()); + throw new Converter.ConversionException(getParseErrorMessage()); } /* Property features */ @@ -886,7 +886,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements * invalid if it contains text typed in by the user that couldn't be parsed * into a Date value. * - * @see com.vaadin.v7.ui.LegacyAbstractField#validate() + * @see com.vaadin.v7.ui.AbstractField#validate() */ @Override public void validate() throws InvalidValueException { @@ -980,7 +980,7 @@ public class LegacyDateField extends LegacyAbstractField<Date> implements .parse(design.attr("value"), Date.class); // formatting will return null if it cannot parse the string if (date == null) { - Logger.getLogger(LegacyDateField.class.getName()).info( + Logger.getLogger(DateField.class.getName()).info( "cannot parse " + design.attr("value") + " as date"); } this.setValue(date, false, true); diff --git a/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java index 2ee5ecf00e..53035ba087 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/DefaultFieldFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DefaultFieldFactory.java @@ -13,18 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.text.Normalizer.Form; import java.util.Date; -import com.vaadin.data.Container; -import com.vaadin.data.Property; import com.vaadin.shared.util.SharedUtil; -import com.vaadin.v7.ui.LegacyCheckBox; -import com.vaadin.v7.ui.LegacyDateField; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.ui.Component; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Property; /** * This class contains a basic implementation for {@link TableFieldFactory}. The @@ -53,12 +50,12 @@ public class DefaultFieldFactory implements TableFieldFactory { } @Override - public LegacyField createField(Container container, Object itemId, + public Field createField(Container container, Object itemId, Object propertyId, Component uiContext) { Property containerProperty = container.getContainerProperty(itemId, propertyId); Class<?> type = containerProperty.getType(); - LegacyField<?> field = createFieldByPropertyType(type); + Field<?> field = createFieldByPropertyType(type); field.setCaption(createCaptionByPropertyId(propertyId)); return field; } @@ -77,20 +74,20 @@ public class DefaultFieldFactory implements TableFieldFactory { /** * Creates fields based on the property type. * <p> - * The default field type is {@link LegacyTextField}. Other field types - * generated by this method: + * The default field type is {@link TextField}. Other field types generated + * by this method: * <p> * <b>Boolean</b>: {@link CheckBox}.<br/> - * <b>Date</b>: {@link LegacyDateField}(resolution: day).<br/> + * <b>Date</b>: {@link DateField}(resolution: day).<br/> * <b>Item</b>: {@link Form}. <br/> - * <b>default field type</b>: {@link LegacyTextField}. + * <b>default field type</b>: {@link TextField}. * <p> * * @param type * the type of the property - * @return the most suitable generic {@link LegacyField} for given type + * @return the most suitable generic {@link Field} for given type */ - public static LegacyField<?> createFieldByPropertyType(Class<?> type) { + public static Field<?> createFieldByPropertyType(Class<?> type) { // Null typed properties can not be edited if (type == null) { return null; @@ -98,17 +95,17 @@ public class DefaultFieldFactory implements TableFieldFactory { // Date field if (Date.class.isAssignableFrom(type)) { - final LegacyDateField df = new LegacyDateField(); - df.setResolution(LegacyDateField.RESOLUTION_DAY); + final DateField df = new DateField(); + df.setResolution(DateField.RESOLUTION_DAY); return df; } // Boolean field if (Boolean.class.isAssignableFrom(type)) { - return new LegacyCheckBox(); + return new CheckBox(); } - return new LegacyTextField(); + return new TextField(); } } diff --git a/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java index 9a98593b83..0a5e5b40a4 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/LegacyGrid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.lang.reflect.Method; @@ -42,24 +42,8 @@ import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Indexed; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Container.ItemSetChangeNotifier; -import com.vaadin.data.Container.PropertySetChangeEvent; -import com.vaadin.data.Container.PropertySetChangeListener; -import com.vaadin.data.Container.PropertySetChangeNotifier; -import com.vaadin.data.Container.Sortable; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.data.fieldgroup.FieldGroup.CommitException; -import com.vaadin.data.fieldgroup.FieldGroupFieldFactory; import com.vaadin.data.sort.Sort; import com.vaadin.data.sort.SortOrder; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.ContextClickEvent; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; @@ -78,8 +62,6 @@ import com.vaadin.server.Extension; import com.vaadin.server.JsonCodec; import com.vaadin.server.KeyMapper; import com.vaadin.server.VaadinSession; -import com.vaadin.server.communication.data.DataGenerator; -import com.vaadin.server.communication.data.RpcDataProviderExtension; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.data.sort.SortDirection; import com.vaadin.shared.ui.grid.EditorClientRpc; @@ -101,19 +83,40 @@ import com.vaadin.shared.ui.grid.selection.MultiSelectionModelState; import com.vaadin.shared.ui.grid.selection.SingleSelectionModelServerRpc; import com.vaadin.shared.ui.grid.selection.SingleSelectionModelState; import com.vaadin.shared.util.SharedUtil; +import com.vaadin.ui.AbstractFocusable; +import com.vaadin.ui.Component; +import com.vaadin.ui.ConnectorTracker; +import com.vaadin.ui.SelectiveRenderer; +import com.vaadin.ui.UI; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; import com.vaadin.ui.declarative.DesignFormatter; -import com.vaadin.ui.renderers.HtmlRenderer; -import com.vaadin.ui.renderers.Renderer; -import com.vaadin.ui.renderers.TextRenderer; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Indexed; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Container.ItemSetChangeNotifier; +import com.vaadin.v7.data.Container.PropertySetChangeEvent; +import com.vaadin.v7.data.Container.PropertySetChangeListener; +import com.vaadin.v7.data.Container.PropertySetChangeNotifier; +import com.vaadin.v7.data.Container.Sortable; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverterUtil; -import com.vaadin.v7.ui.LegacyCheckBox; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.data.fieldgroup.DefaultFieldGroupFieldFactory; +import com.vaadin.v7.data.fieldgroup.FieldGroup; +import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException; +import com.vaadin.v7.data.fieldgroup.FieldGroupFieldFactory; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ConverterUtil; +import com.vaadin.v7.server.communication.data.DataGenerator; +import com.vaadin.v7.server.communication.data.RpcDataProviderExtension; +import com.vaadin.v7.ui.renderers.HtmlRenderer; +import com.vaadin.v7.ui.renderers.Renderer; +import com.vaadin.v7.ui.renderers.TextRenderer; import elemental.json.Json; import elemental.json.JsonObject; @@ -134,7 +137,7 @@ import elemental.json.JsonValue; * <p> * Each column has its own {@link Renderer} that displays data into something * that can be displayed in the browser. That data is first converted with a - * {@link com.vaadin.v7.data.util.converter.LegacyConverter Converter} into + * {@link com.vaadin.v7.data.util.converter.Converter Converter} into * something that the Renderer can process. This can also be an implicit step - * if a column has a simple data type, like a String, no explicit assignment is * needed. @@ -181,7 +184,7 @@ import elemental.json.JsonValue; * @since 7.4 * @author Vaadin Ltd */ -public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, +public class Grid extends AbstractFocusable implements SelectionNotifier, SortNotifier, SelectiveRenderer, ItemClickNotifier { /** @@ -223,7 +226,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * <code>true</code> iff the event was triggered by an UI * interaction */ - public ColumnVisibilityChangeEvent(LegacyGrid source, Column column, + public ColumnVisibilityChangeEvent(Grid source, Column column, boolean hidden, boolean isUserOriginated) { super(source); this.column = column; @@ -335,11 +338,11 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, */ private final Set<Object> openDetails = new HashSet<>(); - public DetailComponentManager(LegacyGrid grid) { + public DetailComponentManager(Grid grid) { this(grid, DetailsGenerator.NULL); } - public DetailComponentManager(LegacyGrid grid, + public DetailComponentManager(Grid grid, DetailsGenerator detailsGenerator) { super(grid); setDetailsGenerator(detailsGenerator); @@ -349,7 +352,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * Creates a details component with the help of the user-defined * {@link DetailsGenerator}. * <p> - * This method attaches created components to the parent {@link LegacyGrid}. + * This method attaches created components to the parent {@link Grid}. * * @param itemId * the item id for which to create the details component. @@ -397,7 +400,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * Destroys a details component correctly. * <p> - * This method will detach the component from parent {@link LegacyGrid}. + * This method will detach the component from parent {@link Grid}. * * @param itemId * the item id for which to destroy the details component @@ -541,10 +544,10 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } @Override - protected <T extends LegacyField> T build(String caption, + protected <T extends Field> T build(String caption, Class<?> dataType, Class<T> fieldType) throws BindException { T field = super.build(caption, dataType, fieldType); - if (field instanceof LegacyCheckBox) { + if (field instanceof CheckBox) { field.setCaption(null); } return field; @@ -574,7 +577,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } @Override - public <T extends LegacyField> T createField(Class<?> type, + public <T extends Field> T createField(Class<?> type, Class<T> fieldType) { T f = super.createField(type, fieldType); if (f != null) { @@ -631,7 +634,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, private final Object propertyId; private final Section section; - public GridContextClickEvent(LegacyGrid source, + public GridContextClickEvent(Grid source, MouseEventDetails mouseEventDetails, Section section, int rowIndex, Object itemId, Object propertyId) { super(source, mouseEventDetails); @@ -672,7 +675,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * Returns the clicked row index relative to Grid section. In the body * of the Grid the index is the item index in the Container. Header and * Footer rows for index can be fetched with - * {@link LegacyGrid#getHeaderRow(int)} and {@link LegacyGrid#getFooterRow(int)}. + * {@link Grid#getHeaderRow(int)} and {@link Grid#getFooterRow(int)}. * * @return row index in section */ @@ -681,8 +684,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } @Override - public LegacyGrid getComponent() { - return (LegacyGrid) super.getComponent(); + public Grid getComponent() { + return (Grid) super.getComponent(); } } @@ -697,7 +700,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, private String userErrorMessage; - public CommitErrorEvent(LegacyGrid grid, CommitException cause) { + public CommitErrorEvent(Grid grid, CommitException cause) { super(grid); this.cause = cause; userErrorMessage = cause.getLocalizedMessage(); @@ -713,8 +716,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } @Override - public LegacyGrid getComponent() { - return (LegacyGrid) super.getComponent(); + public Grid getComponent() { + return (Grid) super.getComponent(); } /** @@ -800,7 +803,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * <code>true</code> if event is a result of user * interaction, <code>false</code> if from API call */ - public ColumnReorderEvent(LegacyGrid source, boolean userOriginated) { + public ColumnReorderEvent(Grid source, boolean userOriginated) { super(source); this.userOriginated = userOriginated; } @@ -852,7 +855,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * <code>true</code> if event is a result of user * interaction, <code>false</code> if from API call */ - public ColumnResizeEvent(LegacyGrid source, Column column, + public ColumnResizeEvent(Grid source, Column column, boolean userOriginated) { super(source); this.column = column; @@ -926,7 +929,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, private Object itemID; - protected EditorEvent(LegacyGrid source, Object itemID) { + protected EditorEvent(Grid source, Object itemID) { super(source); this.itemID = itemID; } @@ -945,7 +948,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, */ public static class EditorOpenEvent extends EditorEvent { - public EditorOpenEvent(LegacyGrid source, Object itemID) { + public EditorOpenEvent(Grid source, Object itemID) { super(source, itemID); } } @@ -956,7 +959,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, */ public static class EditorMoveEvent extends EditorEvent { - public EditorMoveEvent(LegacyGrid source, Object itemID) { + public EditorMoveEvent(Grid source, Object itemID) { super(source, itemID); } } @@ -967,7 +970,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, */ public static class EditorCloseEvent extends EditorEvent { - public EditorCloseEvent(LegacyGrid source, Object itemID) { + public EditorCloseEvent(Grid source, Object itemID) { super(source, itemID); } } @@ -980,17 +983,17 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, @Override public void commitError(CommitErrorEvent event) { - Map<LegacyField<?>, InvalidValueException> invalidFields = event + Map<Field<?>, InvalidValueException> invalidFields = event .getCause().getInvalidFields(); if (!invalidFields.isEmpty()) { Object firstErrorPropertyId = null; - LegacyField<?> firstErrorField = null; + Field<?> firstErrorField = null; FieldGroup fieldGroup = event.getCause().getFieldGroup(); for (Column column : getColumns()) { Object propertyId = column.getPropertyId(); - LegacyField<?> field = fieldGroup.getField(propertyId); + Field<?> field = fieldGroup.getField(propertyId); if (invalidFields.keySet().contains(field)) { event.addErrorColumn(column); @@ -1012,16 +1015,16 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, event.setUserErrorMessage(caption + ": " + message); } else { - com.vaadin.server.ErrorEvent.findErrorHandler(LegacyGrid.this).error( - new ConnectorErrorEvent(LegacyGrid.this, event.getCause())); + com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this).error( + new ConnectorErrorEvent(Grid.this, event.getCause())); } } private Object getFirstPropertyId(FieldGroup fieldGroup, - Set<LegacyField<?>> keySet) { + Set<Field<?>> keySet) { for (Column c : getColumns()) { Object propertyId = c.getPropertyId(); - LegacyField<?> f = fieldGroup.getField(propertyId); + Field<?> f = fieldGroup.getField(propertyId); if (keySet.contains(f)) { return propertyId; } @@ -1032,15 +1035,15 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * Selection modes representing built-in {@link SelectionModel - * SelectionModels} that come bundled with {@link LegacyGrid}. + * SelectionModels} that come bundled with {@link Grid}. * <p> * Passing one of these enums into - * {@link LegacyGrid#setSelectionMode(SelectionMode)} is equivalent to calling - * {@link LegacyGrid#setSelectionModel(SelectionModel)} with one of the built-in + * {@link Grid#setSelectionMode(SelectionMode)} is equivalent to calling + * {@link Grid#setSelectionModel(SelectionModel)} with one of the built-in * implementations of {@link SelectionModel}. * - * @see LegacyGrid#setSelectionMode(SelectionMode) - * @see LegacyGrid#setSelectionModel(SelectionModel) + * @see Grid#setSelectionMode(SelectionMode) + * @see Grid#setSelectionModel(SelectionModel) */ public enum SelectionMode { /** A SelectionMode that maps to {@link SingleSelectionModel} */ @@ -1093,7 +1096,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, Collection<Object> getSelectedRows(); /** - * Injects the current {@link LegacyGrid} instance into the SelectionModel. + * Injects the current {@link Grid} instance into the SelectionModel. * This method should usually call the extend method of * {@link AbstractExtension}. * <p> @@ -1104,7 +1107,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * <code>null</code> when a selection model is being detached * from a Grid. */ - void setGrid(LegacyGrid grid); + void setGrid(Grid grid); /** * Resets the SelectiomModel to an initial state. @@ -1352,7 +1355,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } @Override - public void setGrid(final LegacyGrid grid) { + public void setGrid(final Grid grid) { if (grid != null) { extend(grid); } @@ -1891,7 +1894,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * A data class which contains information which identifies a row in a - * {@link LegacyGrid}. + * {@link Grid}. * <p> * Since this class follows the <code>Flyweight</code>-pattern any instance * of this object is subject to change without the user knowing it and so @@ -1899,7 +1902,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * instances. */ public static class RowReference implements Serializable { - private final LegacyGrid grid; + private final Grid grid; private Object itemId; @@ -1909,7 +1912,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @param grid * the grid that the row belongs to */ - public RowReference(LegacyGrid grid) { + public RowReference(Grid grid) { this.grid = grid; } @@ -1928,7 +1931,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * * @return the grid that contains referenced row */ - public LegacyGrid getGrid() { + public Grid getGrid() { return grid; } @@ -1953,7 +1956,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * A data class which contains information which identifies a cell in a - * {@link LegacyGrid}. + * {@link Grid}. * <p> * Since this class follows the <code>Flyweight</code>-pattern any instance * of this object is subject to change without the user knowing it and so @@ -1984,7 +1987,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * * @return the grid that contains referenced cell */ - public LegacyGrid getGrid() { + public Grid getGrid() { return rowReference.getGrid(); } @@ -2033,7 +2036,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * A callback interface for generating custom style names for Grid rows. * - * @see LegacyGrid#setRowStyleGenerator(RowStyleGenerator) + * @see Grid#setRowStyleGenerator(RowStyleGenerator) */ public interface RowStyleGenerator extends Serializable { @@ -2051,7 +2054,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * A callback interface for generating custom style names for Grid cells. * - * @see LegacyGrid#setCellStyleGenerator(CellStyleGenerator) + * @see Grid#setCellStyleGenerator(CellStyleGenerator) */ public interface CellStyleGenerator extends Serializable { @@ -2072,7 +2075,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * the cells in the row for which a {@link CellDescriptionGenerator cell * description} is not generated. * - * @see LegacyGrid#setRowDescriptionGenerator + * @see Grid#setRowDescriptionGenerator * * @since 7.6 */ @@ -2096,7 +2099,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * Grid cells. If a cell has both a {@link RowDescriptionGenerator row * description} and a cell description, the latter has precedence. * - * @see LegacyGrid#setCellDescriptionGenerator(CellDescriptionGenerator) + * @see Grid#setCellDescriptionGenerator(CellDescriptionGenerator) * * @since 7.6 */ @@ -2129,7 +2132,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, @Override public void generateData(Object itemId, Item item, JsonObject rowData) { - RowReference row = new RowReference(LegacyGrid.this); + RowReference row = new RowReference(Grid.this); row.set(itemId); if (rowStyleGenerator != null) { @@ -2190,7 +2193,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, private void writeData(CellReference cell, JsonObject data) { Column column = getColumn(cell.getPropertyId()); - LegacyConverter<?, ?> converter = column.getConverter(); + Converter<?, ?> converter = column.getConverter(); Renderer<?> renderer = column.getRenderer(); Item item = cell.getItem(); @@ -2399,7 +2402,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, protected void writeDesign(Element trElement, DesignContext designContext) { Set<CELLTYPE> visited = new HashSet<>(); - for (LegacyGrid.Column column : section.grid.getColumns()) { + for (Grid.Column column : section.grid.getColumns()) { CELLTYPE cell = getCell(column.getPropertyId()); if (visited.contains(cell)) { continue; @@ -2686,7 +2689,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } } - protected LegacyGrid grid; + protected Grid grid; protected List<ROWTYPE> rows = new ArrayList<>(); /** @@ -2968,7 +2971,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, private HeaderRow defaultRow = null; private final GridStaticSectionState headerState = new GridStaticSectionState(); - protected Header(LegacyGrid grid) { + protected Header(Grid grid) { this.grid = grid; grid.getState(true).header = headerState; HeaderRow row = createRow(); @@ -3137,7 +3140,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, private final GridStaticSectionState footerState = new GridStaticSectionState(); - protected Footer(LegacyGrid grid) { + protected Footer(Grid grid) { this.grid = grid; grid.getState(true).footer = footerState; } @@ -3191,7 +3194,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * A column in the grid. Can be obtained by calling - * {@link LegacyGrid#getColumn(Object propertyId)}. + * {@link Grid#getColumn(Object propertyId)}. */ public static class Column implements Serializable { @@ -3203,19 +3206,19 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * The grid this column is associated with */ - private final LegacyGrid grid; + private final Grid grid; /** * Backing property for column */ private final Object propertyId; - private LegacyConverter<?, Object> converter; + private Converter<?, Object> converter; /** * A check for allowing the - * {@link #Column(LegacyGrid, GridColumnState, Object) constructor} to call - * {@link #setConverter(LegacyConverter)} with a <code>null</code>, even + * {@link #Column(Grid, GridColumnState, Object) constructor} to call + * {@link #setConverter(Converter)} with a <code>null</code>, even * if model and renderer aren't compatible. */ private boolean isFirstConverterAssignment = true; @@ -3230,7 +3233,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @param propertyId * the backing property id for this column */ - Column(LegacyGrid grid, GridColumnState state, Object propertyId) { + Column(Grid grid, GridColumnState state, Object propertyId) { this.grid = grid; this.state = state; this.propertyId = propertyId; @@ -3433,7 +3436,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * * @throws IllegalArgumentException * if the column is no longer attached to any grid - * @see LegacyGrid#setFrozenColumnCount(int) + * @see Grid#setFrozenColumnCount(int) */ public Column setLastFrozenColumn() { checkColumnIsAttached(); @@ -3457,8 +3460,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * if no compatible converter could be found * * @see VaadinSession#getConverterFactory() - * @see LegacyConverterUtil#getConverter(Class, Class, VaadinSession) - * @see #setConverter(LegacyConverter) + * @see ConverterUtil#getConverter(Class, Class, VaadinSession) + * @see #setConverter(Converter) */ public Column setRenderer(Renderer<?> renderer) { if (!internalSetRenderer(renderer)) { @@ -3486,7 +3489,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * if the renderer is already associated with a grid column */ public <T> Column setRenderer(Renderer<T> renderer, - LegacyConverter<? extends T, ?> converter) { + Converter<? extends T, ?> converter) { if (renderer.getParent() != null) { throw new IllegalArgumentException( "Cannot set a renderer that is already connected to a grid column (in " @@ -3515,7 +3518,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @throws IllegalArgumentException * if the types are not compatible */ - public Column setConverter(LegacyConverter<?, ?> converter) + public Column setConverter(Converter<?, ?> converter) throws IllegalArgumentException { Class<?> modelType = getModelType(); if (converter != null) { @@ -3566,7 +3569,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, isFirstConverterAssignment = false; @SuppressWarnings("unchecked") - LegacyConverter<?, Object> castConverter = (LegacyConverter<?, Object>) converter; + Converter<?, Object> castConverter = (Converter<?, Object>) converter; this.converter = castConverter; return this; @@ -3586,19 +3589,19 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * * @return the converter */ - public LegacyConverter<?, ?> getConverter() { + public Converter<?, ?> getConverter() { return converter; } private <T> boolean internalSetRenderer(Renderer<T> renderer) { - LegacyConverter<? extends T, ?> converter; + Converter<? extends T, ?> converter; if (isCompatibleWithProperty(renderer, getConverter())) { // Use the existing converter (possibly none) if types // compatible - converter = (LegacyConverter<? extends T, ?>) getConverter(); + converter = (Converter<? extends T, ?>) getConverter(); } else { - converter = LegacyConverterUtil.getConverter( + converter = ConverterUtil.getConverter( renderer.getPresentationType(), getModelType(), getSession()); } @@ -3612,7 +3615,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } private boolean isCompatibleWithProperty(Renderer<?> renderer, - LegacyConverter<?, ?> converter) { + Converter<?, ?> converter) { Class<?> type; if (converter == null) { type = getModelType(); @@ -3837,8 +3840,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @throws IllegalStateException * if the editor is currently active * - * @see LegacyGrid#editItem(Object) - * @see LegacyGrid#isEditorActive() + * @see Grid#editItem(Object) + * @see Grid#isEditorActive() */ public Column setEditable(boolean editable) { checkColumnIsAttached(); @@ -3858,7 +3861,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @return {@code true} if this column is editable, {@code false} * otherwise * - * @see LegacyGrid#editItem(Object) + * @see Grid#editItem(Object) * @see #setEditable(boolean) */ @@ -3880,7 +3883,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * the editor field * @return this column */ - public Column setEditorField(LegacyField<?> editor) { + public Column setEditorField(Field<?> editor) { grid.setEditorField(getPropertyId(), editor); return this; } @@ -3896,7 +3899,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * Getting a field before the editor has been opened depends on special * support from the {@link FieldGroup} in use. Using this method with a * user-provided <code>FieldGroup</code> might cause - * {@link com.vaadin.data.fieldgroup.FieldGroup.BindException + * {@link com.vaadin.v7.data.fieldgroup.FieldGroup.BindException * BindException} to be thrown. * * @return the bound field; or <code>null</code> if the respective @@ -3908,7 +3911,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * if no field has been configured and there is a problem * building or binding */ - public LegacyField<?> getEditorField() { + public Field<?> getEditorField() { return grid.getEditorField(getPropertyId()); } @@ -4115,7 +4118,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, /** * An abstract base class for server-side - * {@link com.vaadin.ui.renderers.Renderer Grid renderers}. This class + * {@link com.vaadin.v7.ui.renderers.Renderer Grid renderers}. This class * currently extends the AbstractExtension superclass, but this fact should * be regarded as an implementation detail and subject to change in a future * major or minor Vaadin revision. @@ -4146,8 +4149,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, */ @Deprecated @Override - protected Class<LegacyGrid> getSupportedParentType() { - return LegacyGrid.class; + protected Class<Grid> getSupportedParentType() { + return Grid.class; } /** @@ -4222,7 +4225,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @return an encoded value ready to be sent to the client */ public static <T> JsonValue encodeValue(Object modelValue, - Renderer<T> renderer, LegacyConverter<?, ?> converter, + Renderer<T> renderer, Converter<?, ?> converter, Locale locale) { Class<T> presentationType = renderer.getPresentationType(); T presentationValue; @@ -4237,7 +4240,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, // Class.cast(null) will always succeed presentationValue = (T) modelValue.toString(); } else { - throw new LegacyConverter.ConversionException( + throw new Converter.ConversionException( "Unable to convert value of type " + modelValue.getClass().getName() + " to presentation type " @@ -4249,7 +4252,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, assert presentationType .isAssignableFrom(converter.getPresentationType()); @SuppressWarnings("unchecked") - LegacyConverter<T, Object> safeConverter = (LegacyConverter<T, Object>) converter; + Converter<T, Object> safeConverter = (Converter<T, Object>) converter; presentationValue = safeConverter.convertToPresentation( modelValue, safeConverter.getPresentationType(), locale); @@ -4297,7 +4300,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @param grid * a grid instance */ - public AbstractGridExtension(LegacyGrid grid) { + public AbstractGridExtension(Grid grid) { super(); extend(grid); } @@ -4359,9 +4362,9 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @throws IllegalStateException * if parent is not Grid */ - protected LegacyGrid getParentGrid() { - if (getParent() instanceof LegacyGrid) { - LegacyGrid grid = (LegacyGrid) getParent(); + protected Grid getParentGrid() { + if (getParent() instanceof Grid) { + Grid grid = (Grid) getParent(); return grid; } else if (getParent() == null) { throw new IllegalStateException( @@ -4559,7 +4562,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * Creates a new Grid with a new {@link IndexedContainer} as the data * source. */ - public LegacyGrid() { + public Grid() { this(null, null); } @@ -4569,7 +4572,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @param dataSource * the indexed container to use as a data source */ - public LegacyGrid(final Container.Indexed dataSource) { + public Grid(final Container.Indexed dataSource) { this(null, dataSource); } @@ -4580,7 +4583,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @param caption * the caption of the grid */ - public LegacyGrid(String caption) { + public Grid(String caption) { this(caption, null); } @@ -4593,7 +4596,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * @param dataSource * the indexed container to use as a data source */ - public LegacyGrid(String caption, Container.Indexed dataSource) { + public Grid(String caption, Container.Indexed dataSource) { if (dataSource == null) { internalSetContainerDataSource(new IndexedContainer()); } else { @@ -4631,7 +4634,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, ConnectorTracker connectorTracker = getUI() .getConnectorTracker(); JsonObject diffState = connectorTracker - .getDiffState(LegacyGrid.this); + .getDiffState(Grid.this); diffState.remove("sortColumns"); diffState.remove("sortDirs"); markAsDirty(); @@ -4644,7 +4647,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, Object itemId = getKeyMapper().get(rowKey); Item item = datasource.getItem(itemId); Object propertyId = getPropertyIdByColumnId(columnId); - fireEvent(new ItemClickEvent(LegacyGrid.this, item, itemId, + fireEvent(new ItemClickEvent(Grid.this, item, itemId, propertyId, details)); } @@ -4654,7 +4657,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, final String diffStateKey = "columnOrder"; ConnectorTracker connectorTracker = getUI() .getConnectorTracker(); - JsonObject diffState = connectorTracker.getDiffState(LegacyGrid.this); + JsonObject diffState = connectorTracker.getDiffState(Grid.this); // discard the change if the columns have been reordered from // the server side, as the server side is always right if (getState(false).columnOrder.equals(oldColumnOrder)) { @@ -4701,7 +4704,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, ConnectorTracker connectorTracker = getUI() .getConnectorTracker(); JsonObject diffState = connectorTracker - .getDiffState(LegacyGrid.this); + .getDiffState(Grid.this); assert diffState .hasKey(diffStateKey) : "Field name has changed"; @@ -4734,7 +4737,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, if (rowKey != null) { itemId = getKeyMapper().get(rowKey); } - fireEvent(new GridContextClickEvent(LegacyGrid.this, details, section, + fireEvent(new GridContextClickEvent(Grid.this, details, section, rowIndex, itemId, getPropertyIdByColumnId(columnId))); } @@ -4806,7 +4809,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, success = true; } catch (CommitException e) { try { - CommitErrorEvent event = new CommitErrorEvent(LegacyGrid.this, + CommitErrorEvent event = new CommitErrorEvent(Grid.this, e); getEditorErrorHandler().commitError(event); @@ -4829,8 +4832,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } private void handleError(Exception e) { - com.vaadin.server.ErrorEvent.findErrorHandler(LegacyGrid.this) - .error(new ConnectorErrorEvent(LegacyGrid.this, e)); + com.vaadin.server.ErrorEvent.findErrorHandler(Grid.this) + .error(new ConnectorErrorEvent(Grid.this, e)); } }); } @@ -5154,9 +5157,9 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } /** - * Used internally by the {@link LegacyGrid} to get a {@link Column} by + * Used internally by the {@link Grid} to get a {@link Column} by * referencing its generated state id. Also used by {@link Column} to verify - * if it has been detached from the {@link LegacyGrid}. + * if it has been detached from the {@link Grid}. * * @param columnId * the client id generated for the column when the column is @@ -5169,7 +5172,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } /** - * Used internally by the {@link LegacyGrid} to get a property id by referencing + * Used internally by the {@link Grid} to get a property id by referencing * the columns generated state id. * * @param columnId @@ -6652,7 +6655,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } private static Logger getLogger() { - return Logger.getLogger(LegacyGrid.class.getName()); + return Logger.getLogger(Grid.class.getName()); } /** @@ -6746,14 +6749,14 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } } - private LegacyField<?> getEditorField(Object propertyId) { + private Field<?> getEditorField(Object propertyId) { checkColumnExists(propertyId); if (!getColumn(propertyId).isEditable()) { return null; } - LegacyField<?> editor = editorFieldGroup.getField(propertyId); + Field<?> editor = editorFieldGroup.getField(propertyId); try { if (editor == null) { @@ -6764,7 +6767,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, editor = editorFieldGroup.getField(propertyId); } - if (editor != null && editor.getParent() != LegacyGrid.this) { + if (editor != null && editor.getParent() != Grid.this) { assert editor.getParent() == null; editor.setParent(this); } @@ -6817,7 +6820,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, editorActive = true; // Must ensure that all fields, recursively, are sent to the client // This is needed because the fields are hidden using isRendered - for (LegacyField<?> f : getEditorFields()) { + for (Field<?> f : getEditorFields()) { f.markAsDirtyRecursive(); } @@ -6827,10 +6830,10 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, } } - private void setEditorField(Object propertyId, LegacyField<?> field) { + private void setEditorField(Object propertyId, Field<?> field) { checkColumnExists(propertyId); - LegacyField<?> oldField = editorFieldGroup.getField(propertyId); + Field<?> oldField = editorFieldGroup.getField(propertyId); if (oldField != null) { editorFieldGroup.unbind(oldField); oldField.setParent(null); @@ -6892,7 +6895,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, */ cancelEditor(); } - for (LegacyField<?> editor : getEditorFields()) { + for (Field<?> editor : getEditorFields()) { editor.setParent(null); } @@ -6909,8 +6912,8 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, * * @return a collection of all the fields bound to the item editor */ - Collection<LegacyField<?>> getEditorFields() { - Collection<LegacyField<?>> fields = editorFieldGroup.getFields(); + Collection<Field<?>> getEditorFields() { + Collection<Field<?>> fields = editorFieldGroup.getFields(); assert allAttached(fields); return fields; } @@ -7264,7 +7267,7 @@ public class LegacyGrid extends AbstractFocusable implements SelectionNotifier, super.writeDesign(design, context); Attributes attrs = design.attributes(); - LegacyGrid def = context.getDefaultInstance(this); + Grid def = context.getDefaultInstance(this); DesignAttributeHandler.writeAttribute("editable", attrs, isEditorEnabled(), def.isEditorEnabled(), boolean.class); diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java index 4e1ad7e997..1bec2bc61e 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyInlineDateField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/InlineDateField.java @@ -18,7 +18,7 @@ package com.vaadin.v7.ui; import java.util.Date; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Property; /** * <p> @@ -26,31 +26,31 @@ import com.vaadin.data.Property; * * </p> * - * @see LegacyDateField - * @see LegacyPopupDateField + * @see DateField + * @see PopupDateField * @author Vaadin Ltd. * @since 5.0 */ -public class LegacyInlineDateField extends LegacyDateField { +public class InlineDateField extends DateField { - public LegacyInlineDateField() { + public InlineDateField() { super(); } - public LegacyInlineDateField(Property dataSource) + public InlineDateField(Property dataSource) throws IllegalArgumentException { super(dataSource); } - public LegacyInlineDateField(String caption, Date value) { + public InlineDateField(String caption, Date value) { super(caption, value); } - public LegacyInlineDateField(String caption, Property dataSource) { + public InlineDateField(String caption, Property dataSource) { super(caption, dataSource); } - public LegacyInlineDateField(String caption) { + public InlineDateField(String caption) { super(caption); } diff --git a/compatibility-server/src/main/java/com/vaadin/ui/ListSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java index 9a720d1895..3b5683f55d 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/ListSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ListSelect.java @@ -14,13 +14,13 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Collection; -import com.vaadin.data.Container; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; +import com.vaadin.v7.data.Container; /** * This is a simple list select without, for instance, support for new items, diff --git a/compatibility-server/src/main/java/com/vaadin/ui/NativeSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java index 13556a0387..d68f184d43 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/NativeSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/NativeSelect.java @@ -14,17 +14,17 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Collection; -import com.vaadin.data.Container; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.v7.data.Container; /** * This is a simple drop-down select without, for instance, support for diff --git a/compatibility-server/src/main/java/com/vaadin/ui/OptionGroup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java index 3e491906d5..f4e3415cf5 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/OptionGroup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/OptionGroup.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Collection; import java.util.HashSet; @@ -23,7 +23,6 @@ import java.util.Set; import org.jsoup.nodes.Element; -import com.vaadin.data.Container; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; @@ -35,6 +34,7 @@ import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; import com.vaadin.shared.ui.optiongroup.OptionGroupState; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; +import com.vaadin.v7.data.Container; /** * Configures select to be used as an option group. diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java index c2470daf26..1ae0f79b30 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/LegacyPopupDateField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/PopupDateField.java @@ -18,10 +18,10 @@ package com.vaadin.v7.ui; import java.util.Date; -import com.vaadin.data.Property; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.datefield.PopupDateFieldState; +import com.vaadin.v7.data.Property; /** * <p> @@ -29,33 +29,33 @@ import com.vaadin.shared.ui.datefield.PopupDateFieldState; * * </p> * - * @see LegacyDateField - * @see LegacyInlineDateField + * @see DateField + * @see InlineDateField * @author Vaadin Ltd. * @since 5.0 */ -public class LegacyPopupDateField extends LegacyDateField { +public class PopupDateField extends DateField { private String inputPrompt = null; - public LegacyPopupDateField() { + public PopupDateField() { super(); } - public LegacyPopupDateField(Property dataSource) + public PopupDateField(Property dataSource) throws IllegalArgumentException { super(dataSource); } - public LegacyPopupDateField(String caption, Date value) { + public PopupDateField(String caption, Date value) { super(caption, value); } - public LegacyPopupDateField(String caption, Property dataSource) { + public PopupDateField(String caption, Property dataSource) { super(caption, dataSource); } - public LegacyPopupDateField(String caption) { + public PopupDateField(String caption) { super(caption); } diff --git a/compatibility-server/src/main/java/com/vaadin/ui/RichTextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java index e52db6d043..e7a790a2cc 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/RichTextArea.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/RichTextArea.java @@ -14,28 +14,27 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Map; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.textarea.RichTextAreaState; +import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignContext; -import com.vaadin.v7.ui.LegacyAbstractField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.Property; /** * A simple RichTextArea to edit HTML format text. * - * Note, that using {@link LegacyTextField#setMaxLength(int)} method in + * Note, that using {@link TextField#setMaxLength(int)} method in * {@link RichTextArea} may produce unexpected results as formatting is counted * into length of field. */ -public class RichTextArea extends LegacyAbstractField<String> +public class RichTextArea extends AbstractField<String> implements LegacyComponent { /** @@ -213,7 +212,7 @@ public class RichTextArea extends LegacyAbstractField<String> * </p> * * @return the String Textual representation for null strings. - * @see LegacyTextField#isNullSettingAllowed() + * @see TextField#isNullSettingAllowed() */ public String getNullRepresentation() { return nullRepresentation; @@ -237,7 +236,7 @@ public class RichTextArea extends LegacyAbstractField<String> * * @return boolean Should the null-string represenation be always converted * to null-values. - * @see LegacyTextField#getNullRepresentation() + * @see TextField#getNullRepresentation() */ public boolean isNullSettingAllowed() { return nullSettingAllowed; @@ -258,7 +257,7 @@ public class RichTextArea extends LegacyAbstractField<String> * * @param nullRepresentation * Textual representation for null strings. - * @see LegacyTextField#setNullSettingAllowed(boolean) + * @see TextField#setNullSettingAllowed(boolean) */ public void setNullRepresentation(String nullRepresentation) { this.nullRepresentation = nullRepresentation; @@ -283,7 +282,7 @@ public class RichTextArea extends LegacyAbstractField<String> * @param nullSettingAllowed * Should the null-string represenation be always converted to * null-values. - * @see LegacyTextField#getNullRepresentation() + * @see TextField#getNullRepresentation() */ public void setNullSettingAllowed(boolean nullSettingAllowed) { this.nullSettingAllowed = nullSettingAllowed; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Select.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java index 66b36f8ac2..2710287445 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/Select.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Select.java @@ -14,17 +14,17 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Collection; -import com.vaadin.data.Container; +import com.vaadin.v7.data.Container; /** * <p> * A class representing a selection of items the user has selected in a UI. The - * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a - * {@link com.vaadin.data.Container}. + * set of choices is presented as a set of {@link com.vaadin.v7.data.Item}s in a + * {@link com.vaadin.v7.data.Container}. * </p> * * <p> diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java index 13333146f2..760940a482 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/Table.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.lang.reflect.Method; @@ -37,11 +37,6 @@ import java.util.logging.Logger; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.ContainerOrderedWrapper; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ContextClickEvent; @@ -69,14 +64,22 @@ import com.vaadin.shared.ui.table.TableConstants.Section; import com.vaadin.shared.ui.table.TableServerRpc; import com.vaadin.shared.ui.table.TableState; import com.vaadin.shared.util.SharedUtil; +import com.vaadin.ui.Component; +import com.vaadin.ui.HasChildMeasurementHint; +import com.vaadin.ui.HasComponents; +import com.vaadin.ui.UniqueSerializable; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; import com.vaadin.ui.declarative.DesignFormatter; import com.vaadin.util.ReflectTools; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverterUtil; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.ContainerOrderedWrapper; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ConverterUtil; /** * <p> @@ -582,11 +585,11 @@ public class Table extends AbstractSelect implements Action.Container, private RowGenerator rowGenerator = null; - private final Map<LegacyField<?>, Property<?>> associatedProperties = new HashMap<LegacyField<?>, Property<?>>(); + private final Map<Field<?>, Property<?>> associatedProperties = new HashMap<Field<?>, Property<?>>(); private boolean painted = false; - private HashMap<Object, LegacyConverter<String, Object>> propertyValueConverters = new HashMap<Object, LegacyConverter<String, Object>>(); + private HashMap<Object, Converter<String, Object>> propertyValueConverters = new HashMap<Object, Converter<String, Object>>(); /** * Set to true if the client-side should be informed that the key mapper has @@ -2552,8 +2555,8 @@ public class Table extends AbstractSelect implements Action.Container, * Also remove property data sources to unregister listeners keeping the * fields in memory. */ - if (component instanceof LegacyField) { - LegacyField<?> field = (LegacyField<?>) component; + if (component instanceof Field) { + Field<?> field = (Field<?>) component; Property<?> associatedProperty = associatedProperties .remove(component); if (associatedProperty != null @@ -2777,7 +2780,7 @@ public class Table extends AbstractSelect implements Action.Container, .getContainerPropertyIds(); LinkedList<Object> retainableValueConverters = new LinkedList<Object>(); for (Object propertyId : newPropertyIds) { - LegacyConverter<String, ?> converter = getConverter(propertyId); + Converter<String, ?> converter = getConverter(propertyId); if (converter != null) { if (typeIsCompatible(converter.getModelType(), newDataSource.getType(propertyId))) { @@ -2941,7 +2944,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Invoked when the value of a variable has changed. * - * @see com.vaadin.ui.Select#changeVariables(java.lang.Object, + * @see com.vaadin.v7.ui.Select#changeVariables(java.lang.Object, * java.util.Map) */ @@ -4105,7 +4108,7 @@ public class Table extends AbstractSelect implements Action.Container, protected Object getPropertyValue(Object rowId, Object colId, Property property) { if (isEditable() && fieldFactory != null) { - final LegacyField<?> f = fieldFactory + final Field<?> f = fieldFactory .createField(getContainerDataSource(), rowId, colId, this); if (f != null) { // Remember that we have made this association so we can remove @@ -4132,7 +4135,7 @@ public class Table extends AbstractSelect implements Action.Container, * @since 6.7.3 */ protected void bindPropertyToField(Object rowId, Object colId, - Property property, LegacyField field) { + Property property, Field field) { // check if field has a property that is Viewer set. In that case we // expect developer has e.g. PropertyFormatter that he wishes to use and // assign the property to the Viewer instead. @@ -4164,12 +4167,12 @@ public class Table extends AbstractSelect implements Action.Container, if (property == null) { return ""; } - LegacyConverter<String, Object> converter = null; + Converter<String, Object> converter = null; if (hasConverter(colId)) { converter = getConverter(colId); } else { - converter = (LegacyConverter) LegacyConverterUtil.getConverter( + converter = (Converter) ConverterUtil.getConverter( String.class, property.getType(), getSession()); } Object value = property.getValue(); @@ -4254,7 +4257,7 @@ public class Table extends AbstractSelect implements Action.Container, * * Also listens changes in rendered items to refresh content area. * - * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) */ @Override @@ -4309,7 +4312,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes all Items from the Container. * - * @see com.vaadin.data.Container#removeAllItems() + * @see com.vaadin.v7.data.Container#removeAllItems() */ @Override @@ -4322,7 +4325,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes the Item identified by <code>ItemId</code> from the Container. * - * @see com.vaadin.data.Container#removeItem(Object) + * @see com.vaadin.v7.data.Container#removeItem(Object) */ @Override @@ -4342,7 +4345,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Removes a Property specified by the given Property ID from the Container. * - * @see com.vaadin.data.Container#removeContainerProperty(Object) + * @see com.vaadin.v7.data.Container#removeContainerProperty(Object) */ @Override @@ -4370,7 +4373,7 @@ public class Table extends AbstractSelect implements Action.Container, * the class of the property. * @param defaultValue * the default value given for all existing items. - * @see com.vaadin.data.Container#addContainerProperty(Object, Class, + * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class, * Object) */ @@ -4415,7 +4418,7 @@ public class Table extends AbstractSelect implements Action.Container, * the Alignment of the column. Null implies align left. * @throws UnsupportedOperationException * if the operation is not supported. - * @see com.vaadin.data.Container#addContainerProperty(Object, Class, + * @see com.vaadin.v7.data.Container#addContainerProperty(Object, Class, * Object) */ public boolean addContainerProperty(Object propertyId, Class<?> type, @@ -4527,7 +4530,7 @@ public class Table extends AbstractSelect implements Action.Container, * {@link #getPageLength()} may produce good enough estimates in some * situations. * - * @see com.vaadin.ui.Select#getVisibleItemIds() + * @see com.vaadin.v7.ui.Select#getVisibleItemIds() */ @Override @@ -4551,7 +4554,7 @@ public class Table extends AbstractSelect implements Action.Container, * Container datasource item set change. Table must flush its buffers on * change. * - * @see com.vaadin.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.data.Container.ItemSetChangeEvent) + * @see com.vaadin.v7.data.Container.ItemSetChangeListener#containerItemSetChange(com.vaadin.v7.data.Container.ItemSetChangeEvent) */ @Override @@ -4597,7 +4600,7 @@ public class Table extends AbstractSelect implements Action.Container, * Container datasource property set change. Table must flush its buffers on * change. * - * @see com.vaadin.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.data.Container.PropertySetChangeEvent) + * @see com.vaadin.v7.data.Container.PropertySetChangeListener#containerPropertySetChange(com.vaadin.v7.data.Container.PropertySetChangeEvent) */ @Override @@ -4645,7 +4648,7 @@ public class Table extends AbstractSelect implements Action.Container, * * @throws UnsupportedOperationException * if set to true. - * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean) + * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean) */ @Override @@ -4659,7 +4662,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the Item following the Item that corresponds to itemId. * - * @see com.vaadin.data.Container.Ordered#nextItemId(java.lang.Object) + * @see com.vaadin.v7.data.Container.Ordered#nextItemId(java.lang.Object) */ @Override @@ -4671,7 +4674,7 @@ public class Table extends AbstractSelect implements Action.Container, * Gets the ID of the Item preceding the Item that corresponds to the * itemId. * - * @see com.vaadin.data.Container.Ordered#prevItemId(java.lang.Object) + * @see com.vaadin.v7.data.Container.Ordered#prevItemId(java.lang.Object) */ @Override @@ -4682,7 +4685,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the first Item in the Container. * - * @see com.vaadin.data.Container.Ordered#firstItemId() + * @see com.vaadin.v7.data.Container.Ordered#firstItemId() */ @Override @@ -4693,7 +4696,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Gets the ID of the last Item in the Container. * - * @see com.vaadin.data.Container.Ordered#lastItemId() + * @see com.vaadin.v7.data.Container.Ordered#lastItemId() */ @Override @@ -4705,7 +4708,7 @@ public class Table extends AbstractSelect implements Action.Container, * Tests if the Item corresponding to the given Item ID is the first Item in * the Container. * - * @see com.vaadin.data.Container.Ordered#isFirstId(java.lang.Object) + * @see com.vaadin.v7.data.Container.Ordered#isFirstId(java.lang.Object) */ @Override @@ -4717,7 +4720,7 @@ public class Table extends AbstractSelect implements Action.Container, * Tests if the Item corresponding to the given Item ID is the last Item in * the Container. * - * @see com.vaadin.data.Container.Ordered#isLastId(java.lang.Object) + * @see com.vaadin.v7.data.Container.Ordered#isLastId(java.lang.Object) */ @Override @@ -4728,7 +4731,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Adds new item after the given item. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object) + * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object) */ @Override @@ -4745,7 +4748,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * Adds new item after the given item. * - * @see com.vaadin.data.Container.Ordered#addItemAfter(java.lang.Object, + * @see com.vaadin.v7.data.Container.Ordered#addItemAfter(java.lang.Object, * java.lang.Object) */ @@ -4801,7 +4804,7 @@ public class Table extends AbstractSelect implements Action.Container, * property to true. * * @return true if table is editable, false otherwise. - * @see LegacyField + * @see Field * @see FieldFactory * */ @@ -4821,7 +4824,7 @@ public class Table extends AbstractSelect implements Action.Container, * * @param editable * true if table should be editable by user. - * @see LegacyField + * @see Field * @see FieldFactory * */ @@ -4838,7 +4841,7 @@ public class Table extends AbstractSelect implements Action.Container, * @throws UnsupportedOperationException * if the container data source does not implement * Container.Sortable - * @see com.vaadin.data.Container.Sortable#sort(java.lang.Object[], + * @see com.vaadin.v7.data.Container.Sortable#sort(java.lang.Object[], * boolean[]) * */ @@ -4893,7 +4896,7 @@ public class Table extends AbstractSelect implements Action.Container, * collection. * </p> * - * @see com.vaadin.data.Container.Sortable#getSortableContainerPropertyIds() + * @see com.vaadin.v7.data.Container.Sortable#getSortableContainerPropertyIds() */ @Override @@ -6077,7 +6080,7 @@ public class Table extends AbstractSelect implements Action.Container, * The converter to use for the property id */ public void setConverter(Object propertyId, - LegacyConverter<String, ?> converter) { + Converter<String, ?> converter) { if (!getContainerPropertyIds().contains(propertyId)) { throw new IllegalArgumentException( "PropertyId " + propertyId + " must be in the container"); @@ -6090,7 +6093,7 @@ public class Table extends AbstractSelect implements Action.Container, + converter.getModelType() + ")"); } propertyValueConverters.put(propertyId, - (LegacyConverter<String, Object>) converter); + (Converter<String, Object>) converter); refreshRowCache(); } @@ -6114,7 +6117,7 @@ public class Table extends AbstractSelect implements Action.Container, * @return The converter used to format the propertyId or null if no * converter has been set */ - public LegacyConverter<String, Object> getConverter(Object propertyId) { + public Converter<String, Object> getConverter(Object propertyId) { return propertyValueConverters.get(propertyId); } diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java index 54f8bc5110..1ed286738d 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/TableFieldFactory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TableFieldFactory.java @@ -13,18 +13,18 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; -import com.vaadin.data.Container; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.ui.Component; +import com.vaadin.v7.data.Container; /** * Factory interface for creating new LegacyField-instances based on Container * (datasource), item id, property id and uiContext (the component responsible * for displaying fields). Currently this interface is used by {@link Table}, - * but might later be used by some other components for {@link LegacyField} + * but might later be used by some other components for {@link Field} * generation. * * <p> @@ -50,7 +50,7 @@ public interface TableFieldFactory extends Serializable { * @return A field suitable for editing the specified data or null if the * property should not be editable. */ - LegacyField<?> createField(Container container, Object itemId, + Field<?> createField(Container container, Object itemId, Object propertyId, Component uiContext); } diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TextArea.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java index 056667a696..e4cd20a59b 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/TextArea.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextArea.java @@ -14,20 +14,19 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.shared.ui.textarea.TextAreaState; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; -import com.vaadin.v7.ui.LegacyAbstractTextField; +import com.vaadin.v7.data.Property; /** * A text field that supports multi line editing. */ -public class TextArea extends LegacyAbstractTextField { +public class TextArea extends AbstractTextField { /** * Constructs an empty TextArea. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java index 5da499f94e..83f805ffb4 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/Tree.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.lang.reflect.Method; @@ -32,10 +32,6 @@ import java.util.StringTokenizer; import org.jsoup.nodes.Element; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.util.ContainerHierarchicalWrapper; -import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ContextClickEvent; @@ -62,10 +58,15 @@ import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.shared.ui.tree.TreeServerRpc; import com.vaadin.shared.ui.tree.TreeState; +import com.vaadin.ui.Component; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.ContainerHierarchicalWrapper; +import com.vaadin.v7.data.util.HierarchicalContainer; /** * Tree component. A Tree can be used to select an item (or multiple items) from @@ -857,7 +858,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item with given ID can have any children. * - * @see com.vaadin.data.Container.Hierarchical#areChildrenAllowed(Object) + * @see com.vaadin.v7.data.Container.Hierarchical#areChildrenAllowed(Object) */ @Override public boolean areChildrenAllowed(Object itemId) { @@ -867,7 +868,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the IDs of all Items that are children of the specified Item. * - * @see com.vaadin.data.Container.Hierarchical#getChildren(Object) + * @see com.vaadin.v7.data.Container.Hierarchical#getChildren(Object) */ @Override public Collection<?> getChildren(Object itemId) { @@ -877,7 +878,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the ID of the parent Item of the specified Item. * - * @see com.vaadin.data.Container.Hierarchical#getParent(Object) + * @see com.vaadin.v7.data.Container.Hierarchical#getParent(Object) */ @Override public Object getParent(Object itemId) { @@ -887,7 +888,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item specified with <code>itemId</code> has child Items. * - * @see com.vaadin.data.Container.Hierarchical#hasChildren(Object) + * @see com.vaadin.v7.data.Container.Hierarchical#hasChildren(Object) */ @Override public boolean hasChildren(Object itemId) { @@ -897,7 +898,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tests if the Item specified with <code>itemId</code> is a root Item. * - * @see com.vaadin.data.Container.Hierarchical#isRoot(Object) + * @see com.vaadin.v7.data.Container.Hierarchical#isRoot(Object) */ @Override public boolean isRoot(Object itemId) { @@ -907,7 +908,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the IDs of all Items in the container that don't have a parent. * - * @see com.vaadin.data.Container.Hierarchical#rootItemIds() + * @see com.vaadin.v7.data.Container.Hierarchical#rootItemIds() */ @Override public Collection<?> rootItemIds() { @@ -917,7 +918,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Sets the given Item's capability to have children. * - * @see com.vaadin.data.Container.Hierarchical#setChildrenAllowed(Object, + * @see com.vaadin.v7.data.Container.Hierarchical#setChildrenAllowed(Object, * boolean) */ @Override @@ -952,7 +953,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Sets the Container that serves as the data source of the viewer. * - * @see com.vaadin.data.Container.Viewer#setContainerDataSource(Container) + * @see com.vaadin.v7.data.Container.Viewer#setContainerDataSource(Container) */ @Override public void setContainerDataSource(Container newDataSource) { @@ -988,7 +989,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, @Override public void containerItemSetChange( - com.vaadin.data.Container.ItemSetChangeEvent event) { + com.vaadin.v7.data.Container.ItemSetChangeEvent event) { super.containerItemSetChange(event); if (getContainerDataSource() instanceof Filterable) { boolean hasFilters = !((Filterable) getContainerDataSource()) @@ -1283,7 +1284,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Gets the visible item ids. * - * @see com.vaadin.ui.Select#getVisibleItemIds() + * @see com.vaadin.v7.ui.Select#getVisibleItemIds() */ @Override public Collection<?> getVisibleItemIds() { @@ -1327,7 +1328,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, /** * Tree does not support <code>setNullSelectionItemId</code>. * - * @see com.vaadin.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object) + * @see com.vaadin.v7.ui.AbstractSelect#setNullSelectionItemId(java.lang.Object) */ @Override public void setNullSelectionItemId(Object nullSelectionItemId) @@ -1343,7 +1344,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * * @throws UnsupportedOperationException * if set to true. - * @see com.vaadin.ui.Select#setNewItemsAllowed(boolean) + * @see com.vaadin.v7.ui.Select#setNewItemsAllowed(boolean) */ @Override public void setNewItemsAllowed(boolean allowNewOptions) diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java index 2e69a0071d..446c9c271c 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/TreeTable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TreeTable.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.util.ArrayList; @@ -30,25 +30,25 @@ import java.util.logging.Logger; import org.jsoup.nodes.Element; -import com.vaadin.data.Collapsible; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Hierarchical; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.util.ContainerHierarchicalWrapper; -import com.vaadin.data.util.HierarchicalContainer; -import com.vaadin.data.util.HierarchicalContainerOrderedWrapper; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; import com.vaadin.shared.ui.treetable.TreeTableConstants; import com.vaadin.shared.ui.treetable.TreeTableState; -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.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; +import com.vaadin.v7.data.Collapsible; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Hierarchical; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.util.ContainerHierarchicalWrapper; +import com.vaadin.v7.data.util.HierarchicalContainer; +import com.vaadin.v7.data.util.HierarchicalContainerOrderedWrapper; +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; /** * TreeTable extends the {@link Table} component so that it can also visualize a @@ -624,7 +624,7 @@ public class TreeTable extends Table implements Hierarchical { @Override public void containerItemSetChange( - com.vaadin.data.Container.ItemSetChangeEvent event) { + com.vaadin.v7.data.Container.ItemSetChangeEvent event) { // Can't do partial repaints if items are added or removed during the // expand/collapse request toggledItemId = null; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java index 261d813ffa..68853ddaa1 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/TwinColSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TwinColSelect.java @@ -14,15 +14,15 @@ * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Collection; -import com.vaadin.data.Container; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; import com.vaadin.shared.ui.twincolselect.TwinColSelectState; +import com.vaadin.v7.data.Container; /** * Multiselect component with two lists: left side for available items and right diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java index f007f0cf34..230d87b7f7 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvent.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar; +package com.vaadin.v7.ui.components.calendar; -import com.vaadin.ui.Calendar; import com.vaadin.ui.Component; +import com.vaadin.v7.ui.Calendar; /** * All Calendar events extends this class. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java index 2c4fec95d4..14494eedbe 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvents.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarComponentEvents.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar; +package com.vaadin.v7.ui.components.calendar; import java.io.Serializable; import java.lang.reflect.Method; @@ -21,9 +21,9 @@ import java.util.Date; import java.util.EventListener; import com.vaadin.shared.ui.calendar.CalendarEventId; -import com.vaadin.ui.Calendar; -import com.vaadin.ui.components.calendar.event.CalendarEvent; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.ui.Calendar; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; /** * Interface for all Vaadin Calendar events. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java index 09d6c80a7f..69a4123c1b 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarDateRange.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarDateRange.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar; +package com.vaadin.v7.ui.components.calendar; import java.io.Serializable; import java.util.Date; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java index 3b71ab5a00..f9f4100e53 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/CalendarTargetDetails.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/CalendarTargetDetails.java @@ -13,17 +13,17 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar; +package com.vaadin.v7.ui.components.calendar; import java.util.Date; import java.util.Map; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.TargetDetailsImpl; -import com.vaadin.ui.Calendar; +import com.vaadin.v7.ui.Calendar; /** - * Drop details for {@link com.vaadin.ui.addon.calendar.ui.Calendar Calendar}. + * Drop details for {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar Calendar}. * When something is dropped on the Calendar, this class contains the specific * details of the drop point. Specifically, this class gives access to the date * where the drop happened. If the Calendar was in weekly mode, the date also @@ -71,7 +71,7 @@ public class CalendarTargetDetails extends TargetDetailsImpl { } /** - * @return the {@link com.vaadin.ui.addon.calendar.ui.Calendar Calendar} + * @return the {@link com.vaadin.v7.ui.addon.calendar.ui.Calendar Calendar} * instance which was the target of the drop */ public Calendar getTargetCalendar() { diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java index b0a6aaa95a..961b2d8fec 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/ContainerEventProvider.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/ContainerEventProvider.java @@ -13,32 +13,32 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar; +package com.vaadin.v7.ui.components.calendar; import java.util.Collections; import java.util.Date; import java.util.LinkedList; import java.util.List; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Indexed; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.Container.ItemSetChangeNotifier; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeNotifier; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize; -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.CalendarEditableEventProvider; -import com.vaadin.ui.components.calendar.event.CalendarEvent; -import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeListener; -import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier; -import com.vaadin.ui.components.calendar.event.CalendarEventProvider; -import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Indexed; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.Container.ItemSetChangeNotifier; +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.ValueChangeNotifier; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize; +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.CalendarEditableEventProvider; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeListener; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotifier; +import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; +import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier; /** * A event provider which uses a {@link Container} as a datasource. Container diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java index e2a580085a..f1b6524d2c 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEvent.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.event; +package com.vaadin.v7.ui.components.calendar.event; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeNotifier; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeNotifier; /** * Simple implementation of {@link com.vaadin.addon.calendar.event.CalendarEvent diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java index fbf197d3eb..59c8baca9c 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/BasicEventProvider.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/BasicEventProvider.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.event; +package com.vaadin.v7.ui.components.calendar.event; import java.util.ArrayList; import java.util.Date; import java.util.List; -import com.vaadin.ui.components.calendar.event.CalendarEvent.EventChangeEvent; -import com.vaadin.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent.EventChangeEvent; +import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider.EventSetChangeNotifier; /** * <p> diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java index aaa76418a6..90f8992720 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEditableEventProvider.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEditableEventProvider.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.ui.components.calendar.event; +package com.vaadin.v7.ui.components.calendar.event; /** * An event provider which allows adding and removing events diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java index b4195cf0b1..9aaa1cd5ba 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEvent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.event; +package com.vaadin.v7.ui.components.calendar.event; import java.io.Serializable; import java.util.Date; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java index 1d4fabed5a..bef6aaea18 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/CalendarEventProvider.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/CalendarEventProvider.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.event; +package com.vaadin.v7.ui.components.calendar.event; import java.io.Serializable; import java.util.Date; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java index 5a44cae4ac..cb3553ec87 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/event/EditableCalendarEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/event/EditableCalendarEvent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.event; +package com.vaadin.v7.ui.components.calendar.event; import java.util.Date; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java index 61f738fcd0..956db6b179 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicBackwardHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicBackwardHandler.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.handler; +package com.vaadin.v7.ui.components.calendar.handler; import java.util.Calendar; import java.util.Date; import com.vaadin.shared.ui.calendar.DateConstants; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.BackwardHandler; /** * Implements basic functionality needed to enable backwards navigation. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java index 0107e10e3d..381acb6b1d 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicDateClickHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicDateClickHandler.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.handler; +package com.vaadin.v7.ui.components.calendar.handler; import java.util.Calendar; import java.util.Date; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickHandler; /** * Implements basic functionality needed to switch to day view when a single day diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java index 60f0016312..be27b606fe 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventMoveHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventMoveHandler.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.handler; +package com.vaadin.v7.ui.components.calendar.handler; import java.util.Date; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventMoveHandler; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent; -import com.vaadin.ui.components.calendar.event.CalendarEvent; -import com.vaadin.ui.components.calendar.event.EditableCalendarEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventMoveHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; +import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent; /** * Implements basic functionality needed to enable moving events. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java index 51e4bc1cbc..9b6f08ff09 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicEventResizeHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicEventResizeHandler.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.handler; +package com.vaadin.v7.ui.components.calendar.handler; import java.util.Date; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResizeHandler; -import com.vaadin.ui.components.calendar.event.CalendarEvent; -import com.vaadin.ui.components.calendar.event.EditableCalendarEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResizeHandler; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; +import com.vaadin.v7.ui.components.calendar.event.EditableCalendarEvent; /** * Implements basic functionality needed to enable event resizing. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java index 6cdc00bee2..d71958536e 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicForwardHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicForwardHandler.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.handler; +package com.vaadin.v7.ui.components.calendar.handler; import java.util.Calendar; import java.util.Date; import com.vaadin.shared.ui.calendar.DateConstants; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardHandler; /** * Implements basic functionality needed to enable forward navigation. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java index 128c6abfbd..420d0a76f6 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/calendar/handler/BasicWeekClickHandler.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/calendar/handler/BasicWeekClickHandler.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.calendar.handler; +package com.vaadin.v7.ui.components.calendar.handler; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClickHandler; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClickHandler; /** * Implements basic functionality needed to change to week view when a week diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeEvent.java index aa703deb19..da0b435ddc 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeEvent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.ui.Component; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeListener.java index b234dc3d5d..87f0046242 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeListener.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorChangeListener.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.io.Serializable; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java index 23748a967a..cb9dd698d9 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGradient.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.lang.reflect.Method; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.shared.ui.colorpicker.ColorPickerGradientServerRpc; import com.vaadin.shared.ui.colorpicker.ColorPickerGradientState; -import com.vaadin.ui.AbstractColorPicker.Coordinates2Color; import com.vaadin.ui.AbstractComponent; +import com.vaadin.v7.ui.AbstractColorPicker.Coordinates2Color; /** * A component that represents a color gradient within a color picker. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java index 9e5580c719..a1286dbc58 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerGrid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerGrid.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.awt.Point; import java.lang.reflect.Method; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java index 1173faf152..e26e802a32 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerHistory.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerHistory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java index dbf3b18bf3..39931ce570 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPopup.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPopup.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.lang.reflect.Method; import java.util.ArrayList; @@ -27,7 +27,6 @@ import java.util.logging.Logger; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.colorpicker.Color; -import com.vaadin.ui.AbstractColorPicker.Coordinates2Color; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -40,6 +39,7 @@ import com.vaadin.ui.Slider.ValueOutOfBoundsException; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; +import com.vaadin.v7.ui.AbstractColorPicker.Coordinates2Color; /** * A component that represents color selection popup within a color picker. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java index dc133ce156..2a5b7c456f 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerPreview.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerPreview.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.lang.reflect.Method; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; -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; /** * A component that represents color selection preview within a color picker. @@ -51,7 +51,7 @@ public class ColorPickerPreview extends CssLayout private Color color; /** The field. */ - private final LegacyTextField field; + private final TextField field; /** The old value. */ private String oldValue; @@ -59,7 +59,7 @@ public class ColorPickerPreview extends CssLayout private ColorPickerPreview() { setStyleName("v-colorpicker-preview"); setImmediate(true); - field = new LegacyTextField(); + field = new TextField(); field.setImmediate(true); field.setSizeFull(); field.setStyleName("v-colorpicker-preview-textfield"); diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerSelect.java index ae3dee4069..87156b34db 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorPickerSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorPickerSelect.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.shared.ui.colorpicker.Color; -import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; 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; /** * A component that represents color selection swatches within a color picker. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorSelector.java index d9264745a8..a4da97c46b 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/ColorSelector.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/ColorSelector.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.io.Serializable; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/HasColorChangeListener.java index 7980111e2b..ed416c1ebe 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/components/colorpicker/HasColorChangeListener.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/components/colorpicker/HasColorChangeListener.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.components.colorpicker; +package com.vaadin.v7.ui.components.colorpicker; import java.io.Serializable; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java index ac9ffb0eeb..2d0ac7f62e 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/AbstractJavaScriptRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/AbstractJavaScriptRenderer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; import com.vaadin.server.AbstractJavaScriptExtension; import com.vaadin.server.JavaScriptCallbackHelper; @@ -21,7 +21,7 @@ import com.vaadin.server.JsonCodec; import com.vaadin.shared.JavaScriptExtensionState; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.ui.JavaScriptFunction; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.AbstractRenderer; import elemental.json.Json; import elemental.json.JsonValue; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java index 3d7d5ab9d2..906fc025bb 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ButtonRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ButtonRenderer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; /** * A Renderer that displays a button with a textual caption. The value of the diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java index d8fcdc3b4e..a1f48a99c4 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ClickableRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ClickableRenderer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; import java.lang.reflect.Method; @@ -21,10 +21,10 @@ import com.vaadin.event.ConnectorEventListener; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.grid.renderers.RendererClickRpc; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; -import com.vaadin.ui.LegacyGrid.Column; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.Column; /** * An abstract superclass for Renderers that render clickable items. Click @@ -67,7 +67,7 @@ public class ClickableRenderer<T> extends AbstractRenderer<T> { private Object itemId; private Column column; - protected RendererClickEvent(LegacyGrid source, Object itemId, Column column, + protected RendererClickEvent(Grid source, Object itemId, Column column, MouseEventDetails mouseEventDetails) { super(source, mouseEventDetails); this.itemId = itemId; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java index eea18e7445..ac3b831acc 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/DateRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/DateRenderer.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; import java.text.DateFormat; import java.util.Date; import java.util.Locale; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.AbstractRenderer; import elemental.json.JsonValue; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java index 85d7801c41..5264f19e0b 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/HtmlRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/HtmlRenderer.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.AbstractRenderer; /** * A renderer for presenting HTML content. diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java index 56e319b47d..19c7a77b01 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ImageRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ImageRenderer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; import com.vaadin.server.ExternalResource; import com.vaadin.server.Resource; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java index e54eecc6ef..061f6d5790 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/NumberRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/NumberRenderer.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; import java.text.NumberFormat; import java.util.Locale; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.AbstractRenderer; import elemental.json.JsonValue; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java index fe90dfdee0..d19c09ec59 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/ProgressBarRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/ProgressBarRenderer.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.AbstractRenderer; import elemental.json.JsonValue; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java index d42e299ea8..ce221760cc 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/Renderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/Renderer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; import com.vaadin.server.ClientConnector; import com.vaadin.server.Extension; diff --git a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java index 799e67b9e7..23306baf75 100644 --- a/compatibility-server/src/main/java/com/vaadin/ui/renderers/TextRenderer.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/renderers/TextRenderer.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui.renderers; +package com.vaadin.v7.ui.renderers; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.AbstractRenderer; /** * A renderer for presenting simple plain-text string values. diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java b/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java deleted file mode 100644 index 9c3f6c0eaa..0000000000 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/AllTests.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.vaadin.data.util.sqlcontainer; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.junit.runners.Suite.SuiteClasses; - -import com.vaadin.data.util.sqlcontainer.connection.J2EEConnectionPoolTest; -import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPoolTest; -import com.vaadin.data.util.sqlcontainer.filters.BetweenTest; -import com.vaadin.data.util.sqlcontainer.filters.LikeTest; -import com.vaadin.data.util.sqlcontainer.generator.SQLGeneratorsTest; -import com.vaadin.data.util.sqlcontainer.query.FreeformQueryTest; -import com.vaadin.data.util.sqlcontainer.query.QueryBuilderTest; -import com.vaadin.data.util.sqlcontainer.query.TableQueryTest; - -@RunWith(Suite.class) -@SuiteClasses({ SimpleJDBCConnectionPoolTest.class, - J2EEConnectionPoolTest.class, LikeTest.class, QueryBuilderTest.class, - FreeformQueryTest.class, RowIdTest.class, SQLContainerTest.class, - SQLContainerTableQueryTest.class, ColumnPropertyTest.class, - TableQueryTest.class, SQLGeneratorsTest.class, UtilTest.class, - TicketTest.class, BetweenTest.class, ReadOnlyRowIdTest.class }) -public class AllTests { -} diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java deleted file mode 100644 index 503ba455fd..0000000000 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/ReadOnlyValidationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.vaadin.tests.server.validation; - -import org.junit.Test; - -import com.vaadin.v7.data.validator.LegacyIntegerValidator; -import com.vaadin.v7.ui.LegacyTextField; - -public class ReadOnlyValidationTest { - - @Test - public void testIntegerValidation() { - LegacyTextField field = new LegacyTextField(); - field.addValidator(new LegacyIntegerValidator("Enter a Valid Number")); - field.setValue(String.valueOf(10)); - field.validate(); - } -} diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroupTest.java index 3333cd7744..fdb0ae2bf3 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/BeanFieldGroupTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/BeanFieldGroupTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import org.junit.Assert; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java index e5aade1217..7cd4cfb90e 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/DefaultFieldGroupFieldFactoryTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.lang.reflect.Constructor; import java.util.Date; @@ -22,14 +22,14 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.ui.AbstractSelect; -import com.vaadin.ui.ComboBox; -import com.vaadin.ui.ListSelect; -import com.vaadin.v7.ui.LegacyDateField; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyInlineDateField; -import com.vaadin.v7.ui.LegacyPopupDateField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.AbstractSelect; +import com.vaadin.v7.ui.ComboBox; +import com.vaadin.v7.ui.Field; +import com.vaadin.v7.ui.DateField; +import com.vaadin.v7.ui.InlineDateField; +import com.vaadin.v7.ui.PopupDateField; +import com.vaadin.v7.ui.ListSelect; +import com.vaadin.v7.ui.TextField; public class DefaultFieldGroupFieldFactoryTest { @@ -65,33 +65,33 @@ public class DefaultFieldGroupFieldFactoryTest { @Test public void testDateGenerationForPopupDateField() { - LegacyField f = fieldFactory.createField(Date.class, - LegacyDateField.class); + Field f = fieldFactory.createField(Date.class, + DateField.class); Assert.assertNotNull(f); - Assert.assertEquals(LegacyPopupDateField.class, f.getClass()); + Assert.assertEquals(PopupDateField.class, f.getClass()); } @Test public void testDateGenerationForInlineDateField() { - LegacyField f = fieldFactory.createField(Date.class, - LegacyInlineDateField.class); + Field f = fieldFactory.createField(Date.class, + InlineDateField.class); Assert.assertNotNull(f); - Assert.assertEquals(LegacyInlineDateField.class, f.getClass()); + Assert.assertEquals(InlineDateField.class, f.getClass()); } @Test public void testDateGenerationForTextField() { - LegacyField f = fieldFactory.createField(Date.class, - LegacyTextField.class); + Field f = fieldFactory.createField(Date.class, + TextField.class); Assert.assertNotNull(f); - Assert.assertEquals(LegacyTextField.class, f.getClass()); + Assert.assertEquals(TextField.class, f.getClass()); } @Test public void testDateGenerationForField() { - LegacyField f = fieldFactory.createField(Date.class, LegacyField.class); + Field f = fieldFactory.createField(Date.class, Field.class); Assert.assertNotNull(f); - Assert.assertEquals(LegacyPopupDateField.class, f.getClass()); + Assert.assertEquals(PopupDateField.class, f.getClass()); } public enum SomeEnum { @@ -100,7 +100,7 @@ public class DefaultFieldGroupFieldFactoryTest { @Test public void testEnumComboBox() { - LegacyField f = fieldFactory.createField(SomeEnum.class, + Field f = fieldFactory.createField(SomeEnum.class, ComboBox.class); Assert.assertNotNull(f); Assert.assertEquals(ComboBox.class, f.getClass()); @@ -108,7 +108,7 @@ public class DefaultFieldGroupFieldFactoryTest { @Test public void testEnumAnySelect() { - LegacyField f = fieldFactory.createField(SomeEnum.class, + Field f = fieldFactory.createField(SomeEnum.class, AbstractSelect.class); Assert.assertNotNull(f); Assert.assertEquals(ListSelect.class, f.getClass()); @@ -116,8 +116,8 @@ public class DefaultFieldGroupFieldFactoryTest { @Test public void testEnumAnyField() { - LegacyField f = fieldFactory.createField(SomeEnum.class, - LegacyField.class); + Field f = fieldFactory.createField(SomeEnum.class, + Field.class); Assert.assertNotNull(f); Assert.assertEquals(ListSelect.class, f.getClass()); } diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupDateTest.java index e270211abf..d354729bea 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupDateTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import java.util.Date; @@ -21,9 +21,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.BeanItem; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyPopupDateField; +import com.vaadin.v7.data.util.BeanItem; +import com.vaadin.v7.ui.Field; +import com.vaadin.v7.ui.PopupDateField; public class FieldGroupDateTest { @@ -66,22 +66,22 @@ public class FieldGroupDateTest { @Test public void testBuildAndBindDate() { - LegacyField f = fieldGroup.buildAndBind("javaDate"); + Field f = fieldGroup.buildAndBind("javaDate"); Assert.assertNotNull(f); - Assert.assertEquals(LegacyPopupDateField.class, f.getClass()); + Assert.assertEquals(PopupDateField.class, f.getClass()); } @Test public void testBuildAndBindSqlDate() { - LegacyField f = fieldGroup.buildAndBind("sqlDate"); + Field f = fieldGroup.buildAndBind("sqlDate"); Assert.assertNotNull(f); - Assert.assertEquals(LegacyPopupDateField.class, f.getClass()); + Assert.assertEquals(PopupDateField.class, f.getClass()); } @Test public void clearFields() { - LegacyPopupDateField sqlDate = new LegacyPopupDateField(); - LegacyPopupDateField javaDate = new LegacyPopupDateField(); + PopupDateField sqlDate = new PopupDateField(); + PopupDateField javaDate = new PopupDateField(); fieldGroup.bind(sqlDate, "sqlDate"); fieldGroup.bind(javaDate, "javaDate"); diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupExceptionTest.java index 4622f0960e..6a18e35666 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupExceptionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupExceptionTest.java @@ -13,19 +13,19 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import org.junit.Test; -import com.vaadin.data.fieldgroup.FieldGroup.CommitException; -import com.vaadin.v7.ui.LegacyPopupDateField; +import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException; +import com.vaadin.v7.ui.PopupDateField; public class FieldGroupExceptionTest { @Test(expected = CommitException.class) public void testUnboundCommitException() throws CommitException { FieldGroup fieldGroup = new FieldGroup(); - LegacyPopupDateField dateField = new LegacyPopupDateField(); + PopupDateField dateField = new PopupDateField(); fieldGroup.bind(dateField, "date"); fieldGroup.commit(); } diff --git a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupTest.java index c0039fc4fb..c8d98c14b5 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/fieldgroup/FieldGroupTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.fieldgroup; +package com.vaadin.v7.data.fieldgroup; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -9,22 +9,22 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Property; -import com.vaadin.data.Property.Transactional; -import com.vaadin.data.util.BeanItem; -import com.vaadin.data.util.TransactionalPropertyWrapper; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Property.Transactional; +import com.vaadin.v7.data.util.BeanItem; +import com.vaadin.v7.data.util.TransactionalPropertyWrapper; +import com.vaadin.v7.ui.Field; +import com.vaadin.v7.ui.TextField; public class FieldGroupTest { private FieldGroup sut; - private LegacyField field; + private Field field; @Before public void setup() { sut = new FieldGroup(); - field = mock(LegacyField.class); + field = mock(Field.class); } @Test @@ -37,7 +37,7 @@ public class FieldGroupTest { @Test(expected = FieldGroup.BindException.class) public void cannotBindToAlreadyBoundProperty() { sut.bind(field, "foobar"); - sut.bind(mock(LegacyField.class), "foobar"); + sut.bind(mock(Field.class), "foobar"); } @Test(expected = FieldGroup.BindException.class) @@ -63,7 +63,7 @@ public class FieldGroupTest { } }; group.setItemDataSource(new BeanItem<Bean>(bean)); - LegacyTextField field = new LegacyTextField(); + TextField field = new TextField(); group.bind(field, "name"); Property propertyDataSource = field.getPropertyDataSource(); diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractBeanContainerTestBase.java index 4a9e4f9891..9e5b602d39 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractBeanContainerTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractBeanContainerTestBase.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; /** * Automated test for {@link AbstractBeanContainer}. diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractContainerTestBase.java index 955b609735..7ff24f76ae 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractContainerTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractContainerTestBase.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,14 +12,14 @@ import java.util.List; import org.junit.Assert; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Filterable; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Container.Ordered; -import com.vaadin.data.Container.Sortable; -import com.vaadin.data.Item; -import com.vaadin.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Filterable; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Container.Ordered; +import com.vaadin.v7.data.Container.Sortable; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; public abstract class AbstractContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractHierarchicalContainerTestBase.java index f3eda74100..816dc251b5 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractHierarchicalContainerTestBase.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -8,10 +8,10 @@ import static org.junit.Assert.assertTrue; import java.util.Collection; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Hierarchical; -import com.vaadin.data.Container.Sortable; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Hierarchical; +import com.vaadin.v7.data.Container.Sortable; +import com.vaadin.v7.data.Item; public abstract class AbstractHierarchicalContainerTestBase extends AbstractContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractInMemoryContainerTestBase.java index 3858504bc7..020fe5f015 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/AbstractInMemoryContainerTestBase.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; public abstract class AbstractInMemoryContainerTestBase extends AbstractContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanContainerTest.java index bdf6ba1958..f536fb489e 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanContainerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -17,9 +17,9 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.AbstractBeanContainer.BeanIdResolver; public class BeanContainerTest extends AbstractBeanContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java index a5bdcc7cf9..2bc90c175c 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerGenerator.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerGenerator.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Date; import java.util.concurrent.atomic.AtomicLong; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerSortTest.java index 4f4e35258f..d9544e3e82 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerSortTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerSortTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Arrays; import java.util.Collection; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerTest.java index 19b0835fd6..31d96fb47e 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemContainerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -20,13 +20,13 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Indexed.ItemAddEvent; -import com.vaadin.data.Container.Indexed.ItemRemoveEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Item; -import com.vaadin.data.util.NestedMethodPropertyTest.Address; -import com.vaadin.data.util.filter.Compare; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Indexed.ItemAddEvent; +import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.NestedMethodPropertyTest.Address; +import com.vaadin.v7.data.util.filter.Compare; /** * Test basic functionality of BeanItemContainer. diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java index 1bbe74818c..cc5d72f3df 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/BeanItemTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/BeanItemTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -12,7 +12,7 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Property; /** * Test BeanItem specific features. diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapperTest.java index e41f751bfd..aa3187fde8 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerHierarchicalWrapperTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerOrderedWrapperTest.java index c3a8b2c4f9..2eded0084d 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerOrderedWrapperTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerOrderedWrapperTest.java @@ -1,12 +1,12 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Collection; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; public class ContainerOrderedWrapperTest extends AbstractContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSizeAssertTest.java index 58cb2b1d27..bc2815969b 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSizeAssertTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSizeAssertTest.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.ui.Table; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.ui.Table; public class ContainerSizeAssertTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSortingTest.java index 1c4dc1de5e..860f3b7b15 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/ContainerSortingTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ContainerSortingTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.HashMap; import java.util.Iterator; @@ -6,9 +6,9 @@ import java.util.Map; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Item; import com.vaadin.tests.util.TestUtil; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; public class ContainerSortingTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/FileSystemContainerTest.java index 992b265702..c421750f87 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/FileSystemContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/FileSystemContainerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.File; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerBasicTest.java index 11335314f0..fb7cb06727 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerBasicTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerBasicTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -12,13 +12,13 @@ import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Indexed.ItemAddEvent; -import com.vaadin.data.Container.Indexed.ItemRemoveEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Container.ItemSetChangeNotifier; -import com.vaadin.data.Item; -import com.vaadin.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Indexed.ItemAddEvent; +import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Container.ItemSetChangeNotifier; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; public class GeneratedPropertyContainerBasicTest extends AbstractInMemoryContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java index 1e34567439..6196af79d4 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/GeneratedPropertyContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/GeneratedPropertyContainerTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -23,17 +23,17 @@ import static org.junit.Assert.fail; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Container.Indexed; -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.sort.SortOrder; -import com.vaadin.data.util.GeneratedPropertyContainer.GeneratedPropertyItem; -import com.vaadin.data.util.filter.Compare; -import com.vaadin.data.util.filter.UnsupportedFilterException; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Container.Indexed; +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.util.GeneratedPropertyContainer.GeneratedPropertyItem; +import com.vaadin.v7.data.util.filter.Compare; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; public class GeneratedPropertyContainerTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapperTest.java index 54984f07ad..b8f1cecc4b 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapperTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapperTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerTest.java index 7ab20ca3dd..8e36d751c0 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/HierarchicalContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/HierarchicalContainerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -6,8 +6,8 @@ import static org.junit.Assert.assertNull; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; public class HierarchicalContainerTest extends AbstractHierarchicalContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/IndexedContainerTest.java index b19a425518..712a9b7047 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/IndexedContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/IndexedContainerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -11,10 +11,10 @@ import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container.Indexed.ItemAddEvent; -import com.vaadin.data.Container.Indexed.ItemRemoveEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Container.Indexed.ItemAddEvent; +import com.vaadin.v7.data.Container.Indexed.ItemRemoveEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Item; public class IndexedContainerTest extends AbstractInMemoryContainerTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/MethodPropertyMemoryConsumptionTest.java index 6776021c24..64a7c19b8f 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/MethodPropertyMemoryConsumptionTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java index 4a1e2a1784..a5103e0e0a 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/NestedMethodPropertyTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/NestedMethodPropertyTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ObjectPropertyTest.java index e0307034cf..3e2cb5cc91 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/ObjectPropertyTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ObjectPropertyTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import org.junit.Assert; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java index 5f64c0e8d8..1f27bc226c 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PerformanceTestIndexedContainerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.ArrayList; import java.util.Collection; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java index af9db229c5..1dd603c328 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/PropertyDescriptorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertyDescriptorTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.beans.Introspector; import java.beans.PropertyDescriptor; @@ -10,8 +10,8 @@ import java.io.ObjectOutputStream; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Property; -import com.vaadin.data.util.NestedMethodPropertyTest.Person; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.NestedMethodPropertyTest.Person; public class PropertyDescriptorTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertySetItemTest.java index fc91a20dd0..0516c8ae9f 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/PropertySetItemTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/PropertySetItemTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Iterator; @@ -8,8 +8,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Item.PropertySetChangeEvent; -import com.vaadin.data.Item.PropertySetChangeListener; +import com.vaadin.v7.data.Item.PropertySetChangeEvent; +import com.vaadin.v7.data.Item.PropertySetChangeListener; public class PropertySetItemTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ReflectToolsGetSuperFieldTest.java index df4258f316..2876181b90 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/ReflectToolsGetSuperFieldTest.java @@ -1,12 +1,12 @@ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.data.fieldgroup.PropertyId; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.fieldgroup.FieldGroup; +import com.vaadin.v7.data.fieldgroup.PropertyId; +import com.vaadin.v7.ui.TextField; public class ReflectToolsGetSuperFieldTest { @@ -14,7 +14,7 @@ public class ReflectToolsGetSuperFieldTest { public void getFieldFromSuperClass() { class MyClass { @PropertyId("testProperty") - LegacyTextField test = new LegacyTextField("This is a test"); + TextField test = new TextField("This is a test"); } class MySubClass extends MyClass { // no fields here diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/TransactionalPropertyWrapperTest.java index ef3e416f96..6aa4c5a2af 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/TransactionalPropertyWrapperTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/TransactionalPropertyWrapperTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static org.junit.Assert.assertTrue; @@ -22,8 +22,8 @@ import java.util.List; import org.junit.Test; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.fieldgroup.FieldGroup; +import com.vaadin.v7.ui.TextField; /** * Test verifying that TransactionalPropertyWrapper removes it's listener from @@ -63,9 +63,9 @@ public class TransactionalPropertyWrapperTest { } } - private final LegacyTextField nameField = new LegacyTextField("Name"); - private final LegacyTextField ageField = new LegacyTextField("Age"); - private final LegacyTextField unboundField = new LegacyTextField( + private final TextField nameField = new TextField("Name"); + private final TextField ageField = new TextField("Age"); + private final TextField unboundField = new TextField( "No FieldGroup"); private final TestingProperty<String> unboundProp = new TestingProperty<String>( "Hello World"); diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AbstractFilterTestBase.java index 0c6932c65e..7120a429fc 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AbstractFilterTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AbstractFilterTestBase.java @@ -1,10 +1,10 @@ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; import junit.framework.TestCase; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AndOrFilterTest.java index f825ef64c6..827da03790 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/AndOrFilterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/AndOrFilterTest.java @@ -1,11 +1,11 @@ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.util.BeanItem; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.BeanItem; public class AndOrFilterTest extends AbstractFilterTestBase<AbstractJunctionFilter> { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterDateTest.java index 7c3dba9db3..89e9d08cda 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterDateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterDateTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import java.text.SimpleDateFormat; import java.util.Date; @@ -6,15 +6,15 @@ import java.util.Date; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; -import com.vaadin.data.util.filter.Compare.Equal; -import com.vaadin.data.util.filter.Compare.Greater; -import com.vaadin.data.util.filter.Compare.GreaterOrEqual; -import com.vaadin.data.util.filter.Compare.Less; -import com.vaadin.data.util.filter.Compare.LessOrEqual; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; +import com.vaadin.v7.data.util.filter.Compare.Equal; +import com.vaadin.v7.data.util.filter.Compare.Greater; +import com.vaadin.v7.data.util.filter.Compare.GreaterOrEqual; +import com.vaadin.v7.data.util.filter.Compare.Less; +import com.vaadin.v7.data.util.filter.Compare.LessOrEqual; public class CompareFilterDateTest extends AbstractFilterTestBase<Compare> { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterTest.java index 4bdad3c54d..b93c72e37e 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/CompareFilterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/CompareFilterTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import java.math.BigDecimal; import java.util.Date; @@ -6,15 +6,15 @@ import java.util.Date; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; -import com.vaadin.data.util.filter.Compare.Equal; -import com.vaadin.data.util.filter.Compare.Greater; -import com.vaadin.data.util.filter.Compare.GreaterOrEqual; -import com.vaadin.data.util.filter.Compare.Less; -import com.vaadin.data.util.filter.Compare.LessOrEqual; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; +import com.vaadin.v7.data.util.filter.Compare.Equal; +import com.vaadin.v7.data.util.filter.Compare.Greater; +import com.vaadin.v7.data.util.filter.Compare.GreaterOrEqual; +import com.vaadin.v7.data.util.filter.Compare.Less; +import com.vaadin.v7.data.util.filter.Compare.LessOrEqual; public class CompareFilterTest extends AbstractFilterTestBase<Compare> { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/IsNullFilterTest.java index 18013cd41c..1b5705ea45 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/IsNullFilterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/IsNullFilterTest.java @@ -1,12 +1,12 @@ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/LikeFilterTest.java index 39054008cd..cac985f359 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/LikeFilterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/LikeFilterTest.java @@ -14,14 +14,14 @@ * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; public class LikeFilterTest extends AbstractFilterTestBase<Like> { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/NotFilterTest.java index e797b484f8..cdf51abe5a 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/NotFilterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/NotFilterTest.java @@ -1,11 +1,11 @@ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.util.BeanItem; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.BeanItem; public class NotFilterTest extends AbstractFilterTestBase<Not> { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/SimpleStringFilterTest.java index dd8267107a..cf0af5fe7b 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/filter/SimpleStringFilterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/filter/SimpleStringFilterTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import org.junit.Assert; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/AllTests.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/AllTests.java new file mode 100644 index 0000000000..caac9ea91d --- /dev/null +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/AllTests.java @@ -0,0 +1,24 @@ +package com.vaadin.v7.data.util.sqlcontainer; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +import com.vaadin.v7.data.util.sqlcontainer.connection.J2EEConnectionPoolTest; +import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPoolTest; +import com.vaadin.v7.data.util.sqlcontainer.filters.BetweenTest; +import com.vaadin.v7.data.util.sqlcontainer.filters.LikeTest; +import com.vaadin.v7.data.util.sqlcontainer.generator.SQLGeneratorsTest; +import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQueryTest; +import com.vaadin.v7.data.util.sqlcontainer.query.QueryBuilderTest; +import com.vaadin.v7.data.util.sqlcontainer.query.TableQueryTest; + +@RunWith(Suite.class) +@SuiteClasses({ SimpleJDBCConnectionPoolTest.class, + J2EEConnectionPoolTest.class, LikeTest.class, QueryBuilderTest.class, + FreeformQueryTest.class, RowIdTest.class, SQLContainerTest.class, + SQLContainerTableQueryTest.class, ColumnPropertyTest.class, + TableQueryTest.class, SQLGeneratorsTest.class, UtilTest.class, + TicketTest.class, BetweenTest.class, ReadOnlyRowIdTest.class }) +public class AllTests { +} diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ColumnPropertyTest.java index edc56035e1..ce6398b50a 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ColumnPropertyTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -11,9 +11,9 @@ import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Property.ReadOnlyException; -import com.vaadin.data.util.sqlcontainer.ColumnProperty.NotNullableException; -import com.vaadin.data.util.sqlcontainer.query.QueryDelegate; +import com.vaadin.v7.data.Property.ReadOnlyException; +import com.vaadin.v7.data.util.sqlcontainer.ColumnProperty.NotNullableException; +import com.vaadin.v7.data.util.sqlcontainer.query.QueryDelegate; public class ColumnPropertyTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/DataGenerator.java index 3d12fc78ba..02d59e4489 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/DataGenerator.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/DataGenerator.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import java.sql.Connection; import java.sql.ResultSet; @@ -7,8 +7,8 @@ import java.sql.Statement; import org.junit.Assert; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; public class DataGenerator { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/FreeformQueryUtil.java index c8b5b5a2b3..9c14296476 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/FreeformQueryUtil.java @@ -1,11 +1,11 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import java.util.List; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; public class FreeformQueryUtil { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowIdTest.java index 29968ecf94..b1208c7b94 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/ReadOnlyRowIdTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import org.junit.Assert; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/RowIdTest.java index e93048157b..e9e869223d 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/RowIdTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/RowIdTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import org.junit.Assert; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTableQueryTest.java index 0bdcc9a3c3..fe1e7e1813 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTableQueryTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItems; @@ -23,15 +23,15 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Item; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.OrderBy; -import com.vaadin.data.util.sqlcontainer.query.TableQuery; -import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; +import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; public class SQLContainerTableQueryTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java index d499ceed92..3346bd245a 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLContainerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import java.math.BigDecimal; import java.sql.Connection; @@ -18,24 +18,24 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.Item; -import com.vaadin.data.util.filter.Compare.Equal; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.FreeformQuery; -import com.vaadin.data.util.sqlcontainer.query.FreeformQueryDelegate; -import com.vaadin.data.util.sqlcontainer.query.FreeformStatementDelegate; -import com.vaadin.data.util.sqlcontainer.query.OrderBy; -import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; -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.data.util.sqlcontainer.query.generator.StatementHelper; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.filter.Compare.Equal; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQueryDelegate; +import com.vaadin.v7.data.util.sqlcontainer.query.FreeformStatementDelegate; +import com.vaadin.v7.data.util.sqlcontainer.query.OrderBy; +import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; +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; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; public class SQLContainerTest { private static final int offset = SQLTestsConstants.offset; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/SQLTestsConstants.java index 3718cf756d..f7a13583c4 100755 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java +++ b/compatibility-server/src/test/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/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java index 1a19eda542..34cc791c7a 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/TicketTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/TicketTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import java.math.BigDecimal; import java.sql.SQLException; @@ -12,19 +12,19 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.util.filter.Compare.Equal; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.FreeformQuery; -import com.vaadin.data.util.sqlcontainer.query.FreeformStatementDelegate; -import com.vaadin.data.util.sqlcontainer.query.TableQuery; -import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; -import com.vaadin.ui.Table; import com.vaadin.ui.Window; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.filter.Compare.Equal; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.query.FreeformQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.FreeformStatementDelegate; +import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.ui.Table; public class TicketTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/UtilTest.java index a575d649f1..f71c5b02e9 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/UtilTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/UtilTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer; +package com.vaadin.v7.data.util.sqlcontainer; import org.junit.Assert; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java index 1463a27217..403f35ecc9 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer.connection; +package com.vaadin.v7.data.util.sqlcontainer.connection; import java.sql.Connection; import java.sql.SQLException; @@ -63,7 +63,7 @@ public class J2EEConnectionPoolTest { EasyMock.expectLastCall().andReturn(connection); System.setProperty("java.naming.factory.initial", - "com.vaadin.data.util.sqlcontainer.connection.MockInitialContextFactory"); + "com.vaadin.v7.data.util.sqlcontainer.connection.MockInitialContextFactory"); Context context = EasyMock.createMock(Context.class); context.lookup("testDataSource"); EasyMock.expectLastCall().andReturn(ds); diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java index 42b02cf874..fce8b4d4ec 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/MockInitialContextFactory.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer.connection; +package com.vaadin.v7.data.util.sqlcontainer.connection; import javax.naming.Context; import javax.naming.NamingException; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java index 5a6ae78aeb..2d63b0a6ab 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer.connection; +package com.vaadin.v7.data.util.sqlcontainer.connection; import java.sql.Connection; import java.sql.SQLException; @@ -8,8 +8,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; -import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants; +import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; public class SimpleJDBCConnectionPoolTest { private JDBCConnectionPool connectionPool; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/BetweenTest.java index 41db88b881..59e486b686 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/BetweenTest.java @@ -1,12 +1,12 @@ -package com.vaadin.data.util.sqlcontainer.filters; +package com.vaadin.v7.data.util.sqlcontainer.filters; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.filter.Between; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.filter.Between; public class BetweenTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/CompareTest.java index a6b6f4b55c..9739144b7f 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/CompareTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/CompareTest.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.filters; +package com.vaadin.v7.data.util.sqlcontainer.filters; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.filter.Compare; +import com.vaadin.v7.data.util.filter.Compare; public class CompareTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/LikeTest.java index f1130aad80..e09705e6f3 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/filters/LikeTest.java @@ -1,12 +1,12 @@ -package com.vaadin.data.util.sqlcontainer.filters; +package com.vaadin.v7.data.util.sqlcontainer.filters; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; -import com.vaadin.data.util.filter.Like; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; +import com.vaadin.v7.data.util.filter.Like; public class LikeTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/SQLGeneratorsTest.java index dd1db30b72..7f27d2a2fd 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/SQLGeneratorsTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer.generator; +package com.vaadin.v7.data.util.sqlcontainer.generator; import java.sql.SQLException; import java.util.ArrayList; @@ -10,22 +10,22 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.filter.Or; -import com.vaadin.data.util.sqlcontainer.DataGenerator; -import com.vaadin.data.util.sqlcontainer.RowItem; -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.query.OrderBy; -import com.vaadin.data.util.sqlcontainer.query.TableQuery; -import com.vaadin.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; -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.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.filter.Or; +import com.vaadin.v7.data.util.sqlcontainer.DataGenerator; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; +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.query.OrderBy; +import com.vaadin.v7.data.util.sqlcontainer.query.TableQuery; +import com.vaadin.v7.data.util.sqlcontainer.query.ValidatingSimpleJDBCConnectionPool; +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; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class SQLGeneratorsTest { private JDBCConnectionPool connectionPool; @@ -75,7 +75,7 @@ public class SQLGeneratorsTest { @Test public void generateSelectQuery_filtersAndOrderingSet_shouldSucceed() { SQLGenerator sg = new DefaultSQLGenerator(); - List<com.vaadin.data.Container.Filter> f = new ArrayList<Filter>(); + List<com.vaadin.v7.data.Container.Filter> f = new ArrayList<Filter>(); f.add(new Like("name", "%lle")); List<OrderBy> ob = Arrays.asList(new OrderBy("name", true)); StatementHelper sh = sg.generateSelectQuery("TABLE", f, ob, 0, 0, null); diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/StatementHelperTest.java index 7201ec7ad8..1c6559dc73 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/generator/StatementHelperTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/generator/StatementHelperTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.generator; +package com.vaadin.v7.data.util.sqlcontainer.generator; import java.sql.PreparedStatement; import java.sql.SQLException; @@ -22,7 +22,7 @@ import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; /** * diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java index 1b9e14b0d8..b32f16325d 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/FreeformQueryTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.sql.Connection; import java.sql.ResultSet; @@ -14,16 +14,16 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.sqlcontainer.DataGenerator; -import com.vaadin.data.util.sqlcontainer.RowId; -import com.vaadin.data.util.sqlcontainer.RowItem; -import com.vaadin.data.util.sqlcontainer.SQLContainer; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.sqlcontainer.DataGenerator; +import com.vaadin.v7.data.util.sqlcontainer.RowId; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.util.sqlcontainer.SQLContainer; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; public class FreeformQueryTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryBuilderTest.java index 7974582147..834329b3d2 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/QueryBuilderTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.util.ArrayList; @@ -6,22 +6,22 @@ import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.And; -import com.vaadin.data.util.filter.Between; -import com.vaadin.data.util.filter.Compare.Equal; -import com.vaadin.data.util.filter.Compare.Greater; -import com.vaadin.data.util.filter.Compare.GreaterOrEqual; -import com.vaadin.data.util.filter.Compare.Less; -import com.vaadin.data.util.filter.Compare.LessOrEqual; -import com.vaadin.data.util.filter.IsNull; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.filter.Not; -import com.vaadin.data.util.filter.Or; -import com.vaadin.data.util.filter.SimpleStringFilter; -import com.vaadin.data.util.sqlcontainer.query.generator.StatementHelper; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder; -import com.vaadin.data.util.sqlcontainer.query.generator.filter.StringDecorator; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.And; +import com.vaadin.v7.data.util.filter.Between; +import com.vaadin.v7.data.util.filter.Compare.Equal; +import com.vaadin.v7.data.util.filter.Compare.Greater; +import com.vaadin.v7.data.util.filter.Compare.GreaterOrEqual; +import com.vaadin.v7.data.util.filter.Compare.Less; +import com.vaadin.v7.data.util.filter.Compare.LessOrEqual; +import com.vaadin.v7.data.util.filter.IsNull; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.filter.Not; +import com.vaadin.v7.data.util.filter.Or; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.StatementHelper; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.QueryBuilder; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.filter.StringDecorator; public class QueryBuilderTest { diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQueryTest.java index d2067a85b4..23dec7cbf6 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/TableQueryTest.java @@ -1,4 +1,4 @@ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.sql.Connection; import java.sql.PreparedStatement; @@ -14,17 +14,17 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.util.filter.Compare.Equal; -import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.sqlcontainer.DataGenerator; -import com.vaadin.data.util.sqlcontainer.OptimisticLockException; -import com.vaadin.data.util.sqlcontainer.RowItem; -import com.vaadin.data.util.sqlcontainer.SQLContainer; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.Compare.Equal; +import com.vaadin.v7.data.util.filter.Like; +import com.vaadin.v7.data.util.sqlcontainer.DataGenerator; +import com.vaadin.v7.data.util.sqlcontainer.OptimisticLockException; +import com.vaadin.v7.data.util.sqlcontainer.RowItem; +import com.vaadin.v7.data.util.sqlcontainer.SQLContainer; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants; +import com.vaadin.v7.data.util.sqlcontainer.SQLTestsConstants.DB; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.query.generator.DefaultSQLGenerator; public class TableQueryTest { private static final int offset = SQLTestsConstants.offset; diff --git a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java index 8a6ee0aa45..76852c8127 100644 --- a/compatibility-server/src/test/java/com/vaadin/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/data/util/sqlcontainer/query/ValidatingSimpleJDBCConnectionPool.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.sqlcontainer.query; +package com.vaadin.v7.data.util.sqlcontainer.query; import java.sql.Connection; import java.sql.SQLException; @@ -21,8 +21,8 @@ import java.util.HashSet; import java.util.Set; import java.util.logging.Logger; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.v7.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; /** * Connection pool for testing SQLContainer. Ensures that only reserved diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigDecimalRangeValidatorTest.java index 3fe6d1f6ff..5547651107 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigDecimalRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import java.math.BigDecimal; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyBigDecimalRangeValidator; +import com.vaadin.v7.data.validator.BigDecimalRangeValidator; public class BigDecimalRangeValidatorTest { - private LegacyBigDecimalRangeValidator cleanValidator = new LegacyBigDecimalRangeValidator( + private BigDecimalRangeValidator cleanValidator = new BigDecimalRangeValidator( "no values", null, null); - private LegacyBigDecimalRangeValidator minValidator = new LegacyBigDecimalRangeValidator( + private BigDecimalRangeValidator minValidator = new BigDecimalRangeValidator( "no values", new BigDecimal(10.1), null); - private LegacyBigDecimalRangeValidator maxValidator = new LegacyBigDecimalRangeValidator( + private BigDecimalRangeValidator maxValidator = new BigDecimalRangeValidator( "no values", null, new BigDecimal(100.1)); - private LegacyBigDecimalRangeValidator minMaxValidator = new LegacyBigDecimalRangeValidator( + private BigDecimalRangeValidator minMaxValidator = new BigDecimalRangeValidator( "no values", new BigDecimal(10.5), new BigDecimal(100.5)); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigIntegerRangeValidatorTest.java index c54e868e64..144ca370fa 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/BigIntegerRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import java.math.BigInteger; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyBigIntegerRangeValidator; +import com.vaadin.v7.data.validator.BigIntegerRangeValidator; public class BigIntegerRangeValidatorTest { - private LegacyBigIntegerRangeValidator cleanValidator = new LegacyBigIntegerRangeValidator( + private BigIntegerRangeValidator cleanValidator = new BigIntegerRangeValidator( "no values", null, null); - private LegacyBigIntegerRangeValidator minValidator = new LegacyBigIntegerRangeValidator( + private BigIntegerRangeValidator minValidator = new BigIntegerRangeValidator( "no values", BigInteger.valueOf(10), null); - private LegacyBigIntegerRangeValidator maxValidator = new LegacyBigIntegerRangeValidator( + private BigIntegerRangeValidator maxValidator = new BigIntegerRangeValidator( "no values", null, BigInteger.valueOf(100)); - private LegacyBigIntegerRangeValidator minMaxValidator = new LegacyBigIntegerRangeValidator( + private BigIntegerRangeValidator minMaxValidator = new BigIntegerRangeValidator( "no values", BigInteger.valueOf(10), BigInteger.valueOf(100)); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ByteRangeValidatorTest.java index fa6dd8f098..c9bec3ad1a 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ByteRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyByteRangeValidator; +import com.vaadin.v7.data.validator.ByteRangeValidator; public class ByteRangeValidatorTest { - private LegacyByteRangeValidator cleanValidator = new LegacyByteRangeValidator( + private ByteRangeValidator cleanValidator = new ByteRangeValidator( "no values", null, null); - private LegacyByteRangeValidator minValidator = new LegacyByteRangeValidator( + private ByteRangeValidator minValidator = new ByteRangeValidator( "no values", (byte) 10, null); - private LegacyByteRangeValidator maxValidator = new LegacyByteRangeValidator( + private ByteRangeValidator maxValidator = new ByteRangeValidator( "no values", null, (byte) 100); - private LegacyByteRangeValidator minMaxValidator = new LegacyByteRangeValidator( + private ByteRangeValidator minMaxValidator = new ByteRangeValidator( "no values", (byte) 10, (byte) 100); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/CompositeValidatorTest.java index 2975331e8a..aa86f92091 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/CompositeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/CompositeValidatorTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -9,19 +9,19 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.v7.data.Validator; -import com.vaadin.v7.data.validator.LegacyCompositeValidator; -import com.vaadin.v7.data.validator.LegacyCompositeValidator.CombinationMode; -import com.vaadin.v7.data.validator.LegacyEmailValidator; -import com.vaadin.v7.data.validator.LegacyRegexpValidator; +import com.vaadin.v7.data.validator.CompositeValidator; +import com.vaadin.v7.data.validator.CompositeValidator.CombinationMode; +import com.vaadin.v7.data.validator.EmailValidator; +import com.vaadin.v7.data.validator.RegexpValidator; public class CompositeValidatorTest { - LegacyCompositeValidator and = new LegacyCompositeValidator( + CompositeValidator and = new CompositeValidator( CombinationMode.AND, "One validator not valid"); - LegacyCompositeValidator or = new LegacyCompositeValidator( + CompositeValidator or = new CompositeValidator( CombinationMode.OR, "No validators are valid"); - LegacyEmailValidator email = new LegacyEmailValidator("Faulty email"); - LegacyRegexpValidator regex = new LegacyRegexpValidator("@mail.com", false, + EmailValidator email = new EmailValidator("Faulty email"); + RegexpValidator regex = new RegexpValidator("@mail.com", false, "Partial match validator error"); @Before diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java index a0afc9c617..225f344045 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DateRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DateRangeValidatorTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -12,7 +12,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.v7.data.validator.LegacyDateRangeValidator; +import com.vaadin.v7.data.validator.DateRangeValidator; public class DateRangeValidatorTest { Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"), @@ -20,24 +20,24 @@ public class DateRangeValidatorTest { Calendar endDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"), Locale.ENGLISH); - private LegacyDateRangeValidator cleanValidator; - private LegacyDateRangeValidator minValidator; - private LegacyDateRangeValidator maxValidator; - private LegacyDateRangeValidator minMaxValidator; + private DateRangeValidator cleanValidator; + private DateRangeValidator minValidator; + private DateRangeValidator maxValidator; + private DateRangeValidator minMaxValidator; @Before public void setUp() { startDate.set(2000, Calendar.JANUARY, 1, 12, 0, 0); endDate.set(2000, Calendar.FEBRUARY, 20, 12, 0, 0); - cleanValidator = new LegacyDateRangeValidator( + cleanValidator = new DateRangeValidator( "Given date outside range", null, null, Resolution.DAY); - minValidator = new LegacyDateRangeValidator( + minValidator = new DateRangeValidator( "Given date before startDate", startDate.getTime(), null, Resolution.DAY); - maxValidator = new LegacyDateRangeValidator("Given date after endDate", + maxValidator = new DateRangeValidator("Given date after endDate", null, endDate.getTime(), Resolution.DAY); - minMaxValidator = new LegacyDateRangeValidator( + minMaxValidator = new DateRangeValidator( "Given date outside range", startDate.getTime(), endDate.getTime(), Resolution.DAY); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DoubleRangeValidatorTest.java index ec3a34bfa6..146ee3ba39 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/DoubleRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyDoubleRangeValidator; +import com.vaadin.v7.data.validator.DoubleRangeValidator; public class DoubleRangeValidatorTest { - private LegacyDoubleRangeValidator cleanValidator = new LegacyDoubleRangeValidator( + private DoubleRangeValidator cleanValidator = new DoubleRangeValidator( "no values", null, null); - private LegacyDoubleRangeValidator minValidator = new LegacyDoubleRangeValidator( + private DoubleRangeValidator minValidator = new DoubleRangeValidator( "no values", 10.1, null); - private LegacyDoubleRangeValidator maxValidator = new LegacyDoubleRangeValidator( + private DoubleRangeValidator maxValidator = new DoubleRangeValidator( "no values", null, 100.1); - private LegacyDoubleRangeValidator minMaxValidator = new LegacyDoubleRangeValidator( + private DoubleRangeValidator minMaxValidator = new DoubleRangeValidator( "no values", 10.5, 100.5); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/EmailValidatorTest.java index 92eef3d4b8..b8f8109028 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/EmailValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/EmailValidatorTest.java @@ -1,13 +1,13 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyEmailValidator; +import com.vaadin.v7.data.validator.EmailValidator; public class EmailValidatorTest { - private LegacyEmailValidator validator = new LegacyEmailValidator("Error"); + private EmailValidator validator = new EmailValidator("Error"); @Test public void testEmailValidatorWithNull() { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/FloatRangeValidatorTest.java index 36bd41864c..b0fa43a92d 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/FloatRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyFloatRangeValidator; +import com.vaadin.v7.data.validator.FloatRangeValidator; public class FloatRangeValidatorTest { - private LegacyFloatRangeValidator cleanValidator = new LegacyFloatRangeValidator( + private FloatRangeValidator cleanValidator = new FloatRangeValidator( "no values", null, null); - private LegacyFloatRangeValidator minValidator = new LegacyFloatRangeValidator( + private FloatRangeValidator minValidator = new FloatRangeValidator( "no values", 10.1f, null); - private LegacyFloatRangeValidator maxValidator = new LegacyFloatRangeValidator( + private FloatRangeValidator maxValidator = new FloatRangeValidator( "no values", null, 100.1f); - private LegacyFloatRangeValidator minMaxValidator = new LegacyFloatRangeValidator( + private FloatRangeValidator minMaxValidator = new FloatRangeValidator( "no values", 10.5f, 100.5f); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/IntegerRangeValidatorTest.java index 595d5f4ab8..5e6c09fd5f 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/IntegerRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator; +import com.vaadin.v7.data.validator.IntegerRangeValidator; public class IntegerRangeValidatorTest { - private LegacyIntegerRangeValidator cleanValidator = new LegacyIntegerRangeValidator( + private IntegerRangeValidator cleanValidator = new IntegerRangeValidator( "no values", null, null); - private LegacyIntegerRangeValidator minValidator = new LegacyIntegerRangeValidator( + private IntegerRangeValidator minValidator = new IntegerRangeValidator( "no values", 10, null); - private LegacyIntegerRangeValidator maxValidator = new LegacyIntegerRangeValidator( + private IntegerRangeValidator maxValidator = new IntegerRangeValidator( "no values", null, 100); - private LegacyIntegerRangeValidator minMaxValidator = new LegacyIntegerRangeValidator( + private IntegerRangeValidator minMaxValidator = new IntegerRangeValidator( "no values", 10, 100); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/LongRangeValidatorTest.java index 6ecd21984c..d6d03d67e6 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/LongRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/LongRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyLongRangeValidator; +import com.vaadin.v7.data.validator.LongRangeValidator; public class LongRangeValidatorTest { - private LegacyLongRangeValidator cleanValidator = new LegacyLongRangeValidator( + private LongRangeValidator cleanValidator = new LongRangeValidator( "no values", null, null); - private LegacyLongRangeValidator minValidator = new LegacyLongRangeValidator( + private LongRangeValidator minValidator = new LongRangeValidator( "no values", 10l, null); - private LegacyLongRangeValidator maxValidator = new LegacyLongRangeValidator( + private LongRangeValidator maxValidator = new LongRangeValidator( "no values", null, 100l); - private LegacyLongRangeValidator minMaxValidator = new LegacyLongRangeValidator( + private LongRangeValidator minMaxValidator = new LongRangeValidator( "no values", 10l, 100l); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/NullValidatorTest.java index 6e43b30cdf..90b6efd610 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/NullValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/NullValidatorTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -6,13 +6,13 @@ import static org.junit.Assert.fail; import org.junit.Test; import com.vaadin.v7.data.Validator; -import com.vaadin.v7.data.validator.LegacyNullValidator; +import com.vaadin.v7.data.validator.NullValidator; public class NullValidatorTest { - LegacyNullValidator notNull = new LegacyNullValidator("Null not accepted", + NullValidator notNull = new NullValidator("Null not accepted", false); - LegacyNullValidator onlyNull = new LegacyNullValidator("Only null accepted", + NullValidator onlyNull = new NullValidator("Only null accepted", true); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/RegexpValidatorTest.java index 1768999969..f08916258e 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/RegexpValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/RegexpValidatorTest.java @@ -1,17 +1,17 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyRegexpValidator; +import com.vaadin.v7.data.validator.RegexpValidator; public class RegexpValidatorTest { - private LegacyRegexpValidator completeValidator = new LegacyRegexpValidator( + private RegexpValidator completeValidator = new RegexpValidator( "pattern", true, "Complete match validator error"); - private LegacyRegexpValidator partialValidator = new LegacyRegexpValidator( + private RegexpValidator partialValidator = new RegexpValidator( "pattern", false, "Partial match validator error"); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ShortRangeValidatorTest.java index 41c3e67942..4b42f9fba8 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/ShortRangeValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyShortRangeValidator; +import com.vaadin.v7.data.validator.ShortRangeValidator; public class ShortRangeValidatorTest { - private LegacyShortRangeValidator cleanValidator = new LegacyShortRangeValidator( + private ShortRangeValidator cleanValidator = new ShortRangeValidator( "no values", null, null); - private LegacyShortRangeValidator minValidator = new LegacyShortRangeValidator( + private ShortRangeValidator minValidator = new ShortRangeValidator( "no values", (short) 10, null); - private LegacyShortRangeValidator maxValidator = new LegacyShortRangeValidator( + private ShortRangeValidator maxValidator = new ShortRangeValidator( "no values", null, (short) 100); - private LegacyShortRangeValidator minMaxValidator = new LegacyShortRangeValidator( + private ShortRangeValidator minMaxValidator = new ShortRangeValidator( "no values", (short) 10, (short) 100); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/StringLengthValidatorTest.java index e24e8fcd5d..e00f540c0f 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/data/validator/StringLengthValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/validator/StringLengthValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.data.validator; +package com.vaadin.v7.tests.data.validator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyStringLengthValidator; +import com.vaadin.v7.data.validator.StringLengthValidator; public class StringLengthValidatorTest { - private LegacyStringLengthValidator validator = new LegacyStringLengthValidator( + private StringLengthValidator validator = new StringLengthValidator( "Error"); - private LegacyStringLengthValidator validatorNoNull = new LegacyStringLengthValidator( + private StringLengthValidator validatorNoNull = new StringLengthValidator( "Error", 1, 5, false); - private LegacyStringLengthValidator validatorMinValue = new LegacyStringLengthValidator( + private StringLengthValidator validatorMinValue = new StringLengthValidator( "Error", 5, null, true); - private LegacyStringLengthValidator validatorMaxValue = new LegacyStringLengthValidator( + private StringLengthValidator validatorMaxValue = new StringLengthValidator( "Error", null, 15, true); @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseAllSupportedComponentsTest.java index 6694372539..8e6a87add6 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseAllSupportedComponentsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseAllSupportedComponentsTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.design; +package com.vaadin.v7.tests.design; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseLegacyPrefixTest.java index 5dd21b35f8..7884cdfa7a 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/design/ParseLegacyPrefixTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/ParseLegacyPrefixTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.design; +package com.vaadin.v7.tests.design; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/WriteLegacyDesignTest.java index eb3841b094..046b365601 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/design/WriteLegacyDesignTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/design/WriteLegacyDesignTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.design; +package com.vaadin.v7.tests.design; import static org.junit.Assert.assertTrue; @@ -88,7 +88,7 @@ public class WriteLegacyDesignTest { private void checkNode(Node node) { if (node instanceof Element) { - assertTrue("Wrong design element prefix", + assertTrue("Expected " + node.nodeName() + " to start with v-", node.nodeName().startsWith("v-")); for (Node child : node.childNodes()) { checkNode(child); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractBeanContainerListenersTest.java index 98a2513515..5e5954e662 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractBeanContainerListenersTest.java @@ -1,9 +1,9 @@ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; -import com.vaadin.data.Container.PropertySetChangeEvent; -import com.vaadin.data.Container.PropertySetChangeListener; -import com.vaadin.data.util.BeanItemContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +import com.vaadin.v7.data.Container.PropertySetChangeEvent; +import com.vaadin.v7.data.Container.PropertySetChangeListener; +import com.vaadin.v7.data.util.BeanItemContainer; public class AbstractBeanContainerListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractContainerListenersTest.java index 5e0d464fe8..4aaba36733 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractContainerListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractContainerListenersTest.java @@ -1,13 +1,13 @@ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; import org.junit.Test; -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.util.IndexedContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +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.util.IndexedContainer; public class AbstractContainerListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractInMemoryContainerListenersTest.java index d5a7131182..462ec7ff68 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/AbstractInMemoryContainerListenersTest.java @@ -1,9 +1,9 @@ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; -import com.vaadin.data.Container.ItemSetChangeEvent; -import com.vaadin.data.Container.ItemSetChangeListener; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +import com.vaadin.v7.data.Container.ItemSetChangeEvent; +import com.vaadin.v7.data.Container.ItemSetChangeListener; +import com.vaadin.v7.data.util.IndexedContainer; public class AbstractInMemoryContainerListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java index 1b93a3063d..df833b0cba 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/ContextClickListenerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/ContextClickListenerTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; import java.util.EventObject; @@ -24,8 +24,8 @@ import org.junit.Test; import com.vaadin.event.ContextClickEvent; import com.vaadin.event.ContextClickEvent.ContextClickListener; import com.vaadin.ui.AbstractComponent; -import com.vaadin.ui.LegacyGrid.GridContextClickEvent; -import com.vaadin.ui.Table.TableContextClickEvent; +import com.vaadin.v7.ui.Grid.GridContextClickEvent; +import com.vaadin.v7.ui.Table.TableContextClickEvent; /** * Server-side unit tests to see that context click events are sent to listeners diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/IndexedContainerListenersTest.java index d8a1290b68..33339ce2c9 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/IndexedContainerListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/IndexedContainerListenersTest.java @@ -1,13 +1,13 @@ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; import org.junit.Test; -import com.vaadin.data.Container.PropertySetChangeEvent; -import com.vaadin.data.Container.PropertySetChangeListener; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +import com.vaadin.v7.data.Container.PropertySetChangeEvent; +import com.vaadin.v7.data.Container.PropertySetChangeListener; +import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.v7.data.util.IndexedContainer; public class IndexedContainerListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/SerializationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/SerializationTest.java index 30b0729ace..cb1a6cc0d6 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/SerializationTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/SerializationTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; import static org.junit.Assert.assertNotNull; @@ -11,21 +11,21 @@ import java.io.Serializable; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.IndexedContainer; -import com.vaadin.data.util.MethodProperty; import com.vaadin.server.VaadinSession; -import com.vaadin.v7.data.validator.LegacyRegexpValidator; +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.MethodProperty; +import com.vaadin.v7.data.validator.RegexpValidator; public class SerializationTest { @Test public void testValidators() throws Exception { - LegacyRegexpValidator validator = new LegacyRegexpValidator(".*", + RegexpValidator validator = new RegexpValidator(".*", "Error"); validator.validate("aaa"); - LegacyRegexpValidator validator2 = serializeAndDeserialize(validator); + RegexpValidator validator2 = serializeAndDeserialize(validator); validator2.validate("aaa"); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldListenersTest.java index 5843bd901f..f284229e28 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractfield/LegacyAbstractFieldListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldListenersTest.java @@ -1,15 +1,15 @@ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import org.junit.Test; -import com.vaadin.data.Property.ReadOnlyStatusChangeEvent; -import com.vaadin.data.Property.ReadOnlyStatusChangeListener; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -import com.vaadin.ui.Table; +import com.vaadin.v7.data.Property.ReadOnlyStatusChangeEvent; +import com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener; +import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.v7.ui.Table; -public class LegacyAbstractFieldListenersTest +public class AbstractFieldListenersTest extends AbstractListenerMethodsTestBase { @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java index 9a8777909f..6b0315a845 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectDeclarativeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.abstractselect; +package com.vaadin.v7.tests.server.component.abstractselect; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; @@ -21,18 +21,18 @@ import org.jsoup.parser.Tag; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.ExternalResource; import com.vaadin.server.Resource; import com.vaadin.tests.design.DeclarativeTestBase; import com.vaadin.tests.design.DeclarativeTestBaseBase; -import com.vaadin.ui.AbstractSelect; -import com.vaadin.ui.AbstractSelect.ItemCaptionMode; -import com.vaadin.ui.ComboBox; -import com.vaadin.ui.ListSelect; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignException; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.AbstractSelect; +import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode; +import com.vaadin.v7.ui.ComboBox; +import com.vaadin.v7.ui.ListSelect; /** * Test cases for reading the properties of selection components. @@ -43,7 +43,7 @@ public class AbstractSelectDeclarativeTest extends DeclarativeTestBase<AbstractSelect> { public String getDesignSingleSelectNewItemsAllowed() { - return "<vaadin-combo-box new-items-allowed item-caption-mode='icon_only'" + return "<vaadin7-combo-box new-items-allowed item-caption-mode='icon_only'" + " null-selection-item-id='nullIid'/>"; } @@ -58,7 +58,7 @@ public class AbstractSelectDeclarativeTest } public String getDesignMultiSelect() { - return "<vaadin-list-select multi-select null-selection-allowed='false' new-items-allowed item-caption-mode='property' />"; + return "<vaadin7-list-select multi-select null-selection-allowed='false' new-items-allowed item-caption-mode='property' />"; } public AbstractSelect getExpectedMultiSelect() { @@ -99,8 +99,8 @@ public class AbstractSelectDeclarativeTest @Test(expected = DesignException.class) public void testReadMultipleValuesForSingleSelect() { - testRead("<vaadin-list-select>" + "<option selected>1</option>" - + "<option selected>2</option>" + "</vaadin-list-select>", + testRead("<vaadin7-list-select>" + "<option selected>1</option>" + + "<option selected>2</option>" + "</vaadin7-list-select>", null); } @@ -112,9 +112,9 @@ public class AbstractSelectDeclarativeTest ls.addItem("2"); ls.select("1"); ls.select("2"); - testRead("<vaadin-list-select multi-select>" + testRead("<vaadin7-list-select multi-select>" + "<option selected>1</option>" + "<option selected>2</option>" - + "</vaadin-list-select>", ls); + + "</vaadin7-list-select>", ls); } @Test @@ -124,9 +124,9 @@ public class AbstractSelectDeclarativeTest ls.addItem("1"); ls.addItem("2"); ls.select("1"); - testRead("<vaadin-list-select multi-select>" + testRead("<vaadin7-list-select multi-select>" + "<option selected>1</option>" + "<option>2</option>" - + "</vaadin-list-select>", ls); + + "</vaadin7-list-select>", ls); } @Test @@ -136,8 +136,8 @@ public class AbstractSelectDeclarativeTest ls.addItem("1"); ls.addItem("2"); ls.select("1"); - testRead("<vaadin-list-select>" + "<option selected>1</option>" - + "<option>2</option>" + "</vaadin-list-select>", ls); + testRead("<vaadin7-list-select>" + "<option selected>1</option>" + + "<option>2</option>" + "</vaadin7-list-select>", ls); } @Test @@ -154,10 +154,10 @@ public class AbstractSelectDeclarativeTest } private String getDesignForInlineData() { - return "<vaadin-list-select>\n" + return "<vaadin7-list-select>\n" + " <option icon='http://some.url/icon.png'>Value 1</option>\n" // + " <option selected>Value 2</option>\n"// - + "</vaadin-list-select>"; + + "</vaadin7-list-select>"; } private AbstractSelect getExpectedComponentForInlineData() { @@ -262,9 +262,9 @@ public class AbstractSelectDeclarativeTest @Test public void testHtmlEntities() { - String design = "<vaadin-combo-box>" + String design = "<vaadin7-combo-box>" + " <option item-id=\"one\">> One</option>" - + " <option>> Two</option>" + "</vaadin-combo-box>"; + + " <option>> Two</option>" + "</vaadin7-combo-box>"; AbstractSelect read = read(design); Assert.assertEquals("> One", read.getItemCaption("one")); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectListenersTest.java index 7fc584e3d5..7d90cda572 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectListenersTest.java @@ -1,13 +1,13 @@ -package com.vaadin.tests.server.component.abstractselect; +package com.vaadin.v7.tests.server.component.abstractselect; import org.junit.Test; -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.tests.server.component.AbstractListenerMethodsTestBase; -import com.vaadin.ui.ComboBox; +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.ui.ComboBox; public class AbstractSelectListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java index c5ff297d7b..cc1c9f8d27 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/AbstractSelectStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/AbstractSelectStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.abstractselect; +package com.vaadin.v7.tests.server.component.abstractselect; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.select.AbstractSelectState; -import com.vaadin.ui.AbstractSelect; +import com.vaadin.v7.ui.AbstractSelect; /** * Tests for AbstractSelect state diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java index 8bd253ab64..c4aab7d506 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupDeclarativeTest.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.abstractselect; +package com.vaadin.v7.tests.server.component.abstractselect; import org.junit.Before; import org.junit.Test; import com.vaadin.server.ThemeResource; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.OptionGroup; +import com.vaadin.v7.ui.OptionGroup; public class OptionGroupDeclarativeTest extends DeclarativeTestBase<OptionGroup> { @@ -35,7 +35,7 @@ public class OptionGroupDeclarativeTest @Test public void testBasicSyntax() { - String expected = "<vaadin-option-group />"; + String expected = "<vaadin7-option-group />"; testReadWrite(expected); } @@ -47,12 +47,12 @@ public class OptionGroupDeclarativeTest //@formatter:off String expected = - "<vaadin-option-group>" + "<vaadin7-option-group>" + "<option>foo</option>" + "<option>bar</option>" + "<option>baz</option>" + "<option>bang</option>" - + "</vaadin-option-group>"; + + "</vaadin7-option-group>"; //@formatter:on testReadWrite(expected); @@ -67,12 +67,12 @@ public class OptionGroupDeclarativeTest //@formatter:off String expected = - "<vaadin-option-group>" + "<vaadin7-option-group>" + "<option>foo</option>" + "<option>bar</option>" + "<option disabled>baz</option>" + "<option>bang</option>" - + "</vaadin-option-group>"; + + "</vaadin7-option-group>"; //@formatter:on testReadWrite(expected); @@ -87,12 +87,12 @@ public class OptionGroupDeclarativeTest //@formatter:off String expected = - "<vaadin-option-group>" + "<vaadin7-option-group>" + "<option>foo</option>" + "<option icon='theme://foobar.png'>bar</option>" + "<option>baz</option>" + "<option>bang</option>" - + "</vaadin-option-group>"; + + "</vaadin7-option-group>"; //@formatter:on testReadWrite(expected); @@ -111,12 +111,12 @@ public class OptionGroupDeclarativeTest //@formatter:off String expected = - "<vaadin-option-group html-content-allowed>" + "<vaadin7-option-group html-content-allowed>" + "<option item-id=\"foo\"><b>True</b></option>" + "<option item-id=\"bar\"><font color='red'>False</font></option>" + "<option>baz</option>" + "<option>bang</option>" - + "</vaadin-option-group>"; + + "</vaadin7-option-group>"; //@formatter:on testReadWrite(expected); @@ -132,12 +132,12 @@ public class OptionGroupDeclarativeTest //@formatter:off String expected = - "<vaadin-option-group>" + "<vaadin7-option-group>" + "<option item-id=\"foo\"><b>True</b></option>" + "<option item-id=\"bar\"><font color=\"red\">False</font></option>" + "<option>baz</option>" + "<option>bang</option>" - + "</vaadin-option-group>"; + + "</vaadin7-option-group>"; //@formatter:on testReadWrite(expected); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupTest.java index 9a20d2fd79..b4081e659d 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/abstractselect/OptionGroupTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractselect/OptionGroupTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstractselect; +package com.vaadin.v7.tests.server.component.abstractselect; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,7 +8,7 @@ import java.util.Collection; import org.junit.Before; import org.junit.Test; -import com.vaadin.ui.OptionGroup; +import com.vaadin.v7.ui.OptionGroup; public class OptionGroupTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarBasicsTest.java index 7d011afc8b..8939dc91c8 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarBasicsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarBasicsTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.calendar; +package com.vaadin.v7.tests.server.component.calendar; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,16 +27,16 @@ import java.util.TimeZone; import org.junit.Assert; import org.junit.Test; -import com.vaadin.ui.Calendar; -import com.vaadin.ui.Calendar.TimeFormat; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.BackwardEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.DateClickEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.EventResize; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.ForwardEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.MoveEvent; -import com.vaadin.ui.components.calendar.CalendarComponentEvents.WeekClick; -import com.vaadin.ui.components.calendar.event.BasicEventProvider; -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.BackwardEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.DateClickEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.EventResize; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.ForwardEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.MoveEvent; +import com.vaadin.v7.ui.components.calendar.CalendarComponentEvents.WeekClick; +import com.vaadin.v7.ui.components.calendar.event.BasicEventProvider; +import com.vaadin.v7.ui.components.calendar.event.CalendarEventProvider; /** * Basic API tests for the calendar diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarDeclarativeTest.java index f6896ff15d..604774710a 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/CalendarDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/CalendarDeclarativeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.calendar; +package com.vaadin.v7.tests.server.component.calendar; import java.text.DateFormat; import java.text.ParseException; @@ -23,20 +23,20 @@ import java.util.TimeZone; import org.junit.Test; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.Calendar; -import com.vaadin.ui.Calendar.TimeFormat; +import com.vaadin.v7.ui.Calendar; +import com.vaadin.v7.ui.Calendar.TimeFormat; public class CalendarDeclarativeTest extends DeclarativeTestBase<Calendar> { @Test public void testEmpty() { - verifyDeclarativeDesign("<vaadin-calendar></vaadin-calendar>", + verifyDeclarativeDesign("<vaadin7-calendar></vaadin7-calendar>", new Calendar()); } @Test public void testCalendarAllFeatures() throws ParseException { - String design = "<vaadin-calendar start-date='2014-11-17' end-date='2014-11-23' " + String design = "<vaadin7-calendar start-date='2014-11-17' end-date='2014-11-23' " + "first-visible-day-of-week=2 last-visible-day-of-week=5 " + "time-zone='EST' time-format='12h' first-visible-hour-of-day=8 " + "last-visible-hour-of-day=18 weekly-caption-format='mmm MM/dd' />"; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerDataSourceTest.java index 9cc78269f8..311cb8f6cc 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerDataSourceTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerDataSourceTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.calendar; +package com.vaadin.v7.tests.server.component.calendar; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,16 +24,16 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Indexed; -import com.vaadin.data.Container.Sortable; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.BeanItemContainer; -import com.vaadin.data.util.IndexedContainer; -import com.vaadin.ui.Calendar; -import com.vaadin.ui.components.calendar.ContainerEventProvider; -import com.vaadin.ui.components.calendar.event.BasicEvent; -import com.vaadin.ui.components.calendar.event.CalendarEvent; +import com.vaadin.v7.data.Container.Indexed; +import com.vaadin.v7.data.Container.Sortable; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.BeanItemContainer; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.Calendar; +import com.vaadin.v7.ui.components.calendar.ContainerEventProvider; +import com.vaadin.v7.ui.components.calendar.event.BasicEvent; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; public class ContainerDataSourceTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerEventProviderTest.java index 401b5861ce..84ab1edaa2 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/calendar/ContainerEventProviderTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/calendar/ContainerEventProviderTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.calendar; +package com.vaadin.v7.tests.server.component.calendar; import java.util.Calendar; import java.util.Date; @@ -22,9 +22,9 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.BeanItemContainer; -import com.vaadin.ui.components.calendar.ContainerEventProvider; -import com.vaadin.ui.components.calendar.event.CalendarEvent; +import com.vaadin.v7.data.util.BeanItemContainer; +import com.vaadin.v7.ui.components.calendar.ContainerEventProvider; +import com.vaadin.v7.ui.components.calendar.event.CalendarEvent; /** * diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java index 2e3b8e412e..cd72febc0f 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/AbstractColorPickerDeclarativeTest.java @@ -13,23 +13,23 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.colorpicker; +package com.vaadin.v7.tests.server.component.colorpicker; import org.junit.Test; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.AbstractColorPicker; -import com.vaadin.ui.AbstractColorPicker.PopupStyle; -import com.vaadin.ui.ColorPicker; -import com.vaadin.ui.ColorPickerArea; +import com.vaadin.v7.ui.AbstractColorPicker; +import com.vaadin.v7.ui.AbstractColorPicker.PopupStyle; +import com.vaadin.v7.ui.ColorPicker; +import com.vaadin.v7.ui.ColorPickerArea; public class AbstractColorPickerDeclarativeTest extends DeclarativeTestBase<AbstractColorPicker> { @Test public void testAllAbstractColorPickerFeatures() { - String design = "<vaadin-color-picker color='#fafafa' default-caption-enabled position='100,100'" + String design = "<vaadin7-color-picker color='#fafafa' default-caption-enabled position='100,100'" + " popup-style='simple' rgb-visibility='false' hsv-visibility='false'" + " history-visibility=false textfield-visibility=false />"; ColorPicker colorPicker = new ColorPicker(); @@ -50,7 +50,7 @@ public class AbstractColorPickerDeclarativeTest @Test public void testEmptyColorPicker() { - String design = "<vaadin-color-picker />"; + String design = "<vaadin7-color-picker />"; ColorPicker colorPicker = new ColorPicker(); testRead(design, colorPicker); testWrite(design, colorPicker); @@ -58,7 +58,7 @@ public class AbstractColorPickerDeclarativeTest @Test public void testAllAbstractColorPickerAreaFeatures() { - String design = "<vaadin-color-picker-area color='#fafafa' default-caption-enabled position='100,100'" + String design = "<vaadin7-color-picker-area color='#fafafa' default-caption-enabled position='100,100'" + " popup-style='simple' rgb-visibility='false' hsv-visibility='false'" + " history-visibility=false textfield-visibility=false />"; AbstractColorPicker colorPicker = new ColorPickerArea(); @@ -79,7 +79,7 @@ public class AbstractColorPickerDeclarativeTest @Test public void testEmptyColorPickerArea() { - String design = "<vaadin-color-picker-area />"; + String design = "<vaadin7-color-picker-area />"; AbstractColorPicker colorPicker = new ColorPickerArea(); testRead(design, colorPicker); testWrite(design, colorPicker); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/ColorConversionsTest.java index a55ed89691..7865be46da 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/colorpicker/ColorConversionsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/colorpicker/ColorConversionsTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.colorpicker; +package com.vaadin.v7.tests.server.component.colorpicker; import static org.junit.Assert.assertEquals; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java index 482267f63d..09dc1378e9 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.combobox; +package com.vaadin.v7.tests.server.component.combobox; import org.junit.Test; import com.vaadin.shared.ui.combobox.FilteringMode; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.ComboBox; +import com.vaadin.v7.ui.ComboBox; public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> { @@ -38,7 +38,7 @@ public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> { } private String getReadOnlyWithOptionsDesign() { - return "<vaadin-combo-box text-input-allowed='false'><option>Hello</option><option>World</option></vaadin-combo-box>"; + return "<vaadin7-combo-box text-input-allowed='false'><option>Hello</option><option>World</option></vaadin7-combo-box>"; } @Test @@ -59,7 +59,7 @@ public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> { @Test public void testReadOnlyValue() { - String design = "<vaadin-combo-box readonly value='foo'><option selected>foo</option></vaadin-combo-box>"; + String design = "<vaadin7-combo-box readonly value='foo'><option selected>foo</option></vaadin7-combo-box>"; ComboBox comboBox = new ComboBox(); comboBox.addItems("foo", "bar"); @@ -69,12 +69,12 @@ public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> { testRead(design, comboBox); // Selects items are not written out by default - String design2 = "<vaadin-combo-box readonly></vaadin-combo-box>"; + String design2 = "<vaadin7-combo-box readonly></vaadin7-combo-box>"; testWrite(design2, comboBox); } private String getBasicDesign() { - return "<vaadin-combo-box input-prompt=\"Select something\" filtering-mode=\"off\" scroll-to-selected-item='false'>"; + return "<vaadin7-combo-box input-prompt=\"Select something\" filtering-mode=\"off\" scroll-to-selected-item='false'>"; } private ComboBox getBasicExpected() { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java index e8ca64895a..1e0233f76a 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/combobox/ComboBoxStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.combobox; +package com.vaadin.v7.tests.server.component.combobox; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.combobox.ComboBoxState; -import com.vaadin.ui.ComboBox; +import com.vaadin.v7.ui.ComboBox; /** * Tests for ComboBox state. diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java index 5b4e8c7352..a5166f9373 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/DateFieldConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.tests.server.component.datefield; +package com.vaadin.v7.tests.server.component.datefield; import java.util.Date; import java.util.Locale; @@ -22,23 +22,23 @@ import java.util.Locale; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Property; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.ui.LegacyDateField; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.ui.DateField; public class DateFieldConverterTest { private Property<Long> date; - private LegacyDateField datefield; + private DateField datefield; @Before public void setUp() { date = new ObjectProperty<Long>(0L); - datefield = new LegacyDateField(); + datefield = new DateField(); datefield.setBuffered(false); - datefield.setConverter(new LegacyConverter<Date, Long>() { + datefield.setConverter(new Converter<Date, Long>() { @Override public Long convertToModel(Date value, diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java index 3ac1b6af32..e001a3327f 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.datefield; +package com.vaadin.v7.tests.server.component.datefield; import java.text.SimpleDateFormat; import java.util.Date; @@ -23,23 +23,23 @@ import org.junit.Test; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.v7.ui.LegacyDateField; +import com.vaadin.v7.ui.DateField; /** - * Tests the declarative support for implementations of {@link LegacyDateField}. + * Tests the declarative support for implementations of {@link DateField}. * * @author Vaadin Ltd * @since 7.4 */ public class LegacyDateFieldDeclarativeTest - extends DeclarativeTestBase<LegacyDateField> { + extends DeclarativeTestBase<DateField> { private String getYearResolutionDesign() { - return "<vaadin7-legacy-date-field resolution='year' value='2020'/>"; + return "<vaadin7-date-field resolution='year' value='2020'/>"; } - private LegacyDateField getYearResolutionExpected() { - LegacyDateField df = new LegacyDateField(); + private DateField getYearResolutionExpected() { + DateField df = new DateField(); df.setResolution(Resolution.YEAR); df.setValue(new Date(2020 - 1900, 1 - 1, 1)); return df; @@ -48,12 +48,12 @@ public class LegacyDateFieldDeclarativeTest private String getTimezoneDesign() { String timeZone = new SimpleDateFormat("Z").format(new Date()); return String.format( - "<vaadin7-legacy-date-field range-start=\"2014-05-05 00:00:00%1$s\" range-end=\"2014-06-05 00:00:00%1$s\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient show-iso-week-numbers parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00%1$s\"/>", + "<vaadin7-date-field range-start=\"2014-05-05 00:00:00%1$s\" range-end=\"2014-06-05 00:00:00%1$s\" date-out-of-range-message=\"Please select a sensible date\" date-format=\"yyyy-MM-dd\" lenient show-iso-week-numbers parse-error-message=\"You are doing it wrong\" time-zone=\"GMT+05:00\" value=\"2014-05-15 00:00:00%1$s\"/>", timeZone); } - private LegacyDateField getTimezoneExpected() { - LegacyDateField df = new LegacyDateField(); + private DateField getTimezoneExpected() { + DateField df = new DateField(); df.setRangeStart(new Date(2014 - 1900, 5 - 1, 5)); df.setRangeEnd(new Date(2014 - 1900, 6 - 1, 5)); @@ -99,9 +99,9 @@ public class LegacyDateFieldDeclarativeTest public void testReadOnlyValue() { Date date = new Date(2020 - 1900, 1 - 1, 1); String timeZone = new SimpleDateFormat("Z").format(date); - String design = "<vaadin7-legacy-date-field readonly resolution='year' value='2020-01-01 00:00:00" + String design = "<vaadin7-date-field readonly resolution='year' value='2020-01-01 00:00:00" + timeZone + "'/>"; - LegacyDateField df = new LegacyDateField(); + DateField df = new DateField(); df.setResolution(Resolution.YEAR); df.setValue(date); df.setReadOnly(true); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java index 0777a0c782..e6316cec3f 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/datefield/LegacyPopupDateFieldDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.datefield; +package com.vaadin.v7.tests.server.component.datefield; import java.util.Date; @@ -21,27 +21,23 @@ import org.junit.Test; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.v7.ui.LegacyPopupDateField; +import com.vaadin.v7.ui.PopupDateField; /** - * Tests the declarative support for implementations of - * {@link LegacyPopupDateField}. + * Tests the declarative support for implementations of {@link PopupDateField}. * * @since 7.4 * @author Vaadin Ltd */ -public class LegacyPopupDateFieldDeclarativeTest - extends DeclarativeTestBase<LegacyPopupDateField> { - - private static final String TAG_NAME = "com_vaadin_v7_ui-legacy-popup-date-field"; +public class PopupDateFieldDeclarativeTest + extends DeclarativeTestBase<PopupDateField> { private String getBasicDesign() { - return "<" + TAG_NAME - + " assistive-text='at' text-field-enabled='false' show-iso-week-numbers resolution=\"MINUTE\" range-end=\"2019-01-15\" input-prompt=\"Pick a day\" value=\"2003-02-27 07:15\"></vaadin-popup-date-field>"; + return "<vaadin7-popup-date-field assistive-text='at' text-field-enabled='false' show-iso-week-numbers resolution=\"MINUTE\" range-end=\"2019-01-15\" input-prompt=\"Pick a day\" value=\"2003-02-27 07:15\"></vaadin7-popup-date-field>"; } - private LegacyPopupDateField getBasicExpected() { - LegacyPopupDateField pdf = new LegacyPopupDateField(); + private PopupDateField getBasicExpected() { + PopupDateField pdf = new PopupDateField(); pdf.setShowISOWeekNumbers(true); pdf.setResolution(Resolution.MINUTE); pdf.setRangeEnd(new Date(2019 - 1900, 1 - 1, 15)); @@ -62,12 +58,4 @@ public class LegacyPopupDateFieldDeclarativeTest testRead(getBasicDesign(), getBasicExpected()); } - @Override - public LegacyPopupDateField testRead(String design, - LegacyPopupDateField expected) { - return super.testRead( - "<html><head><meta charset='UTF-8' name='package-mapping' content='com_vaadin_v7_ui:com.vaadin.v7.ui'></head> " - + design + "</html>", - expected); - } } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java index f5c315b440..5b8dac9002 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/BeanFieldGroupTest.java @@ -1,18 +1,18 @@ -package com.vaadin.tests.server.component.fieldgroup; +package com.vaadin.v7.tests.server.component.fieldgroup; import static org.junit.Assert.assertEquals; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Item; -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.ui.RichTextArea; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.Item; +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.ui.Field; +import com.vaadin.v7.ui.RichTextArea; +import com.vaadin.v7.ui.TextField; public class BeanFieldGroupTest { @@ -72,10 +72,10 @@ public class BeanFieldGroupTest { public static class ViewStub { - LegacyTextField basicField = new LegacyTextField(); + TextField basicField = new TextField(); @PropertyId("anotherField") - LegacyTextField boundWithAnnotation = new LegacyTextField(); + TextField boundWithAnnotation = new TextField(); } @SuppressWarnings("unchecked") @@ -87,13 +87,13 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bindFields = BeanFieldGroup .bindFieldsUnbuffered(myBean, viewStub); - LegacyField<String> field = (LegacyField<String>) bindFields + Field<String> field = (Field<String>) bindFields .getField("basicField"); Assert.assertEquals(DEFAULT_FOR_BASIC_FIELD, myBean.basicField); field.setValue("Foo"); Assert.assertEquals("Foo", myBean.basicField); - field = (LegacyField<String>) bindFields.getField("anotherField"); + field = (Field<String>) bindFields.getField("anotherField"); field.setValue("Foo"); Assert.assertEquals("Foo", myBean.anotherField); } @@ -107,12 +107,12 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bindFields = BeanFieldGroup .bindFieldsBuffered(myBean, viewStub); - LegacyField<String> basicField = (LegacyField<String>) bindFields + Field<String> basicField = (Field<String>) bindFields .getField("basicField"); basicField.setValue("Foo"); Assert.assertEquals(DEFAULT_FOR_BASIC_FIELD, myBean.basicField); - LegacyField<String> anotherField = (LegacyField<String>) bindFields + Field<String> anotherField = (Field<String>) bindFields .getField("anotherField"); anotherField.setValue("Foo"); Assert.assertNull(myBean.anotherField); @@ -132,7 +132,7 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bfg = new BeanFieldGroup<MyBean>(MyBean.class); bfg.setItemDataSource(bean); - com.vaadin.v7.ui.LegacyField<?> helloField = bfg + com.vaadin.v7.ui.Field<?> helloField = bfg .buildAndBind("Hello string", "nestedBean.hello"); assertEquals(bean.nestedBean.hello, helloField.getValue().toString()); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java index a324c02cfc..3e1aa92491 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/CaseInsensitiveBindingTest.java @@ -1,14 +1,14 @@ -package com.vaadin.tests.server.component.fieldgroup; +package com.vaadin.v7.tests.server.component.fieldgroup; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; import com.vaadin.ui.FormLayout; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.fieldgroup.FieldGroup; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; +import com.vaadin.v7.ui.TextField; public class CaseInsensitiveBindingTest { @@ -18,7 +18,7 @@ public class CaseInsensitiveBindingTest { item.addItemProperty("LastName", new ObjectProperty<String>("Sparrow")); class MyForm extends FormLayout { - LegacyTextField lastName = new LegacyTextField("Last name"); + TextField lastName = new TextField("Last name"); public MyForm() { @@ -41,7 +41,7 @@ public class CaseInsensitiveBindingTest { item.addItemProperty("first_name", new ObjectProperty<String>("Jack")); class MyForm extends FormLayout { - LegacyTextField firstName = new LegacyTextField("First name"); + TextField firstName = new TextField("First name"); public MyForm() { // Should bind to the first_name property @@ -65,7 +65,7 @@ public class CaseInsensitiveBindingTest { item.addItemProperty("firstName", new ObjectProperty<String>("This")); class MyForm extends FormLayout { - LegacyTextField firstName = new LegacyTextField("First name"); + TextField firstName = new TextField("First name"); public MyForm() { // should bind to the firstName property, not first_name diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupTest.java index 43d2bf8a6a..99a2daa547 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.fieldgroup; +package com.vaadin.v7.tests.server.component.fieldgroup; import java.util.Arrays; import java.util.Collection; @@ -25,14 +25,14 @@ import java.util.Set; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.data.fieldgroup.FieldGroup.CommitException; -import com.vaadin.data.util.AbstractProperty; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.ui.LegacyField; -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.AbstractProperty; +import com.vaadin.v7.ui.Field; +import com.vaadin.v7.ui.TextField; /** * @@ -46,7 +46,7 @@ public class FieldGroupTest { public void setReadOnly_readOnlyAndNoDataSource_fieldIsReadOnly() { FieldGroup fieldGroup = new FieldGroup(); - LegacyTextField field = new LegacyTextField(); + TextField field = new TextField(); fieldGroup.bind(field, "property"); fieldGroup.setReadOnly(true); @@ -58,7 +58,7 @@ public class FieldGroupTest { public void setReadOnly_writableAndNoDataSource_fieldIsWritable() { FieldGroup fieldGroup = new FieldGroup(); - LegacyTextField field = new LegacyTextField(); + TextField field = new TextField(); fieldGroup.bind(field, "property"); fieldGroup.setReadOnly(false); @@ -73,23 +73,23 @@ public class FieldGroupTest { fieldGroup.setItemDataSource(new TestItem()); - LegacyTextField field1 = new LegacyTextField(); + TextField field1 = new TextField(); field1.setRequired(true); fieldGroup.bind(field1, "prop1"); - LegacyTextField field2 = new LegacyTextField(); + TextField field2 = new TextField(); field2.setRequired(true); fieldGroup.bind(field2, "prop2"); - Set<LegacyTextField> set = new HashSet<>(Arrays.asList(field1, field2)); + Set<TextField> set = new HashSet<>(Arrays.asList(field1, field2)); try { fieldGroup.commit(); Assert.fail("No commit exception is thrown"); } catch (CommitException exception) { - Map<LegacyField<?>, ? extends InvalidValueException> invalidFields = exception + Map<Field<?>, ? extends InvalidValueException> invalidFields = exception .getInvalidFields(); - for (Entry<LegacyField<?>, ? extends InvalidValueException> entry : invalidFields + for (Entry<Field<?>, ? extends InvalidValueException> entry : invalidFields .entrySet()) { set.remove(entry.getKey()); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java index f14b966a2d..8957e04771 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldGroupWithReadOnlyPropertiesTest.java @@ -1,19 +1,19 @@ -package com.vaadin.tests.server.component.fieldgroup; +package com.vaadin.v7.tests.server.component.fieldgroup; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.data.util.BeanItem; import com.vaadin.tests.data.bean.BeanWithReadOnlyField; -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; public class FieldGroupWithReadOnlyPropertiesTest { - private LegacyTextField readOnlyField = new LegacyTextField(); - private LegacyTextField writableField = new LegacyTextField(); + private TextField readOnlyField = new TextField(); + private TextField writableField = new TextField(); @Test public void bindReadOnlyPropertyToFieldGroup() { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java index 0ef30316ac..bd9f206751 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/fieldgroup/FieldNamedDescriptionTest.java @@ -1,15 +1,15 @@ -package com.vaadin.tests.server.component.fieldgroup; +package com.vaadin.v7.tests.server.component.fieldgroup; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.data.fieldgroup.PropertyId; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertysetItem; import com.vaadin.ui.FormLayout; -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.ObjectProperty; +import com.vaadin.v7.data.util.PropertysetItem; +import com.vaadin.v7.ui.TextField; public class FieldNamedDescriptionTest { @@ -24,12 +24,12 @@ public class FieldNamedDescriptionTest { // Define a form as a class that extends some layout class MyForm extends FormLayout { // Member that will bind to the "name" property - LegacyTextField name = new LegacyTextField("Name"); + TextField name = new TextField("Name"); // This member will not bind to the desctiptionProperty as the name // description conflicts with something in the binding process @PropertyId("description") - LegacyTextField description = new LegacyTextField("Description"); + TextField description = new TextField("Description"); public MyForm() { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridAddRowBuiltinContainerTest.java index 3bff93c042..f9f7d8e3c8 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridAddRowBuiltinContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridAddRowBuiltinContainerTest.java @@ -13,22 +13,22 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.util.BeanItem; -import com.vaadin.data.util.BeanItemContainer; -import com.vaadin.data.util.MethodProperty.MethodException; import com.vaadin.tests.data.bean.Person; -import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.BeanItem; +import com.vaadin.v7.data.util.BeanItemContainer; +import com.vaadin.v7.data.util.MethodProperty.MethodException; +import com.vaadin.v7.ui.Grid; public class GridAddRowBuiltinContainerTest { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); Container.Indexed container; @Before diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java index 5897a1fc2d..7a599f2745 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridChildrenTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridChildrenTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import java.util.Iterator; @@ -22,15 +22,15 @@ import org.junit.Test; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.FooterCell; -import com.vaadin.ui.LegacyGrid.HeaderCell; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.FooterCell; +import com.vaadin.v7.ui.Grid.HeaderCell; public class GridChildrenTest { @Test public void componentsInMergedHeader() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("foo"); grid.addColumn("bar"); grid.addColumn("baz"); @@ -45,7 +45,7 @@ public class GridChildrenTest { @Test public void componentsInMergedFooter() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("foo"); grid.addColumn("bar"); grid.addColumn("baz"); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnAddingAndRemovingTest.java index e5c46e3ba2..a9e6b90438 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnAddingAndRemovingTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnAddingAndRemovingTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -22,14 +22,14 @@ import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Property; -import com.vaadin.data.util.IndexedContainer; -import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.Grid; public class GridColumnAddingAndRemovingTest { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); Container.Indexed container; @Before @@ -104,7 +104,7 @@ public class GridColumnAddingAndRemovingTest { grid.getColumn("foo")); assertNotNull("Grid did should have a column for property bar", grid.getColumn("bar")); - for (LegacyGrid.Column column : grid.getColumns()) { + for (Grid.Column column : grid.getColumns()) { assertNotNull("Grid getColumns returned a null value", column); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnsTest.java index 769532b03b..a438bed25c 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridColumnsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridColumnsTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import static org.easymock.EasyMock.and; import static org.easymock.EasyMock.capture; @@ -39,20 +39,20 @@ import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.KeyMapper; import com.vaadin.shared.ui.grid.GridColumnState; import com.vaadin.shared.ui.grid.GridState; import com.vaadin.shared.util.SharedUtil; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.Column; -import com.vaadin.ui.LegacyGrid.ColumnResizeEvent; -import com.vaadin.ui.LegacyGrid.ColumnResizeListener; -import com.vaadin.v7.ui.LegacyTextField; +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.ColumnResizeEvent; +import com.vaadin.v7.ui.Grid.ColumnResizeListener; +import com.vaadin.v7.ui.TextField; public class GridColumnsTest { - private LegacyGrid grid; + private Grid grid; private GridState state; @@ -70,14 +70,14 @@ public class GridColumnsTest { ds.addContainerProperty("column" + c, String.class, ""); } ds.addContainerProperty("noSort", Object.class, null); - grid = new LegacyGrid(ds); + grid = new Grid(ds); - getStateMethod = LegacyGrid.class.getDeclaredMethod("getState"); + getStateMethod = Grid.class.getDeclaredMethod("getState"); getStateMethod.setAccessible(true); state = (GridState) getStateMethod.invoke(grid); - columnIdGeneratorField = LegacyGrid.class.getDeclaredField("columnKeys"); + columnIdGeneratorField = Grid.class.getDeclaredField("columnKeys"); columnIdGeneratorField.setAccessible(true); columnIdMapper = (KeyMapper<Object>) columnIdGeneratorField.get(grid); @@ -282,12 +282,12 @@ public class GridColumnsTest { @Test public void testPropertyAndColumnEditorFieldsMatch() { Column column1 = grid.getColumn("column1"); - column1.setEditorField(new LegacyTextField()); + column1.setEditorField(new TextField()); assertSame(column1.getEditorField(), grid.getColumn("column1").getEditorField()); Column column2 = grid.getColumn("column2"); - column2.setEditorField(new LegacyTextField()); + column2.setEditorField(new TextField()); assertSame(column2.getEditorField(), column2.getEditorField()); } @@ -333,7 +333,7 @@ public class GridColumnsTest { @Test public void testAddingColumnsWithSetColumns() { - LegacyGrid g = new LegacyGrid(); + Grid g = new Grid(); g.setColumns("c1", "c2", "c3"); Iterator<Column> it = g.getColumns().iterator(); assertEquals(it.next().getPropertyId(), "c1"); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerNotSortableTest.java index 6bbac2977c..742382ecb1 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerNotSortableTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerNotSortableTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import static org.junit.Assert.assertFalse; @@ -23,11 +23,11 @@ import java.util.Map; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.AbstractInMemoryContainer; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.Column; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.AbstractInMemoryContainer; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.Column; public class GridContainerNotSortableTest { @@ -88,12 +88,12 @@ public class GridContainerNotSortableTest { @Test public void testGridWithNotSortableContainer() { - new LegacyGrid(notSortableDataSource); + new Grid(notSortableDataSource); } @Test(expected = IllegalStateException.class) public void testNotSortableGridSetColumnSortable() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.setContainerDataSource(notSortableDataSource); Column column = grid.getColumn("Foo"); assertFalse("Column should not be sortable initially.", diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerTest.java index c865bd8494..4cee00af63 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridContainerTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridContainerTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import java.io.IOException; import java.io.ObjectOutputStream; @@ -22,12 +22,12 @@ import java.io.OutputStream; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.DetailsGenerator; -import com.vaadin.ui.LegacyGrid.RowReference; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.DetailsGenerator; +import com.vaadin.v7.ui.Grid.RowReference; public class GridContainerTest { @@ -42,7 +42,7 @@ public class GridContainerTest { @Test public void testDetailsGeneratorDoesNotResetOnContainerChange() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); DetailsGenerator detGen = new DetailsGenerator() { @Override @@ -83,7 +83,7 @@ public class GridContainerTest { @Test public void setColumnsOrder() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); IndexedContainer ic = new IndexedContainer(); ic.addContainerProperty("foo", String.class, ""); ic.addContainerProperty("baz", String.class, ""); @@ -98,7 +98,7 @@ public class GridContainerTest { @Test public void addColumnNotInContainer() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.setContainerDataSource(new IndexedContainer()); try { grid.addColumn("notInContainer"); @@ -113,7 +113,7 @@ public class GridContainerTest { @Test public void setColumnsForPropertyIdNotInContainer() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.setContainerDataSource(new IndexedContainer()); try { grid.setColumns("notInContainer", "notThereEither"); @@ -130,7 +130,7 @@ public class GridContainerTest { @Test(expected = IllegalStateException.class) public void multipleAddColumnsForDefaultContainer() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("foo"); grid.addColumn("foo"); } @@ -138,7 +138,7 @@ public class GridContainerTest { @Test public void testSerializeRpcDataProviderWithRowChanges() throws IOException { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); IndexedContainer container = new IndexedContainer(); grid.setContainerDataSource(container); container.addItem(); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorTest.java index 6fe47b22a0..cc72df39ab 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridEditorTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,17 +30,17 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.fieldgroup.FieldGroup; -import com.vaadin.data.fieldgroup.FieldGroup.CommitException; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.MockVaadinSession; import com.vaadin.server.VaadinService; import com.vaadin.server.VaadinSession; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.fieldgroup.FieldGroup; +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.TextField; public class GridEditorTest { @@ -53,7 +53,7 @@ public class GridEditorTest { // Explicit field for the test session to save it from GC private VaadinSession session; - private final LegacyGrid grid = new LegacyGrid(); + private final Grid grid = new Grid(); private Method doEditMethod; @Before @@ -77,7 +77,7 @@ public class GridEditorTest { session.lock(); // Access to method for actual editing. - doEditMethod = LegacyGrid.class.getDeclaredMethod("doEditItem"); + doEditMethod = Grid.class.getDeclaredMethod("doEditItem"); doEditMethod.setAccessible(true); } @@ -148,7 +148,7 @@ public class GridEditorTest { @Test public void testSaveEditor() throws Exception { startEdit(); - LegacyTextField field = (LegacyTextField) grid.getColumn(PROPERTY_NAME) + TextField field = (TextField) grid.getColumn(PROPERTY_NAME) .getEditorField(); field.setValue("New Name"); @@ -165,7 +165,7 @@ public class GridEditorTest { public void testSaveEditorCommitFail() throws Exception { startEdit(); - ((LegacyTextField) grid.getColumn(PROPERTY_AGE).getEditorField()) + ((TextField) grid.getColumn(PROPERTY_AGE).getEditorField()) .setValue("Invalid"); try { // Manual fail instead of @Test(expected=...) to check it is @@ -181,7 +181,7 @@ public class GridEditorTest { @Test public void testCancelEditor() throws Exception { startEdit(); - LegacyTextField field = (LegacyTextField) grid.getColumn(PROPERTY_NAME) + TextField field = (TextField) grid.getColumn(PROPERTY_NAME) .getEditorField(); field.setValue("New Name"); @@ -218,7 +218,7 @@ public class GridEditorTest { @Test public void testCustomBinding() { - LegacyTextField textField = new LegacyTextField(); + TextField textField = new TextField(); grid.getColumn(PROPERTY_NAME).setEditorField(textField); startEdit(); @@ -236,7 +236,7 @@ public class GridEditorTest { public void testFieldIsNotReadonly() { startEdit(); - LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); + Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); assertFalse(field.isReadOnly()); } @@ -245,13 +245,13 @@ public class GridEditorTest { startEdit(); grid.getEditorFieldGroup().setReadOnly(true); - LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); + Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); assertTrue(field.isReadOnly()); } @Test public void testColumnRemoved() { - LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); + Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); assertSame("field should be attached to ", grid, field.getParent()); @@ -262,10 +262,10 @@ public class GridEditorTest { @Test public void testSetFieldAgain() { - LegacyTextField field = new LegacyTextField(); + TextField field = new TextField(); grid.getColumn(PROPERTY_NAME).setEditorField(field); - field = new LegacyTextField(); + field = new TextField(); grid.getColumn(PROPERTY_NAME).setEditorField(field); assertSame("new field should be used.", field, diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridExtensionTest.java index 3bba51ab17..5c1afb2628 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridExtensionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridExtensionTest.java @@ -13,27 +13,27 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.AbstractGridExtension; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.AbstractGridExtension; public class GridExtensionTest { public static class DummyGridExtension extends AbstractGridExtension { - public DummyGridExtension(LegacyGrid grid) { + public DummyGridExtension(Grid grid) { super(grid); } } @Test public void testCreateExtension() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); DummyGridExtension dummy = new DummyGridExtension(grid); assertTrue("DummyGridExtension never made it to Grid", grid.getExtensions().contains(dummy)); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridSelectionTest.java index 1a2011de73..e3eb01e273 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridSelectionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridSelectionTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,12 +24,12 @@ import java.util.Collection; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.SelectionMode; -import com.vaadin.ui.LegacyGrid.SelectionModel; +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.Grid.SelectionModel; public class GridSelectionTest { @@ -64,7 +64,7 @@ public class GridSelectionTest { } } - private LegacyGrid grid; + private Grid grid; private MockSelectionChangeListener mockListener; private final Object itemId1Present = "itemId1Present"; @@ -90,7 +90,7 @@ public class GridSelectionTest { assertFalse("itemId2NotPresent", container.containsId(itemId2NotPresent)); - grid = new LegacyGrid(container); + grid = new Grid(container); mockListener = new MockSelectionChangeListener(); grid.addSelectionListener(mockListener); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStateTest.java index 9f5f67d8be..2170af060d 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.grid.GridState; -import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.ui.Grid; /** * Tests for Grid State. @@ -29,7 +29,7 @@ public class GridStateTest { @Test public void getPrimaryStyleName_gridHasCustomPrimaryStyleName() { - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); GridState state = new GridState(); Assert.assertEquals("Unexpected primary style name", state.primaryStyleName, grid.getPrimaryStyleName()); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStaticSectionTest.java index 95daf47e25..dc7119042d 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/GridStaticSectionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/GridStaticSectionTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -24,11 +24,11 @@ import java.lang.reflect.Method; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container.Indexed; -import com.vaadin.data.util.IndexedContainer; -import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.data.Container.Indexed; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.Grid; -public class GridStaticSectionTest extends LegacyGrid { +public class GridStaticSectionTest extends Grid { private Indexed dataSource = new IndexedContainer(); @@ -117,10 +117,10 @@ public class GridStaticSectionTest extends LegacyGrid { private void sanityCheck() throws Throwable { Method sanityCheckHeader; try { - sanityCheckHeader = LegacyGrid.Header.class + sanityCheckHeader = Grid.Header.class .getDeclaredMethod("sanityCheck"); sanityCheckHeader.setAccessible(true); - Method sanityCheckFooter = LegacyGrid.Footer.class + Method sanityCheckFooter = Grid.Footer.class .getDeclaredMethod("sanityCheck"); sanityCheckFooter.setAccessible(true); sanityCheckHeader.invoke(getHeader()); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java index 54e9b30988..7a658fd31f 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/MultiSelectionModelTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import java.util.ArrayList; import java.util.Arrays; @@ -24,13 +24,13 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.MultiSelectionModel; -import com.vaadin.ui.LegacyGrid.SelectionMode; +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.MultiSelectionModel; +import com.vaadin.v7.ui.Grid.SelectionMode; public class MultiSelectionModelTest { @@ -41,7 +41,7 @@ public class MultiSelectionModelTest { private Object itemIdNotPresent = "itemIdNotPresent"; private Container.Indexed dataSource; private MultiSelectionModel model; - private LegacyGrid grid; + private Grid grid; private boolean expectingEvent = false; private boolean expectingDeselectEvent; @@ -51,7 +51,7 @@ public class MultiSelectionModelTest { @Before public void setUp() { dataSource = createDataSource(); - grid = new LegacyGrid(dataSource); + grid = new Grid(dataSource); grid.setSelectionMode(SelectionMode.MULTI); model = (MultiSelectionModel) grid.getSelectionModel(); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java index 3183ad9021..d81bf62c02 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/SingleSelectionModelTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java @@ -13,20 +13,20 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.SelectionMode; -import com.vaadin.ui.LegacyGrid.SingleSelectionModel; +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.SelectionMode; +import com.vaadin.v7.ui.Grid.SingleSelectionModel; public class SingleSelectionModelTest { @@ -36,14 +36,14 @@ public class SingleSelectionModelTest { private Object itemIdNotPresent = "itemIdNotPresent"; private Container.Indexed dataSource; private SingleSelectionModel model; - private LegacyGrid grid; + private Grid grid; private boolean expectingEvent = false; @Before public void setUp() { dataSource = createDataSource(); - grid = new LegacyGrid(dataSource); + grid = new Grid(dataSource); grid.setSelectionMode(SelectionMode.SINGLE); model = (SingleSelectionModel) grid.getSelectionModel(); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/TestGrid.java index 9b2dde4d24..400c10eb5d 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/TestGrid.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/TestGrid.java @@ -13,17 +13,17 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid; +package com.vaadin.v7.tests.server.component.grid; import java.lang.reflect.Field; import org.easymock.EasyMock; -import com.vaadin.data.util.IndexedContainer; -import com.vaadin.server.communication.data.RpcDataProviderExtension; import com.vaadin.ui.ConnectorTracker; -import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.UI; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.server.communication.data.RpcDataProviderExtension; +import com.vaadin.v7.ui.Grid; /** * A Grid attached to a mock UI with a mock ConnectorTracker. @@ -31,7 +31,7 @@ import com.vaadin.ui.UI; * @since 7.4 * @author Vaadin Ltd */ -public class TestGrid extends LegacyGrid { +public class TestGrid extends Grid { public TestGrid() { super(); @@ -44,7 +44,7 @@ public class TestGrid extends LegacyGrid { } public RpcDataProviderExtension getDataProvider() throws Exception { - Field dseField = LegacyGrid.class.getDeclaredField("datasourceExtension"); + Field dseField = Grid.class.getDeclaredField("datasourceExtension"); dseField.setAccessible(true); return (RpcDataProviderExtension) dseField.get(this); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java index 5a2afed01c..b286c48c1b 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridColumnDeclarativeTest.java @@ -13,17 +13,17 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid.declarative; +package com.vaadin.v7.tests.server.component.grid.declarative; import org.junit.Test; -import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.ui.Grid; public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { @Test public void testSimpleGridColumns() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" + " <col sortable width='100' property-id='Column1'>" + " <col sortable=false max-width='200' expand='2' property-id='Column2'>" @@ -32,8 +32,8 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { + " <col sortable hidden property-id='Column5'>" + "</colgroup>" // + "<thead />" // - + "</table></vaadin-legacy-grid>"; - LegacyGrid grid = new LegacyGrid(); + + "</table></vaadin7-grid>"; + Grid grid = new Grid(); grid.addColumn("Column1", String.class).setWidth(100); grid.addColumn("Column2", String.class).setMaximumWidth(200) .setExpandRatio(2).setSortable(false); @@ -53,15 +53,15 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { @Test public void testReadColumnsWithoutPropertyId() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" + " <col sortable=true width='100' property-id='Column1'>" + " <col sortable=true max-width='200' expand='2'>" // property-id="property-1" + " <col sortable=true min-width='15' expand='1' property-id='Column3'>" + " <col sortable=true hidden=true hidable=true hiding-toggle-caption='col 4'>" // property-id="property-3" + "</colgroup>" // - + "</table></vaadin-legacy-grid>"; - LegacyGrid grid = new LegacyGrid(); + + "</table></vaadin7-grid>"; + Grid grid = new Grid(); grid.addColumn("Column1", String.class).setWidth(100); grid.addColumn("property-1", String.class).setMaximumWidth(200) .setExpandRatio(2); @@ -75,12 +75,12 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { @Test public void testReadEmptyExpand() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" + " <col sortable=true expand />" + "</colgroup>" // - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("property-0", String.class).setExpandRatio(1); testRead(design, grid); @@ -88,13 +88,13 @@ public class GridColumnDeclarativeTest extends GridDeclarativeTestBase { @Test public void testReadColumnWithNoAttributes() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" // + " <col />" // + "</colgroup>" // - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("property-0", String.class); testRead(design, grid); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java index 6d26b40996..df46c6c70a 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeAttributeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid.declarative; +package com.vaadin.v7.tests.server.component.grid.declarative; import static org.junit.Assert.assertSame; @@ -21,10 +21,10 @@ import org.junit.Test; import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.MultiSelectionModel; -import com.vaadin.ui.LegacyGrid.NoSelectionModel; -import com.vaadin.ui.LegacyGrid.SingleSelectionModel; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.MultiSelectionModel; +import com.vaadin.v7.ui.Grid.NoSelectionModel; +import com.vaadin.v7.ui.Grid.SingleSelectionModel; /** * Tests declarative support for Grid properties. @@ -32,16 +32,15 @@ import com.vaadin.ui.LegacyGrid.SingleSelectionModel; * @since * @author Vaadin Ltd */ -public class GridDeclarativeAttributeTest - extends DeclarativeTestBase<LegacyGrid> { +public class GridDeclarativeAttributeTest extends DeclarativeTestBase<Grid> { @Test public void testBasicAttributes() { - String design = "<vaadin-legacy-grid editable rows=20 frozen-columns=-1 " + String design = "<vaadin7-grid editable rows=20 frozen-columns=-1 " + "editor-save-caption='Tallenna' editor-cancel-caption='Peruuta' column-reordering-allowed>"; - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.setEditorEnabled(true); grid.setHeightMode(HeightMode.ROW); grid.setHeightByRows(20); @@ -56,10 +55,10 @@ public class GridDeclarativeAttributeTest @Test public void testFrozenColumnsAttributes() { - String design = "<vaadin-legacy-grid frozen-columns='2'><table>" // - + "<colgroup><col><col><col></colgroup></table></vaadin-legacy-grid>"; + String design = "<vaadin7-grid frozen-columns='2'><table>" // + + "<colgroup><col><col><col></colgroup></table></vaadin7-grid>"; - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("property-0", String.class); grid.addColumn("property-1", String.class); grid.addColumn("property-2", String.class); @@ -70,15 +69,15 @@ public class GridDeclarativeAttributeTest @Test public void testSelectionMode() { - String design = "<vaadin-legacy-grid selection-mode='none'>"; + String design = "<vaadin7-grid selection-mode='none'>"; assertSame(NoSelectionModel.class, read(design).getSelectionModel().getClass()); - design = "<vaadin-legacy-grid selection-mode='single'>"; + design = "<vaadin7-grid selection-mode='single'>"; assertSame(SingleSelectionModel.class, read(design).getSelectionModel().getClass()); - design = "<vaadin-legacy-grid selection-mode='multi'>"; + design = "<vaadin7-grid selection-mode='multi'>"; assertSame(MultiSelectionModel.class, read(design).getSelectionModel().getClass()); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeTestBase.java index 59ab5b8343..71a0c7987e 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridDeclarativeTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridDeclarativeTestBase.java @@ -13,34 +13,34 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid.declarative; +package com.vaadin.v7.tests.server.component.grid.declarative; import java.util.List; import org.junit.Assert; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.Column; -import com.vaadin.ui.LegacyGrid.FooterCell; -import com.vaadin.ui.LegacyGrid.FooterRow; -import com.vaadin.ui.LegacyGrid.HeaderCell; -import com.vaadin.ui.LegacyGrid.HeaderRow; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.Column; +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; -public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> { +public class GridDeclarativeTestBase extends DeclarativeTestBase<Grid> { @Override - public LegacyGrid testRead(String design, LegacyGrid expected) { + public Grid testRead(String design, Grid expected) { return testRead(design, expected, false); } - public LegacyGrid testRead(String design, LegacyGrid expected, boolean retestWrite) { + public Grid testRead(String design, Grid expected, boolean retestWrite) { return testRead(design, expected, retestWrite, false); } - public LegacyGrid testRead(String design, LegacyGrid expected, boolean retestWrite, + public Grid testRead(String design, Grid expected, boolean retestWrite, boolean writeData) { - LegacyGrid actual = super.testRead(design, expected); + Grid actual = super.testRead(design, expected); compareGridColumns(expected, actual); compareHeaders(expected, actual); @@ -53,7 +53,7 @@ public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> { return actual; } - private void compareHeaders(LegacyGrid expected, LegacyGrid actual) { + private void compareHeaders(Grid expected, Grid actual) { Assert.assertEquals("Different header row count", expected.getHeaderRowCount(), actual.getHeaderRowCount()); for (int i = 0; i < expected.getHeaderRowCount(); ++i) { @@ -91,7 +91,7 @@ public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> { } } - private void compareFooters(LegacyGrid expected, LegacyGrid actual) { + private void compareFooters(Grid expected, Grid actual) { Assert.assertEquals("Different footer row count", expected.getFooterRowCount(), actual.getFooterRowCount()); for (int i = 0; i < expected.getFooterRowCount(); ++i) { @@ -124,7 +124,7 @@ public class GridDeclarativeTestBase extends DeclarativeTestBase<LegacyGrid> { } } - private void compareGridColumns(LegacyGrid expected, LegacyGrid actual) { + private void compareGridColumns(Grid expected, Grid actual) { List<Column> columns = expected.getColumns(); List<Column> actualColumns = actual.getColumns(); Assert.assertEquals("Different amount of columns", columns.size(), diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java index ef536359be..8c7560685c 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridHeaderFooterDeclarativeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid.declarative; +package com.vaadin.v7.tests.server.component.grid.declarative; import org.jsoup.nodes.Element; import org.jsoup.parser.Tag; @@ -22,18 +22,18 @@ import org.junit.Test; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.Column; -import com.vaadin.ui.LegacyGrid.FooterRow; -import com.vaadin.ui.LegacyGrid.HeaderRow; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.Column; +import com.vaadin.v7.ui.Grid.FooterRow; +import com.vaadin.v7.ui.Grid.HeaderRow; public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testSingleDefaultHeader() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + " <col sortable property-id='Column2'>" @@ -42,9 +42,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { + "<thead>" + " <tr default><th plain-text>Column1<th plain-text>Column2<th plain-text>Column3</tr>" + "</thead>" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.addColumn("Column2", String.class); grid.addColumn("Column3", String.class); @@ -56,7 +56,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testSingleDefaultHTMLHeader() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + " <col sortable property-id='Column2'>" @@ -64,9 +64,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { + "<thead>" + " <tr default><th>Column1<th>Column2<th>Column3</tr>" + "</thead>" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.addColumn("Column2", String.class); grid.addColumn("Column3", String.class); @@ -83,14 +83,14 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testNoHeaderRows() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + "</colgroup>" + "<thead />" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.removeHeaderRow(grid.getDefaultHeaderRow()); @@ -101,7 +101,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testMultipleHeadersWithColSpans() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + " <col sortable property-id='Column2'>" @@ -112,9 +112,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { + " <tr default><th>Column1<th>Column2<th>Column3</tr>" + " <tr><th>Foo<th colspan=2>Bar</tr>" + "</thead>" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.addColumn("Column2", String.class); grid.addColumn("Column3", String.class); @@ -137,7 +137,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testSingleDefaultFooter() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + " <col sortable property-id='Column2'>" @@ -147,9 +147,9 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { + "<tfoot>" + " <tr><td plain-text>Column1<td plain-text>Column2<td plain-text>Column3</tr>" + "</tfoot>" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.addColumn("Column2", String.class); grid.addColumn("Column3", String.class); @@ -168,19 +168,19 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testSingleDefaultHTMLFooter() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + " <col sortable property-id='Column2'>" + " <col sortable property-id='Column3'>" + "</colgroup>" + "<thead />" // No headers read or written - + "<tfoot>" - + " <tr><td>Column1<td>Column2<td>Column3</tr>" - + "</tfoot>" - + "</table></vaadin-legacy-grid>"; + + "<tfoot>" + + " <tr><td>Column1<td>Column2<td>Column3</tr>" + + "</tfoot>" + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.addColumn("Column2", String.class); grid.addColumn("Column3", String.class); @@ -199,7 +199,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testMultipleFootersWithColSpans() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + " <col sortable property-id='Column2'>" @@ -208,13 +208,13 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { + "<thead />" // No headers read or written. + "<tfoot>" + " <tr><td colspan=3>Baz</tr>" - + " <tr><td>Column1<td>Column2<td>Column3</tr>" - + " <tr><td>Foo<td colspan=2>Bar</tr>" - + "</tfoot>" - + "</table></vaadin-legacy-grid>"; + + " <tr><td>Column1<td>Column2<td>Column3</tr>" + + " <tr><td>Foo<td colspan=2>Bar</tr>" + + "</tfoot>" + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.addColumn("Column2", String.class); grid.addColumn("Column3", String.class); @@ -239,19 +239,19 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testComponentInGridHeader() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + "</colgroup>" + "<thead>" + "<tr default><th><vaadin-label><b>Foo</b></vaadin-label></tr>" + "</thead>" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; //@formatter:on Label component = new Label("<b>Foo</b>"); component.setContentMode(ContentMode.HTML); - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.getDefaultHeaderRow().getCell("Column1").setComponent(component); @@ -262,21 +262,21 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testComponentInGridFooter() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable property-id='Column1'>" + "</colgroup>" + "<thead />" // No headers read or written - + "<tfoot>" + + "<tfoot>" + "<tr><td><vaadin-label><b>Foo</b></vaadin-label></tr>" - + "</tfoot>" - + "</table></vaadin-legacy-grid>"; + + "</tfoot>" + + "</table></vaadin7-grid>"; //@formatter:on Label component = new Label("<b>Foo</b>"); component.setContentMode(ContentMode.HTML); - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Column1", String.class); grid.prependFooterRow().getCell("Column1").setComponent(component); grid.removeHeaderRow(grid.getDefaultHeaderRow()); @@ -288,7 +288,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { @Test public void testHtmlEntitiesinGridHeaderFooter() { //@formatter:off - String design = "<vaadin-legacy-grid><table>" + String design = "<vaadin7-grid><table>" + "<colgroup>" + " <col sortable=\"true\" property-id=\"> test\">" + "</colgroup>" @@ -299,10 +299,10 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { + " <tr><td plain-text=\"true\">> Test</td></tr>" + "</tfoot>" + "<tbody />" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; //@formatter:on - LegacyGrid grid = read(design); + Grid grid = read(design); String actualHeader = grid.getHeaderRow(0).getCell("> test").getText(); String actualFooter = grid.getFooterRow(0).getCell("> test").getText(); String expected = "> Test"; @@ -319,7 +319,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { Assert.assertEquals(expected, actualHeader); Assert.assertEquals(expected, actualFooter); - grid = new LegacyGrid(); + grid = new Grid(); grid.setColumns("test"); HeaderRow header = grid.addHeaderRowAt(0); FooterRow footer = grid.addFooterRowAt(0); @@ -329,7 +329,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { header.getCell("test").setText("& Test"); footer.getCell("test").setText("& Test"); - Element root = new Element(Tag.valueOf("vaadin-legacy-grid"), ""); + Element root = new Element(Tag.valueOf("vaadin7-grid"), ""); grid.writeDesign(root, new DesignContext()); Assert.assertEquals("&amp; Test", @@ -344,7 +344,7 @@ public class GridHeaderFooterDeclarativeTest extends GridDeclarativeTestBase { header.getCell("test").setHtml("& Test"); footer.getCell("test").setHtml("& Test"); - root = new Element(Tag.valueOf("vaadin-legacy-grid"), ""); + root = new Element(Tag.valueOf("vaadin7-grid"), ""); grid.writeDesign(root, new DesignContext()); Assert.assertEquals("& Test", diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java index 8bf03e9d5e..63eb1e7a66 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridInlineDataDeclarativeTest.java @@ -13,19 +13,19 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid.declarative; +package com.vaadin.v7.tests.server.component.grid.declarative; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.ui.Grid; public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testSimpleInlineData() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" + " <col sortable property-id='Col1' />" + "</colgroup>" // + "<thead />" // No headers read or written @@ -34,9 +34,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { + "<tr><td>Bar</tr>" // + "<tr><td>Baz</tr>" // + "</tbody>" // - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Col1", String.class); grid.addRow("Foo"); grid.addRow("Bar"); @@ -51,7 +51,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testMultipleColumnsInlineData() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" + " <col sortable property-id='Col1' />" + " <col sortable property-id='Col2' />" + " <col sortable property-id='Col3' />" // @@ -61,9 +61,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { + "<tr><td>Foo<td>Bar<td>Baz</tr>" // + "<tr><td>My<td>Summer<td>Car</tr>" // + "</tbody>" // - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Col1", String.class); grid.addColumn("Col2", String.class); grid.addColumn("Col3", String.class); @@ -79,7 +79,7 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testMultipleColumnsInlineDataReordered() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" + " <col sortable property-id='Col2' />" + " <col sortable property-id='Col3' />" + " <col sortable property-id='Col1' />" // @@ -89,9 +89,9 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { + "<tr><td>Bar<td>Baz<td>Foo</tr>" // + "<tr><td>Summer<td>Car<td>My</tr>" // + "</tbody>" // - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.addColumn("Col1", String.class); grid.addColumn("Col2", String.class); grid.addColumn("Col3", String.class); @@ -108,14 +108,14 @@ public class GridInlineDataDeclarativeTest extends GridDeclarativeTestBase { @Test public void testHtmlEntities() { - String design = "<vaadin-legacy-grid><table>"// + String design = "<vaadin7-grid><table>"// + "<colgroup>" + " <col property-id='test' />" + "</colgroup>" // + "<thead />" // No headers read or written + "<tbody>" // + " <tr><td>&Test</tr></td>" + "</tbody>" - + "</table></vaadin-legacy-grid>"; + + "</table></vaadin7-grid>"; - LegacyGrid read = read(design); + Grid read = read(design); Container cds = read.getContainerDataSource(); Assert.assertEquals("&Test", cds.getItem(cds.getItemIds().iterator().next()) diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java index 1a0e0a1102..0c03788348 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/declarative/GridStructureDeclarativeTest.java @@ -13,38 +13,38 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid.declarative; +package com.vaadin.v7.tests.server.component.grid.declarative; import org.junit.Test; -import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.declarative.DesignException; +import com.vaadin.v7.ui.Grid; public class GridStructureDeclarativeTest extends GridDeclarativeTestBase { @Test public void testReadEmptyGrid() { - String design = "<vaadin-legacy-grid />"; - testRead(design, new LegacyGrid(), false); + String design = "<vaadin7-grid />"; + testRead(design, new Grid(), false); } @Test public void testEmptyGrid() { - String design = "<vaadin-legacy-grid></vaadin-legacy-grid>"; - LegacyGrid expected = new LegacyGrid(); + String design = "<vaadin7-grid></vaadin7-grid>"; + Grid expected = new Grid(); testWrite(design, expected); testRead(design, expected, true); } @Test(expected = DesignException.class) public void testMalformedGrid() { - String design = "<vaadin-legacy-grid><vaadin-label /></vaadin-legacy-grid>"; - testRead(design, new LegacyGrid()); + String design = "<vaadin7-grid><vaadin-label /></vaadin7-grid>"; + testRead(design, new Grid()); } @Test(expected = DesignException.class) public void testGridWithNoColGroup() { - String design = "<vaadin-legacy-grid><table><thead><tr><th>Foo</tr></thead></table></vaadin-legacy-grid>"; - testRead(design, new LegacyGrid()); + String design = "<vaadin7-grid><table><thead><tr><th>Foo</tr></thead></table></vaadin7-grid>"; + testRead(design, new Grid()); } } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/sort/SortTest.java index beb774528f..b0100d46a3 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/grid/sort/SortTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/sort/SortTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.grid.sort; +package com.vaadin.v7.tests.server.component.grid.sort; import java.util.Arrays; import java.util.List; @@ -25,11 +25,11 @@ import org.junit.Test; import com.vaadin.data.sort.Sort; import com.vaadin.data.sort.SortOrder; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.SortEvent; import com.vaadin.event.SortEvent.SortListener; import com.vaadin.shared.data.sort.SortDirection; -import com.vaadin.ui.LegacyGrid; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.Grid; public class SortTest { @@ -93,7 +93,7 @@ public class SortTest { private DummySortingIndexedContainer container; private RegisteringSortChangeListener listener; - private LegacyGrid grid; + private Grid grid; @Before public void setUp() { @@ -102,7 +102,7 @@ public class SortTest { listener = new RegisteringSortChangeListener(); - grid = new LegacyGrid(container); + grid = new Grid(container); grid.addSortListener(listener); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectDeclarativeTest.java index f0fa4aad55..50993039af 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectDeclarativeTest.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.listselect; +package com.vaadin.v7.tests.server.component.listselect; import org.junit.Test; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.ListSelect; +import com.vaadin.v7.ui.ListSelect; public class ListSelectDeclarativeTest extends DeclarativeTestBase<ListSelect> { @@ -31,10 +31,10 @@ public class ListSelectDeclarativeTest extends DeclarativeTestBase<ListSelect> { } private String getWithOptionsDesign() { - return "<vaadin-list-select rows=10>\n" + return "<vaadin7-list-select rows=10>\n" + " <option>Male</option>\n" + " <option>Female</option>\n" - + "</vaadin-list-select>\n" + ""; + + "</vaadin7-list-select>\n" + ""; } @Test @@ -55,7 +55,7 @@ public class ListSelectDeclarativeTest extends DeclarativeTestBase<ListSelect> { } private String getBasicDesign() { - return "<vaadin-list-select caption='Hello' />"; + return "<vaadin7-list-select caption='Hello' />"; } @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java index 595909aa69..8a34077e73 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/listselect/ListSelectStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/listselect/ListSelectStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.listselect; +package com.vaadin.v7.tests.server.component.listselect; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.select.AbstractSelectState; -import com.vaadin.ui.ListSelect; +import com.vaadin.v7.ui.ListSelect; /** * Tests for ListSelect State. diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java index 853f38c7d3..e284416060 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/nativeselect/NativeSelectDeclarativeTest.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.nativeselect; +package com.vaadin.v7.tests.server.component.nativeselect; import org.junit.Test; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.NativeSelect; +import com.vaadin.v7.ui.NativeSelect; /** * Test cases for reading the properties of selection components. @@ -29,7 +29,7 @@ public class NativeSelectDeclarativeTest extends DeclarativeTestBase<NativeSelect> { public String getBasicDesign() { - return "<vaadin-native-select><option>foo</option><option>bar</option></vaadin-native-select>"; + return "<vaadin7-native-select><option>foo</option><option>bar</option></vaadin7-native-select>"; } @@ -52,7 +52,7 @@ public class NativeSelectDeclarativeTest @Test public void testReadOnlyValue() { - String design = "<vaadin-native-select readonly><option selected>foo</option><option>bar</option></vaadin-native-select>"; + String design = "<vaadin7-native-select readonly><option selected>foo</option><option>bar</option></vaadin7-native-select>"; NativeSelect ns = new NativeSelect(); ns.addItems("foo", "bar"); @@ -62,7 +62,7 @@ public class NativeSelectDeclarativeTest testRead(design, ns); // Selects items are not written out by default - String design2 = "<vaadin-native-select readonly></vaadin-native-select>"; + String design2 = "<vaadin7-native-select readonly></vaadin7-native-select>"; testWrite(design2, ns); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupListenersTest.java index 2c2a8a81fb..e9863ad92a 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupListenersTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.optiongroup; +package com.vaadin.v7.tests.server.component.optiongroup; import org.junit.Test; @@ -7,7 +7,7 @@ import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -import com.vaadin.ui.OptionGroup; +import com.vaadin.v7.ui.OptionGroup; public class OptionGroupListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java index a6d04576bc..f15c3aeb1e 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/optiongroup/OptionGroupStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/optiongroup/OptionGroupStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.optiongroup; +package com.vaadin.v7.tests.server.component.optiongroup; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.optiongroup.OptionGroupState; -import com.vaadin.ui.OptionGroup; +import com.vaadin.v7.ui.OptionGroup; /** * Tests for OptionGroup state. diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java index eec1781f81..4e0e06fdd3 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaDeclarativeTest.java @@ -13,20 +13,20 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.richtextarea; +package com.vaadin.v7.tests.server.component.richtextarea; import org.junit.Test; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.RichTextArea; +import com.vaadin.v7.ui.RichTextArea; public class RichTextAreaDeclarativeTest extends DeclarativeTestBase<RichTextArea> { private String getBasicDesign() { - return "<vaadin-rich-text-area null-representation='' null-setting-allowed>\n" + return "<vaadin7-rich-text-area null-representation='' null-setting-allowed>\n" + "\n <b>Header</b> <br/>Some text\n " - + "</vaadin-rich-text-area>"; + + "</vaadin7-rich-text-area>"; } private RichTextArea getBasicExpected() { @@ -49,17 +49,17 @@ public class RichTextAreaDeclarativeTest @Test public void testReadEmpty() { - testRead("<vaadin-rich-text-area />", new RichTextArea()); + testRead("<vaadin7-rich-text-area />", new RichTextArea()); } @Test public void testWriteEmpty() { - testWrite("<vaadin-rich-text-area />", new RichTextArea()); + testWrite("<vaadin7-rich-text-area />", new RichTextArea()); } @Test public void testReadOnlyValue() { - String design = "<vaadin-rich-text-area readonly style-name='v-richtextarea-readonly'>Hello World!</vaadin-text-area>"; + String design = "<vaadin7-rich-text-area readonly style-name='v-richtextarea-readonly'>Hello World!</vaadin7-text-area>"; RichTextArea ta = new RichTextArea(); ta.setValue("Hello World!"); ta.setReadOnly(true); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java index feb3b2e7b0..56a60de396 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/richtextarea/RichTextAreaStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/richtextarea/RichTextAreaStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.richtextarea; +package com.vaadin.v7.tests.server.component.richtextarea; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.textarea.RichTextAreaState; -import com.vaadin.ui.RichTextArea; +import com.vaadin.v7.ui.RichTextArea; /** * Tests for RichTextArea State. diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/select/SelectListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/select/SelectListenersTest.java index 1b0ff1caff..469407a516 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/select/SelectListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/select/SelectListenersTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.select; +package com.vaadin.v7.tests.server.component.select; import org.junit.Test; @@ -7,7 +7,7 @@ import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -import com.vaadin.ui.Select; +import com.vaadin.v7.ui.Select; public class SelectListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/CacheUpdateExceptionCausesTest.java index 86bb34145f..ebe6d37dec 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/CacheUpdateExceptionCausesTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/CacheUpdateExceptionCausesTest.java @@ -14,13 +14,13 @@ * the License. */ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.junit.Assert; import org.junit.Test; -import com.vaadin.ui.Table; -import com.vaadin.ui.Table.CacheUpdateException; +import com.vaadin.v7.ui.Table; +import com.vaadin.v7.ui.Table.CacheUpdateException; public class CacheUpdateExceptionCausesTest { @Test diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/FooterTest.java index 3df2b8fbcb..b961bc57e9 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/FooterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/FooterTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -8,10 +8,10 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.util.IndexedContainer; -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; /** * Test case for testing the footer API diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/MultipleSelectionTest.java index b29357ea6a..bfd8517358 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/MultipleSelectionTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/MultipleSelectionTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,10 +8,10 @@ import java.util.Set; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.shared.ui.MultiSelectMode; -import com.vaadin.ui.Table; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.Table; public class MultipleSelectionTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableColumnAlignmentsTest.java index ff4c8336fb..11fd3429db 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableColumnAlignmentsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableColumnAlignmentsTest.java @@ -1,11 +1,11 @@ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import static org.junit.Assert.assertArrayEquals; import org.junit.Test; -import com.vaadin.ui.Table; -import com.vaadin.ui.Table.Align; +import com.vaadin.v7.ui.Table; +import com.vaadin.v7.ui.Table.Align; public class TableColumnAlignmentsTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java index 3ee8b76d76..162d57c0da 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableContextClickTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableContextClickTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.junit.Assert; import org.junit.Test; @@ -21,7 +21,7 @@ import org.junit.Test; import com.vaadin.event.ContextClickEvent; import com.vaadin.event.ContextClickEvent.ContextClickListener; import com.vaadin.shared.ui.table.TableConstants.Section; -import com.vaadin.ui.Table; +import com.vaadin.v7.ui.Table; public class TableContextClickTest extends Table { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTest.java index 53f3d3acb8..a58aa0a1ec 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTest.java @@ -13,18 +13,18 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.junit.Assert; import org.junit.Test; import com.vaadin.server.ExternalResource; import com.vaadin.shared.ui.MultiSelectMode; -import com.vaadin.ui.Table; -import com.vaadin.ui.Table.Align; -import com.vaadin.ui.Table.ColumnHeaderMode; -import com.vaadin.ui.Table.RowHeaderMode; -import com.vaadin.ui.Table.TableDragMode; +import com.vaadin.v7.ui.Table; +import com.vaadin.v7.ui.Table.Align; +import com.vaadin.v7.ui.Table.ColumnHeaderMode; +import com.vaadin.v7.ui.Table.RowHeaderMode; +import com.vaadin.v7.ui.Table.TableDragMode; /** * Test declarative support for {@link Table}. @@ -162,13 +162,13 @@ public class TableDeclarativeTest extends TableDeclarativeTestBase { @Test public void testHtmlEntities() { - String design = "<v-table>" + "<table>" + " <colgroup>" + String design = "<vaadin7-table>" + "<table>" + " <colgroup>" + " <col property-id=\"test\"" + " </colgroup>" + " <thead>" + " <tr><th>& Test</th></tr>" + " </thead>" + " <tbody>" + " <tr item-id=\"test\"><td>& Test</tr>" + " </tbody>" + " <tfoot>" + " <tr><td>& Test</td></tr>" - + " </tfoot>" + "</table>" + "</v-table>"; + + " </tfoot>" + "</table>" + "</vaadin7-table>"; Table read = read(design); Assert.assertEquals("& Test", diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTestBase.java index 7a7b13e933..c8b3e8116b 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableDeclarativeTestBase.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableDeclarativeTestBase.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import static org.junit.Assert.assertTrue; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.Table; +import com.vaadin.v7.ui.Table; public abstract class TableDeclarativeTestBase extends DeclarativeTestBase<Table> { @@ -36,7 +36,7 @@ public abstract class TableDeclarativeTestBase } protected String getTag() { - return "vaadin-table"; + return "vaadin7-table"; } protected void compareBody(Table read, Table expected) { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableGeneratorTest.java index 6fbe5557f8..bb3afe0c5b 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableGeneratorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableGeneratorTest.java @@ -1,9 +1,9 @@ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.ui.Table; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.ui.Table; public class TableGeneratorTest { public static Table createTableWithDefaultContainer(int properties, diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java index ac6fb171e3..7f76b1c112 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java @@ -1,19 +1,19 @@ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.junit.Test; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -import com.vaadin.ui.Table; -import com.vaadin.ui.Table.ColumnReorderEvent; -import com.vaadin.ui.Table.ColumnReorderListener; -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.HeaderClickEvent; -import com.vaadin.ui.Table.HeaderClickListener; +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.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.HeaderClickEvent; +import com.vaadin.v7.ui.Table.HeaderClickListener; public class TableListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java index 5a9297014c..45ab28d687 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TablePropertyValueConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TablePropertyValueConverterTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -30,12 +30,12 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; -import com.vaadin.data.util.IndexedContainer; -import com.vaadin.ui.Table; -import com.vaadin.v7.data.util.converter.LegacyConverter; +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.converter.Converter; +import com.vaadin.v7.ui.Table; public class TablePropertyValueConverterTest { protected TestableTable table; @@ -84,20 +84,20 @@ public class TablePropertyValueConverterTest { createContainer(new String[] { "col1", "col2", "col3" }, new Class[] { String.class, BaseClass.class, DerivedClass.class })); - customTable.setConverter("col1", new LegacyConverter<String, String>() { + customTable.setConverter("col1", new Converter<String, String>() { private static final long serialVersionUID = 1L; @Override public String convertToModel(String 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 "model"; } @Override public String convertToPresentation(String 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 "presentation"; } @@ -113,14 +113,14 @@ public class TablePropertyValueConverterTest { }); customTable.setConverter("col2", - new LegacyConverter<String, BaseClass>() { + new Converter<String, BaseClass>() { private static final long serialVersionUID = 1L; @Override public BaseClass convertToModel(String value, Class<? extends BaseClass> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { return new BaseClass("model"); } @@ -137,19 +137,19 @@ public class TablePropertyValueConverterTest { @Override public String convertToPresentation(BaseClass 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 null; } }); customTable.setConverter("col3", - new LegacyConverter<String, DerivedClass>() { + new Converter<String, DerivedClass>() { private static final long serialVersionUID = 1L; @Override public DerivedClass convertToModel(String value, Class<? extends DerivedClass> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { return new DerivedClass("derived" + 1001); } @@ -166,7 +166,7 @@ public class TablePropertyValueConverterTest { @Override public String convertToPresentation(DerivedClass 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 null; } }); @@ -192,20 +192,20 @@ public class TablePropertyValueConverterTest { new Class[] { int.class, BaseClass.class, DerivedClass.class })); customTable.setConverter("col1", - new LegacyConverter<String, Integer>() { + new Converter<String, Integer>() { private static final long serialVersionUID = 1L; @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 { return 11; } @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 "presentation"; } @@ -235,20 +235,20 @@ public class TablePropertyValueConverterTest { public void setUp() { table = new TestableTable("Test table", createContainer(new String[] { "col1", "col2", "col3" })); - table.setConverter("col1", new LegacyConverter<String, String>() { + table.setConverter("col1", new Converter<String, String>() { private static final long serialVersionUID = 1L; @Override public String convertToModel(String 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 "model"; } @Override public String convertToPresentation(String 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 "presentation"; } @@ -264,20 +264,20 @@ public class TablePropertyValueConverterTest { }); - table.setConverter("col2", new LegacyConverter<String, String>() { + table.setConverter("col2", new Converter<String, String>() { private static final long serialVersionUID = 1L; @Override public String convertToModel(String 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 "model2"; } @Override public String convertToPresentation(String 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 "presentation2"; } @@ -352,10 +352,10 @@ public class TablePropertyValueConverterTest { Field f = Table.class .getDeclaredField("propertyValueConverters"); f.setAccessible(true); - HashMap<Object, LegacyConverter<String, Object>> pvc = (HashMap<Object, LegacyConverter<String, Object>>) f + HashMap<Object, Converter<String, Object>> pvc = (HashMap<Object, Converter<String, Object>>) f .get(this); Set<Object> currentConverters = new HashSet<Object>(); - for (Entry<Object, LegacyConverter<String, Object>> entry : pvc + for (Entry<Object, Converter<String, Object>> entry : pvc .entrySet()) { currentConverters.add(entry.getKey()); } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSelectableTest.java index 906827958f..4e12ed84e0 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSelectableTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSelectableTest.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.ui.Table; +import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.v7.ui.Table; /** * Tests for 'selectable' property of {@link Table} class. diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSerializationTest.java index 22f2381980..47f19cce9e 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableSerializationTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableSerializationTest.java @@ -1,9 +1,9 @@ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.apache.commons.lang.SerializationUtils; import org.junit.Test; -import com.vaadin.ui.Table; +import com.vaadin.v7.ui.Table; public class TableSerializationTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java index 43b03c41e8..2c993fe03f 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.table.TableState; -import com.vaadin.ui.Table; +import com.vaadin.v7.ui.Table; /** * Tests for Table State. diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableVisibleColumnsTest.java index f9f6e7f979..244afb7dc5 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/table/TableVisibleColumnsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableVisibleColumnsTest.java @@ -1,10 +1,10 @@ -package com.vaadin.tests.server.component.table; +package com.vaadin.v7.tests.server.component.table; import static org.junit.Assert.assertArrayEquals; import org.junit.Test; -import com.vaadin.ui.Table; +import com.vaadin.v7.ui.Table; public class TableVisibleColumnsTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textarea/TextAreaDeclarativeTest.java index cbfa33320f..5d0e8e80e4 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textarea/TextAreaDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textarea/TextAreaDeclarativeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.textarea; +package com.vaadin.v7.tests.server.component.textarea; import java.io.IOException; @@ -23,8 +23,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.TextArea; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.ui.TextArea; /** * Tests declarative support for implementations of {@link TextArea}. @@ -36,7 +36,7 @@ public class TextAreaDeclarativeTest extends DeclarativeTestBase<TextArea> { @Test public void testTextArea() { - String design = "<vaadin-text-area rows=6 wordwrap=false>Hello World!</vaadin-text-area>"; + String design = "<vaadin7-text-area rows=6 wordwrap=false>Hello World!</vaadin7-text-area>"; TextArea ta = new TextArea(); ta.setRows(6); ta.setWordwrap(false); @@ -47,7 +47,7 @@ public class TextAreaDeclarativeTest extends DeclarativeTestBase<TextArea> { @Test public void testHtmlEntities() throws IOException { - String design = "<vaadin-text-area>& Test</vaadin-text-area>"; + String design = "<vaadin7-text-area>& Test</vaadin7-text-area>"; TextArea read = read(design); Assert.assertEquals("& Test", read.getValue()); @@ -62,7 +62,7 @@ public class TextAreaDeclarativeTest extends DeclarativeTestBase<TextArea> { @Test public void testReadOnlyValue() { - String design = "<vaadin-text-area readonly rows=6 wordwrap=false>Hello World!</vaadin-text-area>"; + String design = "<vaadin7-text-area readonly rows=6 wordwrap=false>Hello World!</vaadin7-text-area>"; TextArea ta = new TextArea(); ta.setRows(6); ta.setWordwrap(false); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java index caea12d024..9c5020490d 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithConverterAndValidatorTest.java @@ -1,21 +1,21 @@ -package com.vaadin.tests.server.component.textfield; +package com.vaadin.v7.tests.server.component.textfield; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.data.converter.ConverterFactoryTest.ConvertTo42; -import com.vaadin.v7.data.validator.LegacyRangeValidator; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.validator.RangeValidator; +import com.vaadin.v7.ui.TextField; public class TextFieldWithConverterAndValidatorTest { - private LegacyTextField field; + private TextField field; private ObjectProperty<Integer> property; @Before public void setUp() { - field = new LegacyTextField(); + field = new TextField(); field.setInvalidAllowed(false); } @@ -25,7 +25,7 @@ public class TextFieldWithConverterAndValidatorTest { field.setConverter(new ConvertTo42()); field.setPropertyDataSource(property); - field.addValidator(new LegacyRangeValidator<Integer>("Incorrect value", + field.addValidator(new RangeValidator<Integer>("Incorrect value", Integer.class, 42, 42)); // succeeds diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java index 633269a0ab..7c723db760 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithPropertyFormatterTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.textfield; +package com.vaadin.v7.tests.server.component.textfield; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -8,12 +8,12 @@ import java.util.Collections; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Property; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertyFormatter; -import com.vaadin.v7.ui.LegacyTextField; +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.ObjectProperty; +import com.vaadin.v7.data.util.PropertyFormatter; +import com.vaadin.v7.ui.TextField; public class TextFieldWithPropertyFormatterTest { @@ -21,7 +21,7 @@ public class TextFieldWithPropertyFormatterTest { private static final String PARSED_VALUE = "BAR"; private static final String FORMATTED_VALUE = "FOOBAR"; private static final String ORIGINAL_VALUE = "Original"; - private LegacyTextField field; + private TextField field; private PropertyFormatter<String> formatter; private ObjectProperty<String> property; private ValueChangeListener listener; @@ -31,7 +31,7 @@ public class TextFieldWithPropertyFormatterTest { @Before public void setUp() { - field = new LegacyTextField() { + field = new TextField() { @Override public void markAsDirty() { repainted++; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithValidatorTest.java index 6fc2108b63..bbbe41c24b 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/textfield/TextFieldWithValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldWithValidatorTest.java @@ -1,27 +1,27 @@ -package com.vaadin.tests.server.component.textfield; +package com.vaadin.v7.tests.server.component.textfield; import static org.junit.Assert.fail; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.data.validator.LegacyEmailValidator; -import com.vaadin.v7.data.validator.LegacyRegexpValidator; -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.EmailValidator; +import com.vaadin.v7.data.validator.RegexpValidator; +import com.vaadin.v7.data.validator.StringLengthValidator; +import com.vaadin.v7.ui.TextField; public class TextFieldWithValidatorTest { - private LegacyTextField field; + private TextField field; private ObjectProperty<String> property; @Before public void setUp() { - field = new LegacyTextField(); + field = new TextField(); field.setInvalidAllowed(false); property = new ObjectProperty<String>("original"); field.setPropertyDataSource(property); @@ -29,9 +29,9 @@ public class TextFieldWithValidatorTest { @Test public void testMultipleValidators() { - field.addValidator(new LegacyStringLengthValidator( + field.addValidator(new StringLengthValidator( "Length not between 1 and 3", 1, 3, false)); - field.addValidator(new LegacyStringLengthValidator( + field.addValidator(new StringLengthValidator( "Length not between 2 and 4", 2, 4, false)); // fails @@ -54,9 +54,9 @@ public class TextFieldWithValidatorTest { @Test public void testRemoveValidator() { - Validator validator1 = new LegacyStringLengthValidator( + Validator validator1 = new StringLengthValidator( "Length not between 1 and 3", 1, 3, false); - Validator validator2 = new LegacyStringLengthValidator( + Validator validator2 = new StringLengthValidator( "Length not between 2 and 4", 2, 4, false); field.addValidator(validator1); @@ -78,9 +78,9 @@ public class TextFieldWithValidatorTest { @Test public void testRemoveAllValidators() { - Validator validator1 = new LegacyStringLengthValidator( + Validator validator1 = new StringLengthValidator( "Length not between 1 and 3", 1, 3, false); - Validator validator2 = new LegacyStringLengthValidator( + Validator validator2 = new StringLengthValidator( "Length not between 2 and 4", 2, 4, false); field.addValidator(validator1); @@ -95,7 +95,7 @@ public class TextFieldWithValidatorTest { @Test public void testEmailValidator() { - field.addValidator(new LegacyEmailValidator("Invalid e-mail address")); + field.addValidator(new EmailValidator("Invalid e-mail address")); // not required @@ -152,7 +152,7 @@ public class TextFieldWithValidatorTest { @Test public void testRegexpValidator() { - field.addValidator(new LegacyRegexpValidator("pattern", true, + field.addValidator(new RegexpValidator("pattern", true, "Validation failed")); field.setRequired(false); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/ListenersTest.java index ade24a0df6..3264ba1f03 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/ListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/ListenersTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.tree; +package com.vaadin.v7.tests.server.component.tree; import static org.junit.Assert.assertEquals; @@ -8,11 +8,11 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -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.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; public class ListenersTest implements ExpandListener, CollapseListener { private int expandCalled; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeDeclarativeTest.java index 1e73f953b2..cfb48427bf 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeDeclarativeTest.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.tree; +package com.vaadin.v7.tests.server.component.tree; import org.junit.Test; import com.vaadin.server.ExternalResource; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.Tree; -import com.vaadin.ui.Tree.TreeDragMode; +import com.vaadin.v7.ui.Tree; +import com.vaadin.v7.ui.Tree.TreeDragMode; /** * Tests the declarative support for implementations of {@link Tree}. @@ -32,7 +32,7 @@ public class TreeDeclarativeTest extends DeclarativeTestBase<Tree> { @Test public void testDragMode() { - String design = "<vaadin-tree drag-mode='node' />"; + String design = "<vaadin7-tree drag-mode='node' />"; Tree tree = new Tree(); tree.setDragMode(TreeDragMode.NODE); @@ -43,13 +43,13 @@ public class TreeDeclarativeTest extends DeclarativeTestBase<Tree> { @Test public void testEmpty() { - testRead("<vaadin-tree />", new Tree()); - testWrite("<vaadin-tree />", new Tree()); + testRead("<vaadin7-tree />", new Tree()); + testWrite("<vaadin7-tree />", new Tree()); } @Test public void testNodes() { - String design = "<vaadin-tree>" // + String design = "<vaadin7-tree>" // + " <node text='Node'/>" // + " <node text='Parent'>" // + " <node text='Child'>" // @@ -57,7 +57,7 @@ public class TreeDeclarativeTest extends DeclarativeTestBase<Tree> { + " </node>" // + " </node>" // + " <node text='With icon' icon='http://example.com/icon.png'/>" // - + "</vaadin-tree>"; + + "</vaadin7-tree>"; Tree tree = new Tree(); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java index ec10c4fe39..a7831dc628 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java @@ -1,15 +1,15 @@ -package com.vaadin.tests.server.component.tree; +package com.vaadin.v7.tests.server.component.tree; import org.junit.Test; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -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.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; public class TreeListenersTest extends AbstractListenerMethodsTestBase { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java index ed455415ea..04673af2bd 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/tree/TreeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.tree; +package com.vaadin.v7.tests.server.component.tree; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -12,11 +12,11 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Container; -import com.vaadin.data.util.HierarchicalContainer; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.shared.ui.tree.TreeState; -import com.vaadin.ui.Tree; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.util.HierarchicalContainer; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.ui.Tree; public class TreeTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/EmptyTreeTableTest.java index 2a667bea72..dcde70c122 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/EmptyTreeTableTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/EmptyTreeTableTest.java @@ -1,10 +1,10 @@ -package com.vaadin.tests.server.component.treetable; +package com.vaadin.v7.tests.server.component.treetable; import static org.junit.Assert.assertFalse; import org.junit.Test; -import com.vaadin.ui.TreeTable; +import com.vaadin.v7.ui.TreeTable; public class EmptyTreeTableTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableDeclarativeTest.java index eb25bcb0aa..302a42a8af 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableDeclarativeTest.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.treetable; +package com.vaadin.v7.tests.server.component.treetable; import org.junit.Assert; import org.junit.Test; -import com.vaadin.tests.server.component.table.TableDeclarativeTest; -import com.vaadin.ui.Table; -import com.vaadin.ui.TreeTable; import com.vaadin.ui.declarative.DesignException; +import com.vaadin.v7.tests.server.component.table.TableDeclarativeTest; +import com.vaadin.v7.ui.Table; +import com.vaadin.v7.ui.TreeTable; /** * Test declarative support for {@link TreeTable}. @@ -33,7 +33,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest { @Test public void testAttributes() { - String design = "<vaadin-tree-table animations-enabled>"; + String design = "<vaadin7-tree-table animations-enabled>"; TreeTable table = getTable(); table.setAnimationsEnabled(true); @@ -43,7 +43,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest { @Test public void testHierarchy() { - String design = "<vaadin-tree-table>" // + String design = "<vaadin7-tree-table>" // + "<table>" // + "<colgroup><col property-id=''></colgroup>" // + "<tbody>" // @@ -57,7 +57,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest { + " <tr depth=1 item-id='2.1'><td></tr>" // + "</tbody>" // + "</table>" // - + "</vaadin-tree-table>"; + + "</vaadin7-tree-table>"; TreeTable table = getTable(); table.addContainerProperty("", String.class, ""); @@ -83,7 +83,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest { @Test public void testCollapsed() { - String design = "<vaadin-tree-table>" // + String design = "<vaadin7-tree-table>" // + " <table>" // + " <colgroup><col property-id=''></colgroup>" // + " <tbody>" // @@ -92,7 +92,7 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest { + " <tr depth=2 item-id='1.1.1'><td></tr>" // + " </tbody>" // + " </table>" // - + "</vaadin-tree-table>"; + + "</vaadin7-tree-table>"; TreeTable table = getTable(); table.addContainerProperty("", String.class, ""); @@ -116,12 +116,12 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest { } protected void assertMalformed(String hierarchy) { - String design = "<vaadin-tree-table>" // + String design = "<vaadin7-tree-table>" // + " <table>" // + " <colgroup><col property-id=''></colgroup>" // + " <tbody>" + hierarchy + "</tbody>" // + " </table>" // - + "</vaadin-tree-table>"; + + "</vaadin7-tree-table>"; try { read(design); @@ -151,6 +151,6 @@ public class TreeTableDeclarativeTest extends TableDeclarativeTest { @Override protected String getTag() { - return "vaadin-tree-table"; + return "vaadin7-tree-table"; } } diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableSetContainerNullTest.java index 9718d24f8c..c8398a6f50 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableSetContainerNullTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableSetContainerNullTest.java @@ -1,8 +1,8 @@ -package com.vaadin.tests.server.component.treetable; +package com.vaadin.v7.tests.server.component.treetable; import org.junit.Test; -import com.vaadin.ui.TreeTable; +import com.vaadin.v7.ui.TreeTable; public class TreeTableSetContainerNullTest { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java index 4706ec1413..a6948256df 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/treetable/TreeTableTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/treetable/TreeTableTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.treetable; +package com.vaadin.v7.tests.server.component.treetable; import java.util.EnumSet; @@ -21,8 +21,8 @@ import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.treetable.TreeTableState; -import com.vaadin.ui.Table.RowHeaderMode; -import com.vaadin.ui.TreeTable; +import com.vaadin.v7.ui.Table.RowHeaderMode; +import com.vaadin.v7.ui.TreeTable; /** * Tests for {@link TreeTable} diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java index 02a2ebfd77..a8ec104265 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectDeclarativeTest.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.twincolselect; +package com.vaadin.v7.tests.server.component.twincolselect; import java.util.Arrays; import org.junit.Test; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.TwinColSelect; +import com.vaadin.v7.ui.TwinColSelect; /** * Test cases for reading the properties of selection components. @@ -31,11 +31,11 @@ public class TwinColSelectDeclarativeTest extends DeclarativeTestBase<TwinColSelect> { public String getBasicDesign() { - return "<vaadin-twin-col-select rows=5 right-column-caption='Selected values' left-column-caption='Unselected values'>\n" + return "<vaadin7-twin-col-select rows=5 right-column-caption='Selected values' left-column-caption='Unselected values'>\n" + " <option>First item</option>\n" + " <option selected>Second item</option>\n" + " <option selected>Third item</option>\n" - + "</vaadin-twin-col-select>"; + + "</vaadin7-twin-col-select>"; } @@ -63,12 +63,12 @@ public class TwinColSelectDeclarativeTest @Test public void testReadEmpty() { - testRead("<vaadin-twin-col-select />", new TwinColSelect()); + testRead("<vaadin7-twin-col-select />", new TwinColSelect()); } @Test public void testWriteEmpty() { - testWrite("<vaadin-twin-col-select />", new TwinColSelect()); + testWrite("<vaadin7-twin-col-select />", new TwinColSelect()); } }
\ No newline at end of file diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java index 9348de63c2..7479d3f8e6 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/component/twincolselect/TwinColSelectStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/twincolselect/TwinColSelectStateTest.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.twincolselect; +package com.vaadin.v7.tests.server.component.twincolselect; import org.junit.Assert; import org.junit.Test; import com.vaadin.shared.ui.twincolselect.TwinColSelectState; -import com.vaadin.ui.TwinColSelect; +import com.vaadin.v7.ui.TwinColSelect; /** * Tests for TwinColSelectState. diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java index 66a4ec2370..51007e0f8e 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java @@ -1,12 +1,13 @@ -package com.vaadin.tests.server.components; +package com.vaadin.v7.tests.server.components; import org.junit.Before; import com.vaadin.server.ServerRpcManager; import com.vaadin.server.ServerRpcMethodInvocation; import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; -import com.vaadin.ui.ComboBox; -import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.tests.server.components.AbstractFieldValueChangeTestBase; +import com.vaadin.v7.ui.AbstractField; +import com.vaadin.v7.ui.ComboBox; /** * Check that the value change listener for a combo box is triggered exactly @@ -30,7 +31,7 @@ public class ComboBoxValueChangeTest } @Override - protected void setValue(LegacyAbstractField<Object> field) { + protected void setValue(AbstractField<Object> field) { ComboBox combo = (ComboBox) field; ServerRpcMethodInvocation invocation = new ServerRpcMethodInvocation( combo.getConnectorId(), ComboBoxServerRpc.class, diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/ImageRendererTest.java index 822a2353ac..e3bfd32111 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/ImageRendererTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/ImageRendererTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.renderer; +package com.vaadin.v7.tests.server.renderer; import static org.junit.Assert.assertEquals; @@ -28,9 +28,9 @@ import com.vaadin.server.ExternalResource; import com.vaadin.server.FileResource; import com.vaadin.server.FontAwesome; import com.vaadin.server.ThemeResource; -import com.vaadin.ui.LegacyGrid; import com.vaadin.ui.UI; -import com.vaadin.ui.renderers.ImageRenderer; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.renderers.ImageRenderer; import elemental.json.JsonObject; import elemental.json.JsonValue; @@ -44,7 +44,7 @@ public class ImageRendererTest { UI mockUI = EasyMock.createNiceMock(UI.class); EasyMock.replay(mockUI); - LegacyGrid grid = new LegacyGrid(); + Grid grid = new Grid(); grid.setParent(mockUI); renderer = new ImageRenderer(); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/RendererTest.java index 5eec5b6ea8..cb1b1bd918 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/renderer/RendererTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/renderer/RendererTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.renderer; +package com.vaadin.v7.tests.server.renderer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -25,21 +25,21 @@ import java.util.Locale; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Item; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.server.VaadinSession; -import com.vaadin.tests.server.component.grid.TestGrid; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -import com.vaadin.ui.LegacyGrid; -import com.vaadin.ui.LegacyGrid.AbstractRenderer; -import com.vaadin.ui.LegacyGrid.Column; -import com.vaadin.ui.renderers.ButtonRenderer; -import com.vaadin.ui.renderers.DateRenderer; -import com.vaadin.ui.renderers.HtmlRenderer; -import com.vaadin.ui.renderers.NumberRenderer; -import com.vaadin.ui.renderers.TextRenderer; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.StringToIntegerConverter; +import com.vaadin.v7.tests.server.component.grid.TestGrid; +import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.AbstractRenderer; +import com.vaadin.v7.ui.Grid.Column; +import com.vaadin.v7.ui.renderers.ButtonRenderer; +import com.vaadin.v7.ui.renderers.DateRenderer; +import com.vaadin.v7.ui.renderers.HtmlRenderer; +import com.vaadin.v7.ui.renderers.NumberRenderer; +import com.vaadin.v7.ui.renderers.TextRenderer; import elemental.json.JsonValue; @@ -66,7 +66,7 @@ public class RendererTest { } private static class TestConverter - implements LegacyConverter<String, TestBean> { + implements Converter<String, TestBean> { @Override public TestBean convertToModel(String value, @@ -98,7 +98,7 @@ public class RendererTest { } } - private LegacyGrid grid; + private Grid grid; private Column intColumn; private Column textColumn; @@ -151,7 +151,7 @@ public class RendererTest { @Test public void testDefaultRendererAndConverter() throws Exception { assertSame(TextRenderer.class, intColumn.getRenderer().getClass()); - assertSame(LegacyStringToIntegerConverter.class, + assertSame(StringToIntegerConverter.class, intColumn.getConverter().getClass()); assertSame(TextRenderer.class, textColumn.getRenderer().getClass()); @@ -166,7 +166,7 @@ public class RendererTest { @Test public void testFindCompatibleConverter() throws Exception { intColumn.setRenderer(renderer()); - assertSame(LegacyStringToIntegerConverter.class, + assertSame(StringToIntegerConverter.class, intColumn.getConverter().getClass()); textColumn.setRenderer(renderer()); diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/BeanValidationTest.java index a8e6238d4b..990acbab61 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/BeanValidationTest.java @@ -1,60 +1,60 @@ -package com.vaadin.tests.server.validation; +package com.vaadin.v7.tests.server.validation; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.fieldgroup.BeanFieldGroup; import com.vaadin.tests.data.bean.BeanToValidate; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.data.validator.LegacyBeanValidator; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.data.fieldgroup.BeanFieldGroup; +import com.vaadin.v7.data.validator.BeanValidator; +import com.vaadin.v7.ui.Field; public class BeanValidationTest { @Test(expected = InvalidValueException.class) public void testBeanValidationNull() { - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "firstname"); validator.validate(null); } @Test(expected = InvalidValueException.class) public void testBeanValidationStringTooShort() { - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "firstname"); validator.validate("aa"); } @Test public void testBeanValidationStringOk() { - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "firstname"); validator.validate("aaa"); } @Test(expected = InvalidValueException.class) public void testBeanValidationIntegerTooSmall() { - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "age"); validator.validate(17); } @Test public void testBeanValidationIntegerOk() { - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "age"); validator.validate(18); } @Test(expected = InvalidValueException.class) public void testBeanValidationTooManyDigits() { - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "decimals"); validator.validate("1234.567"); } @Test public void testBeanValidationDigitsOk() { - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "decimals"); validator.validate("123.45"); } @@ -62,7 +62,7 @@ public class BeanValidationTest { @Test public void testBeanValidationException_OneValidationError() { InvalidValueException[] causes = null; - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "lastname"); try { validator.validate(null); @@ -76,7 +76,7 @@ public class BeanValidationTest { @Test public void testBeanValidationsException_TwoValidationErrors() { InvalidValueException[] causes = null; - LegacyBeanValidator validator = new LegacyBeanValidator( + BeanValidator validator = new BeanValidator( BeanToValidate.class, "nickname"); try { validator.validate("A"); @@ -97,7 +97,7 @@ public class BeanValidationTest { beanToValidate.setFirstname("a"); fieldGroup.setItemDataSource(beanToValidate); - LegacyField<?> nameField = fieldGroup.buildAndBind("firstname"); + Field<?> nameField = fieldGroup.buildAndBind("firstname"); Assert.assertEquals(1, nameField.getValidators().size()); try { diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/RangeValidatorTest.java index 1d5032e956..98e9c56eae 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/validation/RangeValidatorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/RangeValidatorTest.java @@ -1,11 +1,11 @@ -package com.vaadin.tests.server.validation; +package com.vaadin.v7.tests.server.validation; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.v7.data.validator.LegacyIntegerRangeValidator; +import com.vaadin.v7.data.validator.IntegerRangeValidator; public class RangeValidatorTest { @@ -14,7 +14,7 @@ public class RangeValidatorTest { // RangeValidator @Test public void testMinValueNonInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + IntegerRangeValidator iv = new IntegerRangeValidator( "Failed", 0, 10); iv.setMinValueIncluded(false); assertFalse(iv.isValid(0)); @@ -25,7 +25,7 @@ public class RangeValidatorTest { @Test public void testMinMaxValuesInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + IntegerRangeValidator iv = new IntegerRangeValidator( "Failed", 0, 10); assertTrue(iv.isValid(0)); assertTrue(iv.isValid(1)); @@ -36,7 +36,7 @@ public class RangeValidatorTest { @Test public void testMaxValueNonInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + IntegerRangeValidator iv = new IntegerRangeValidator( "Failed", 0, 10); iv.setMaxValueIncluded(false); assertTrue(iv.isValid(0)); @@ -48,7 +48,7 @@ public class RangeValidatorTest { @Test public void testMinMaxValuesNonInclusive() { - LegacyIntegerRangeValidator iv = new LegacyIntegerRangeValidator( + IntegerRangeValidator iv = new IntegerRangeValidator( "Failed", 0, 10); iv.setMinValueIncluded(false); iv.setMaxValueIncluded(false); diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/ReadOnlyValidationTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/ReadOnlyValidationTest.java new file mode 100644 index 0000000000..c21ce5b190 --- /dev/null +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/validation/ReadOnlyValidationTest.java @@ -0,0 +1,17 @@ +package com.vaadin.v7.tests.server.validation; + +import org.junit.Test; + +import com.vaadin.v7.data.validator.IntegerValidator; +import com.vaadin.v7.ui.TextField; + +public class ReadOnlyValidationTest { + + @Test + public void testIntegerValidation() { + TextField field = new TextField(); + field.addValidator(new IntegerValidator("Enter a Valid Number")); + field.setValue(String.valueOf(10)); + field.validate(); + } +} diff --git a/compatibility-server/src/test/java/com/vaadin/ui/AbsSelectTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/AbsSelectTest.java index 51556f9e1a..518ee484cc 100644 --- a/compatibility-server/src/test/java/com/vaadin/ui/AbsSelectTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/AbsSelectTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.ArrayList; import java.util.HashSet; @@ -21,7 +21,7 @@ import java.util.HashSet; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; +import com.vaadin.v7.data.util.ObjectProperty; public class AbsSelectTest { diff --git a/compatibility-server/src/test/java/com/vaadin/ui/NativeSelectTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java index 1a41fc1097..a5ff142490 100644 --- a/compatibility-server/src/test/java/com/vaadin/ui/NativeSelectTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/NativeSelectTest.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Collections; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.IndexedContainer; import com.vaadin.shared.ui.select.AbstractSelectState; +import com.vaadin.v7.data.util.IndexedContainer; public class NativeSelectTest { diff --git a/compatibility-server/src/test/java/com/vaadin/ui/RichTextAreaTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/RichTextAreaTest.java index 8b6b2d011e..9d4bb9468e 100644 --- a/compatibility-server/src/test/java/com/vaadin/ui/RichTextAreaTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/RichTextAreaTest.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; +import com.vaadin.v7.data.util.ObjectProperty; public class RichTextAreaTest { @Test diff --git a/compatibility-server/src/test/java/com/vaadin/ui/TableTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/TableTest.java index f09313f685..9683c82424 100644 --- a/compatibility-server/src/test/java/com/vaadin/ui/TableTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/TableTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.util.Collection; @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.BeanItemContainerGenerator; +import com.vaadin.v7.data.util.BeanItemContainerGenerator; public class TableTest { diff --git a/compatibility-server/src/test/java/com/vaadin/ui/TextAreaTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/TextAreaTest.java index 07bce554df..23b6f9f593 100644 --- a/compatibility-server/src/test/java/com/vaadin/ui/TextAreaTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/TextAreaTest.java @@ -13,12 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; +import com.vaadin.v7.data.util.ObjectProperty; public class TextAreaTest { @Test diff --git a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components-legacy.html b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components-legacy.html index 39aecb6db1..45496c0965 100644 --- a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components-legacy.html +++ b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components-legacy.html @@ -17,40 +17,40 @@ <!-- vertical layout --> <v-vertical-layout spacing margin> <v-button :top>OK</v-button> - <v-table size-full :expand=1 /> + <vaadin7-table size-full :expand=1 /> </v-vertical-layout> <!-- horizontal layout --> <v-horizontal-layout spacing margin> <v-button :top>OK</v-button> - <v-table size-full :expand=1 /> + <vaadin7-table size-full :expand=1 /> </v-horizontal-layout> <!-- form layout --> <v-form-layout spacing margin> <v-button :top>OK</v-button> - <v-table size-full :expand=1 /> + <vaadin7-table size-full :expand=1 /> </v-form-layout> <!-- css layout --> <v-css-layout> <v-button>OK</v-button> - <v-table size-full /> + <vaadin7-table size-full /> </v-css-layout> <!-- panel --> <v-panel caption="Hello world" tabindex=2 scroll-left="10" scroll-top="10"> - <v-table size-full /> + <vaadin7-table size-full /> </v-panel> <!-- abstract field --> - <v-text-field buffered validation-visible=false invalid-committed invalid-allowed=false required required-error="This is a required field" conversion-error="Input {0} cannot be parsed" tabindex=3 readonly /> + <vaadin7-text-field buffered validation-visible=false invalid-committed invalid-allowed=false required required-error="This is a required field" conversion-error="Input {0} cannot be parsed" tabindex=3 readonly /> <!-- abstract text field, text field --> - <v-text-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" /> + <vaadin7-text-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" /> <!-- password field --> - <v-password-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" /> + <vaadin7-password-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" /> <!-- text area --> - <v-text-area rows=5 wordwrap=false >test value</v-text-area> + <vaadin7-text-area rows=5 wordwrap=false >test value</vaadin7-text-area> <!-- button --> <v-button click-shortcut="ctrl-shift-o" disable-on-click tabindex=1 icon="http://vaadin.com/image.png" icon-alt="ok" plain-text>OK</v-button> <!-- native button --> @@ -67,7 +67,7 @@ <v-button>In disabled tab - can’t be shown by default</v-button> </tab> <tab icon="theme://../runo/icons/16/ok.png" icon-alt="Ok png from Runo - very helpful" description="Click to show a text field" style-name="red" id="uniqueDomId"> - <v-text-field input-prompt="Icon only in tab" /> + <vaadin7-text-field input-prompt="Icon only in tab" /> </tab> </v-tab-sheet> @@ -82,7 +82,7 @@ <v-button>In disabled tab - can’t be shown by default</v-button> </tab> <tab icon="theme://../runo/icons/16/ok.png" icon-alt="Ok png from Runo - very helpful" description="Click to show a text field" style-name="red" id="uniqueDomId"> - <v-text-field input-prompt="Icon only in tab" /> + <vaadin7-text-field input-prompt="Icon only in tab" /> </tab> </v-accordion> @@ -107,15 +107,15 @@ <v-check-box checked/> <!-- abstract select --> - <v-list-select new-items-allowed multi-select + <vaadin7-list-select new-items-allowed multi-select item-caption-mode="index" null-selection-allowed=false> - </v-list-select> + </vaadin7-list-select> - <v-combo-box> + <vaadin7-combo-box> <option icon="http://something/my-icon.png">First value</option> <option>Second value</option> - </v-combo-box> + </vaadin7-combo-box> </v-vertical-layout> </body> diff --git a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components.html b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components.html index 6507188cd7..45a4e3bc31 100644 --- a/compatibility-server/src/test/resources/com/vaadin/tests/design/all-components.html +++ b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/all-components.html @@ -17,30 +17,30 @@ <!-- vertical layout --> <vaadin-vertical-layout spacing margin> <vaadin-button :top>OK</vaadin-button> - <vaadin-table size-full :expand=1 /> + <vaadin7-table size-full :expand=1 /> </vaadin-vertical-layout> <!-- horizontal layout --> <vaadin-horizontal-layout spacing margin> <vaadin-button :top>OK</vaadin-button> - <vaadin-table size-full :expand=1 /> + <vaadin7-table size-full :expand=1 /> </vaadin-horizontal-layout> <!-- form layout --> <vaadin-form-layout spacing margin> <vaadin-button :top>OK</vaadin-button> - <vaadin-table size-full :expand=1 /> + <vaadin7-table size-full :expand=1 /> </vaadin-form-layout> <!-- css layout --> <vaadin-css-layout> <vaadin-button>OK</vaadin-button> - <vaadin-table size-full /> + <vaadin7-table size-full /> </vaadin-css-layout> <!-- panel --> <vaadin-panel caption="Hello world" tabindex=2 scroll-left="10" scroll-top="10"> - <vaadin-table size-full /> + <vaadin7-table size-full /> </vaadin-panel> <!-- abstract field --> @@ -50,7 +50,7 @@ <!-- password field --> <vaadin-password-field null-representation="" null-setting-allowed maxlength=10 columns=5 input-prompt="Please enter a value" text-change-event-mode="eager" text-change-timeout=2 value="foo" /> <!-- text area --> - <vaadin-text-area rows=5 wordwrap=false >test value</vaadin-text-area> + <vaadin7-text-area rows=5 wordwrap=false >test value</vaadin7-text-area> <!-- button --> <vaadin-button click-shortcut="ctrl-shift-o" disable-on-click tabindex=1 icon="http://vaadin.com/image.png" icon-alt="ok" plain-text>OK</vaadin-button> <!-- native button --> @@ -107,15 +107,15 @@ <vaadin-check-box checked/> <!-- abstract select --> - <vaadin-list-select new-items-allowed multi-select + <vaadin7-list-select new-items-allowed multi-select item-caption-mode="index" null-selection-allowed=false> - </vaadin-list-select> + </vaadin7-list-select> - <vaadin-combo-box> + <vaadin7-combo-box> <option icon="http://something/my-icon.png">First value</option> <option>Second value</option> - </vaadin-combo-box> + </vaadin7-combo-box> </vaadin-vertical-layout> </body> diff --git a/compatibility-server/src/test/resources/com/vaadin/tests/design/testFile-legacy.html b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/testFile-legacy.html index 79ae1e9eaf..39861267e6 100644 --- a/compatibility-server/src/test/resources/com/vaadin/tests/design/testFile-legacy.html +++ b/compatibility-server/src/test/resources/com/vaadin/v7/tests/design/testFile-legacy.html @@ -13,7 +13,7 @@ <v-button plain-text width = "150px">Click me</v-button> </v-horizontal-layout> <v-text-field caption = "Text input"/> - <v-text-area caption = "Text area" height="200px" width="300px"/> + <v-password-field caption = "Text area" height="200px" width="300px"/> </v-vertical-layout> </body> </html>
\ No newline at end of file diff --git a/server/src/main/java/com/vaadin/event/DataBoundTransferable.java b/server/src/main/java/com/vaadin/event/DataBoundTransferable.java index 9c70b2915f..d4b4a5ba6b 100644 --- a/server/src/main/java/com/vaadin/event/DataBoundTransferable.java +++ b/server/src/main/java/com/vaadin/event/DataBoundTransferable.java @@ -17,8 +17,8 @@ package com.vaadin.event; import java.util.Map; -import com.vaadin.data.Container; import com.vaadin.ui.Component; +import com.vaadin.v7.data.Container; /** * Parent class for {@link Transferable} implementations that have a Vaadin @@ -27,7 +27,7 @@ import com.vaadin.ui.Component; * table column identifier when transferring a single table cell). * * The component must implement the interface - * {@link com.vaadin.data.Container.Viewer}. + * {@link com.vaadin.v7.data.Container.Viewer}. * * In most cases, receivers of data transfers should depend on this class * instead of its concrete subclasses. @@ -60,7 +60,7 @@ public abstract class DataBoundTransferable extends TransferableImpl { /** * Returns the container data source from which the transfer occurs. * - * {@link com.vaadin.data.Container.Viewer#getContainerDataSource()} is used + * {@link com.vaadin.v7.data.Container.Viewer#getContainerDataSource()} is used * to obtain the underlying container of the source component. * * @return Container diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java index e96d320a34..fa4b00cbca 100644 --- a/server/src/main/java/com/vaadin/event/FieldEvents.java +++ b/server/src/main/java/com/vaadin/event/FieldEvents.java @@ -24,12 +24,12 @@ import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.ui.Component; import com.vaadin.ui.Component.Event; import com.vaadin.util.ReflectTools; -import com.vaadin.v7.ui.LegacyField; -import com.vaadin.v7.ui.LegacyField.ValueChangeEvent; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.Field; +import com.vaadin.v7.ui.Field.ValueChangeEvent; +import com.vaadin.v7.ui.TextField; /** - * Interface that serves as a wrapper for {@link LegacyField} related events. + * Interface that serves as a wrapper for {@link Field} related events. */ public interface FieldEvents { @@ -192,12 +192,12 @@ public interface FieldEvents { * The {@link TextChangeNotifier}s implementation may decide when exactly * TextChangeEvents are fired. TextChangeEvents are not necessary fire for * example on each key press, but buffered with a small delay. The - * {@link LegacyTextField} component supports different modes for triggering + * {@link TextField} component supports different modes for triggering * TextChangeEvents. * * @see TextChangeListener * @see TextChangeNotifier - * @see LegacyTextField#setTextChangeEventMode(com.vaadin.ui.LegacyTextField.TextChangeEventMode) + * @see TextField#setTextChangeEventMode(com.vaadin.ui.TextField.TextChangeEventMode) * @since 6.5 */ public static abstract class TextChangeEvent extends Component.Event { @@ -239,8 +239,8 @@ public interface FieldEvents { } /** - * An interface implemented by a {@link LegacyField} supporting - * {@link TextChangeEvent}s. An example a {@link LegacyTextField} supports + * An interface implemented by a {@link Field} supporting + * {@link TextChangeEvent}s. An example a {@link TextField} supports * {@link TextChangeListener}s. */ public interface TextChangeNotifier extends Serializable { diff --git a/server/src/main/java/com/vaadin/event/ItemClickEvent.java b/server/src/main/java/com/vaadin/event/ItemClickEvent.java index 621f5af525..3680b7764a 100644 --- a/server/src/main/java/com/vaadin/event/ItemClickEvent.java +++ b/server/src/main/java/com/vaadin/event/ItemClickEvent.java @@ -18,16 +18,16 @@ package com.vaadin.event; import java.io.Serializable; import java.lang.reflect.Method; -import com.vaadin.data.Item; -import com.vaadin.data.Property; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.shared.MouseEventDetails; import com.vaadin.ui.Component; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; /** * * Click event fired by a {@link Component} implementing - * {@link com.vaadin.data.Container} interface. ItemClickEvents happens on an + * {@link com.vaadin.v7.data.Container} interface. ItemClickEvents happens on an * {@link Item} rendered somehow on terminal. Event may also contain a specific * {@link Property} on which the click event happened. * diff --git a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java index 6910201856..c3b8d0f436 100644 --- a/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java +++ b/server/src/main/java/com/vaadin/server/AbstractErrorMessage.java @@ -21,7 +21,7 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; -import com.vaadin.data.Buffered; +import com.vaadin.v7.data.Buffered; import com.vaadin.v7.data.Validator; /** diff --git a/server/src/main/java/com/vaadin/server/ClassResource.java b/server/src/main/java/com/vaadin/server/ClassResource.java index 83a9371f8f..d3114a36ef 100644 --- a/server/src/main/java/com/vaadin/server/ClassResource.java +++ b/server/src/main/java/com/vaadin/server/ClassResource.java @@ -18,9 +18,9 @@ package com.vaadin.server; import java.io.Serializable; -import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.UI; import com.vaadin.util.FileTypeResolver; +import com.vaadin.v7.ui.LegacyWindow; /** * <code>ClassResource</code> is a named resource accessed with the class diff --git a/server/src/main/java/com/vaadin/server/LegacyApplication.java b/server/src/main/java/com/vaadin/server/LegacyApplication.java index 93f3da3d8f..1e6714fa2a 100644 --- a/server/src/main/java/com/vaadin/server/LegacyApplication.java +++ b/server/src/main/java/com/vaadin/server/LegacyApplication.java @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.UI; +import com.vaadin.v7.ui.LegacyWindow; /** * A special application designed to help migrating applications from Vaadin 6 diff --git a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java index 4ad7097e3b..18e44add09 100644 --- a/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java +++ b/server/src/main/java/com/vaadin/server/LegacyApplicationUIProvider.java @@ -21,8 +21,8 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.UI; +import com.vaadin.v7.ui.LegacyWindow; /** * diff --git a/server/src/main/java/com/vaadin/server/Page.java b/server/src/main/java/com/vaadin/server/Page.java index 7142659fca..4b4984ebb7 100644 --- a/server/src/main/java/com/vaadin/server/Page.java +++ b/server/src/main/java/com/vaadin/server/Page.java @@ -34,11 +34,11 @@ import com.vaadin.shared.ui.ui.UIConstants; import com.vaadin.shared.ui.ui.UIState; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.JavaScript; -import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Link; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; import com.vaadin.util.ReflectTools; +import com.vaadin.v7.ui.LegacyWindow; public class Page implements Serializable { diff --git a/server/src/main/java/com/vaadin/server/VaadinSession.java b/server/src/main/java/com/vaadin/server/VaadinSession.java index d10390dd64..82f75c2ad6 100644 --- a/server/src/main/java/com/vaadin/server/VaadinSession.java +++ b/server/src/main/java/com/vaadin/server/VaadinSession.java @@ -52,9 +52,9 @@ import com.vaadin.shared.communication.PushMode; import com.vaadin.ui.UI; import com.vaadin.util.CurrentInstance; import com.vaadin.util.ReflectTools; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverterFactory; -import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ConverterFactory; +import com.vaadin.v7.data.util.converter.DefaultConverterFactory; /** * Contains everything that Vaadin needs to store for a specific user. This is @@ -226,7 +226,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * The converter factory that is used to provide default converters for the * session. */ - private LegacyConverterFactory converterFactory = new LegacyDefaultConverterFactory(); + private ConverterFactory converterFactory = new DefaultConverterFactory(); private LinkedList<RequestHandler> requestHandlers = new LinkedList<RequestHandler>(); @@ -591,23 +591,23 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { } /** - * Gets the {@link LegacyConverterFactory} used to locate a suitable - * {@link LegacyConverter} for fields in the session. + * Gets the {@link ConverterFactory} used to locate a suitable + * {@link Converter} for fields in the session. * - * See {@link #setConverterFactory(LegacyConverterFactory)} for more details + * See {@link #setConverterFactory(ConverterFactory)} for more details * * @return The converter factory used in the session */ - public LegacyConverterFactory getConverterFactory() { + public ConverterFactory getConverterFactory() { assert hasLock(); return converterFactory; } /** - * Sets the {@link LegacyConverterFactory} used to locate a suitable - * {@link LegacyConverter} for fields in the session. + * Sets the {@link ConverterFactory} used to locate a suitable + * {@link Converter} for fields in the session. * <p> - * The {@link LegacyConverterFactory} is used to find a suitable converter + * The {@link ConverterFactory} is used to find a suitable converter * when binding data to a UI component and the data type does not match the * UI component type, e.g. binding a Double to a TextField (which is based * on a String). @@ -618,7 +618,7 @@ public class VaadinSession implements HttpSessionBindingListener, Serializable { * @param converterFactory * The converter factory used in the session */ - public void setConverterFactory(LegacyConverterFactory converterFactory) { + public void setConverterFactory(ConverterFactory converterFactory) { assert hasLock(); this.converterFactory = converterFactory; } diff --git a/server/src/main/java/com/vaadin/ui/AbstractField.java b/server/src/main/java/com/vaadin/ui/AbstractField.java index c1895377c2..d8397a65e1 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractField.java @@ -39,7 +39,7 @@ import com.vaadin.util.ReflectTools; * <p> * This class replaces the Vaadin 7 {@code com.vaadin.ui.AbstractField} class. * The old {@code AbstractField} is retained, under the new name - * {@link com.vaadin.v7.ui.LegacyAbstractField}, for compatibility and + * {@link com.vaadin.v7.ui.AbstractField}, for compatibility and * migration purposes. * * @author Vaadin Ltd. diff --git a/server/src/main/java/com/vaadin/ui/Label.java b/server/src/main/java/com/vaadin/ui/Label.java index 49bad48786..21aa7bdcbe 100644 --- a/server/src/main/java/com/vaadin/ui/Label.java +++ b/server/src/main/java/com/vaadin/ui/Label.java @@ -22,14 +22,14 @@ import java.util.Locale; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.label.LabelState; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverterUtil; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ConverterUtil; /** * Label component for showing non-editable short texts. @@ -98,7 +98,7 @@ public class Label extends AbstractComponent implements Property<String>, * A converter used to convert from the data model type to the field type * and vice versa. Label type is always String. */ - private LegacyConverter<String, Object> converter = null; + private Converter<String, Object> converter = null; private Property<String> dataSource = null; @@ -188,7 +188,7 @@ public class Label extends AbstractComponent implements Property<String>, * @return */ private String getDataSourceValue() { - return LegacyConverterUtil.convertFromModel( + return ConverterUtil.convertFromModel( getPropertyDataSource().getValue(), String.class, getConverter(), getLocale()); } @@ -220,7 +220,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * Gets the type of the Property. * - * @see com.vaadin.data.Property#getType() + * @see com.vaadin.v7.data.Property#getType() */ @Override public Class<String> getType() { @@ -231,7 +231,7 @@ public class Label extends AbstractComponent implements Property<String>, * Gets the viewing data-source property. * * @return the data source property. - * @see com.vaadin.data.Property.Viewer#getPropertyDataSource() + * @see com.vaadin.v7.data.Property.Viewer#getPropertyDataSource() */ @Override public Property getPropertyDataSource() { @@ -244,7 +244,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @param newDataSource * the new data source Property - * @see com.vaadin.data.Property.Viewer#setPropertyDataSource(com.vaadin.data.Property) + * @see com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(com.vaadin.v7.data.Property) */ @Override public void setPropertyDataSource(Property newDataSource) { @@ -256,11 +256,11 @@ public class Label extends AbstractComponent implements Property<String>, // Check if the current converter is compatible. if (newDataSource != null - && !LegacyConverterUtil.canConverterPossiblyHandle( + && !ConverterUtil.canConverterPossiblyHandle( getConverter(), getType(), newDataSource.getType())) { // There is no converter set or there is no way the current // converter can be compatible. - LegacyConverter<String, ?> c = LegacyConverterUtil.getConverter( + Converter<String, ?> c = ConverterUtil.getConverter( String.class, newDataSource.getType(), getSession()); setConverter(c); } @@ -345,7 +345,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * Gets the Property that has been modified. * - * @see com.vaadin.data.Property.ValueChangeEvent#getProperty() + * @see com.vaadin.v7.data.Property.ValueChangeEvent#getProperty() */ @Override public Property getProperty() { @@ -358,7 +358,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @param listener * the Listener to be added. - * @see com.vaadin.data.Property.ValueChangeNotifier#addListener(com.vaadin.data.Property.ValueChangeListener) + * @see com.vaadin.v7.data.Property.ValueChangeNotifier#addListener(com.vaadin.v7.data.Property.ValueChangeListener) */ @Override public void addValueChangeListener(Property.ValueChangeListener listener) { @@ -368,7 +368,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -381,7 +381,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @param listener * the Listener to be removed. - * @see com.vaadin.data.Property.ValueChangeNotifier#removeListener(com.vaadin.data.Property.ValueChangeListener) + * @see com.vaadin.v7.data.Property.ValueChangeNotifier#removeListener(com.vaadin.v7.data.Property.ValueChangeListener) */ @Override public void removeValueChangeListener( @@ -392,7 +392,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -411,7 +411,7 @@ public class Label extends AbstractComponent implements Property<String>, /** * Listens the value change events from data source. * - * @see com.vaadin.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) */ @Override public void valueChange(Property.ValueChangeEvent event) { @@ -527,7 +527,7 @@ public class Label extends AbstractComponent implements Property<String>, * * @return The converter or null if none is set. */ - public LegacyConverter<String, Object> getConverter() { + public Converter<String, Object> getConverter() { return converter; } @@ -538,8 +538,8 @@ public class Label extends AbstractComponent implements Property<String>, * @param converter * The new converter to use. */ - public void setConverter(LegacyConverter<String, ?> converter) { - this.converter = (LegacyConverter<String, Object>) converter; + public void setConverter(Converter<String, ?> converter) { + this.converter = (Converter<String, Object>) converter; markAsDirty(); } diff --git a/server/src/main/java/com/vaadin/ui/ProgressBar.java b/server/src/main/java/com/vaadin/ui/ProgressBar.java index b7fde04d5a..8a29176e55 100644 --- a/server/src/main/java/com/vaadin/ui/ProgressBar.java +++ b/server/src/main/java/com/vaadin/ui/ProgressBar.java @@ -18,11 +18,11 @@ package com.vaadin.ui; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.shared.ui.progressindicator.ProgressBarState; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; -import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.ui.AbstractField; /** * Shows the current progress of a long running task. @@ -35,7 +35,7 @@ import com.vaadin.v7.ui.LegacyAbstractField; * @since 7.1 * @author Vaadin Ltd */ -public class ProgressBar extends LegacyAbstractField<Float> +public class ProgressBar extends AbstractField<Float> implements Property.Viewer, Property.ValueChangeListener { private static final float DEFAULT_VALUE = 0f; diff --git a/server/src/main/java/com/vaadin/ui/ProgressIndicator.java b/server/src/main/java/com/vaadin/ui/ProgressIndicator.java index 83dd1f0aa4..d0f1ae164b 100644 --- a/server/src/main/java/com/vaadin/ui/ProgressIndicator.java +++ b/server/src/main/java/com/vaadin/ui/ProgressIndicator.java @@ -16,10 +16,10 @@ package com.vaadin.ui; -import com.vaadin.data.Property; import com.vaadin.shared.communication.PushMode; import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState; +import com.vaadin.v7.data.Property; /** * A {@link ProgressBar} which polls the server for updates. diff --git a/server/src/main/java/com/vaadin/ui/TextField.java b/server/src/main/java/com/vaadin/ui/TextField.java index 1e40c34f51..ccbba00f36 100644 --- a/server/src/main/java/com/vaadin/ui/TextField.java +++ b/server/src/main/java/com/vaadin/ui/TextField.java @@ -19,9 +19,9 @@ package com.vaadin.ui; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Property; /** * A component for editing textual data that fits on a single line. For a @@ -54,7 +54,7 @@ public class TextField extends AbstractTextField { * Constructs a new <code>TextField</code> with the given caption and * initial text contents. The editor constructed this way will not be bound * to a Property unless - * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)} + * {@link com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(Property)} * is called to bind it. * * @param caption diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java index c38f2bf040..f6607c91e4 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -39,7 +39,7 @@ import org.jsoup.nodes.Node; import com.vaadin.shared.ui.AlignmentInfo; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.Alignment; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * Default attribute handler implementation used when parsing designs to @@ -379,7 +379,7 @@ public class DesignAttributeHandler implements Serializable { // value is not null. How to represent null value in attributes? return ""; } - LegacyConverter<String, Object> converter = getFormatter() + Converter<String, Object> converter = getFormatter() .findConverterFor(sourceType); if (converter != null) { return converter.convertToPresentation(value, String.class, null); diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java index 4879609e01..d8e131a047 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignFormatter.java @@ -39,10 +39,10 @@ import com.vaadin.ui.declarative.converters.DesignResourceConverter; import com.vaadin.ui.declarative.converters.DesignShortcutActionConverter; import com.vaadin.ui.declarative.converters.DesignTimeZoneConverter; import com.vaadin.ui.declarative.converters.DesignToStringConverter; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToBigDecimalConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToFloatConverter; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.StringToBigDecimalConverter; +import com.vaadin.v7.data.util.converter.StringToDoubleConverter; +import com.vaadin.v7.data.util.converter.StringToFloatConverter; /** * Class focused on flexible and consistent formatting and parsing of different @@ -54,9 +54,9 @@ import com.vaadin.v7.data.util.converter.LegacyStringToFloatConverter; */ public class DesignFormatter implements Serializable { - private final Map<Class<?>, LegacyConverter<String, ?>> converterMap = new ConcurrentHashMap<Class<?>, LegacyConverter<String, ?>>(); - private final LegacyConverter<String, Enum> stringEnumConverter = new DesignEnumConverter(); - private final LegacyConverter<String, Object> stringObjectConverter = new DesignObjectConverter(); + private final Map<Class<?>, Converter<String, ?>> converterMap = new ConcurrentHashMap<Class<?>, Converter<String, ?>>(); + private final Converter<String, Enum> stringEnumConverter = new DesignEnumConverter(); + private final Converter<String, Object> stringObjectConverter = new DesignObjectConverter(); /** * Creates the formatter with default types already mapped. @@ -83,19 +83,19 @@ public class DesignFormatter implements Serializable { } // booleans use a bit different converter than the standard one // "false" is boolean false, everything else is boolean true - LegacyConverter<String, Boolean> booleanConverter = new LegacyConverter<String, Boolean>() { + Converter<String, Boolean> booleanConverter = new Converter<String, Boolean>() { @Override public Boolean convertToModel(String value, Class<? extends Boolean> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { return !value.equalsIgnoreCase("false"); } @Override public String convertToPresentation(Boolean value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (value.booleanValue()) { return ""; } else { @@ -123,7 +123,7 @@ public class DesignFormatter implements Serializable { final DecimalFormat fmt = new DecimalFormat("0.###", symbols); fmt.setGroupingUsed(false); - LegacyConverter<String, ?> floatConverter = new LegacyStringToFloatConverter() { + Converter<String, ?> floatConverter = new StringToFloatConverter() { @Override protected NumberFormat getFormat(Locale locale) { return fmt; @@ -132,7 +132,7 @@ public class DesignFormatter implements Serializable { converterMap.put(Float.class, floatConverter); converterMap.put(float.class, floatConverter); - LegacyConverter<String, ?> doubleConverter = new LegacyStringToDoubleConverter() { + Converter<String, ?> doubleConverter = new StringToDoubleConverter() { @Override protected NumberFormat getFormat(Locale locale) { return fmt; @@ -145,7 +145,7 @@ public class DesignFormatter implements Serializable { bigDecimalFmt.setGroupingUsed(false); bigDecimalFmt.setParseBigDecimal(true); converterMap.put(BigDecimal.class, - new LegacyStringToBigDecimalConverter() { + new StringToBigDecimalConverter() { @Override protected NumberFormat getFormat(Locale locale) { return bigDecimalFmt; @@ -153,19 +153,19 @@ public class DesignFormatter implements Serializable { }); // strings do nothing - converterMap.put(String.class, new LegacyConverter<String, String>() { + converterMap.put(String.class, new Converter<String, String>() { @Override public String convertToModel(String value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { return value; } @Override public String convertToPresentation(String value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { return value; } @@ -182,13 +182,13 @@ public class DesignFormatter implements Serializable { }); // char takes the first character from the string - LegacyConverter<String, Character> charConverter = new DesignToStringConverter<Character>( + Converter<String, Character> charConverter = new DesignToStringConverter<Character>( Character.class) { @Override public Character convertToModel(String value, Class<? extends Character> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { return value.charAt(0); } @@ -209,7 +209,7 @@ public class DesignFormatter implements Serializable { * @param converter * Converter to add. */ - protected <T> void addConverter(LegacyConverter<String, T> converter) { + protected <T> void addConverter(Converter<String, T> converter) { converterMap.put(converter.getModelType(), converter); } @@ -222,7 +222,7 @@ public class DesignFormatter implements Serializable { * Converter. */ protected <T> void addConverter(Class<?> type, - LegacyConverter<String, ?> converter) { + Converter<String, ?> converter) { converterMap.put(type, converter); } @@ -258,7 +258,7 @@ public class DesignFormatter implements Serializable { * converter for that type. */ public <T> T parse(String value, Class<? extends T> type) { - LegacyConverter<String, T> converter = findConverterFor(type); + Converter<String, T> converter = findConverterFor(type); if (converter != null) { return converter.convertToModel(value, type, null); } else { @@ -293,7 +293,7 @@ public class DesignFormatter implements Serializable { if (object == null) { return null; } else { - LegacyConverter<String, Object> converter = findConverterFor( + Converter<String, Object> converter = findConverterFor( object.getClass()); return converter.convertToPresentation(object, String.class, null); } @@ -326,28 +326,28 @@ public class DesignFormatter implements Serializable { * if it was not found. */ @SuppressWarnings("unchecked") - protected <T> LegacyConverter<String, T> findConverterFor( + protected <T> Converter<String, T> findConverterFor( Class<? extends T> sourceType, boolean strict) { if (sourceType == Object.class) { // Use for propertyIds, itemIds and such. Only string type objects // are really supported if no special logic is implemented in the // component. - return (LegacyConverter<String, T>) stringObjectConverter; + return (Converter<String, T>) stringObjectConverter; } if (converterMap.containsKey(sourceType)) { - return ((LegacyConverter<String, T>) converterMap.get(sourceType)); + return ((Converter<String, T>) converterMap.get(sourceType)); } else if (!strict) { for (Class<?> supported : converterMap.keySet()) { if (supported.isAssignableFrom(sourceType)) { - return ((LegacyConverter<String, T>) converterMap + return ((Converter<String, T>) converterMap .get(supported)); } } } if (sourceType.isEnum()) { - return (LegacyConverter<String, T>) stringEnumConverter; + return (Converter<String, T>) stringEnumConverter; } return null; } @@ -361,7 +361,7 @@ public class DesignFormatter implements Serializable { * @return A valid converter for a given type or its subtype, <b>null</b> if * it was not found. */ - protected <T> LegacyConverter<String, T> findConverterFor( + protected <T> Converter<String, T> findConverterFor( Class<? extends T> sourceType) { return findConverterFor(sourceType, false); } diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java index 8d8ec7ab7e..d2b8233da4 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignDateConverter.java @@ -21,7 +21,7 @@ import java.util.Date; import java.util.Locale; import com.vaadin.ui.declarative.DesignAttributeHandler; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * A date converter to be used by {@link DesignAttributeHandler}. Provides @@ -30,11 +30,11 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; * @since 7.4 * @author Vaadin Ltd */ -public class DesignDateConverter implements LegacyConverter<String, Date> { +public class DesignDateConverter implements Converter<String, Date> { @Override public Date convertToModel(String value, Class<? extends Date> targetType, - Locale locale) throws LegacyConverter.ConversionException { + Locale locale) throws Converter.ConversionException { for (String pattern : new String[] { "yyyy-MM-dd HH:mm:ssZ", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM-dd HH", "yyyy-MM-dd", "yyyy-MM", "yyyy" }) { @@ -50,7 +50,7 @@ public class DesignDateConverter implements LegacyConverter<String, Date> { @Override public String convertToPresentation(Date value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { return new SimpleDateFormat("yyyy-MM-dd HH:mm:ssZ").format(value); } diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java index ae142c1bb2..4424c6c66f 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignEnumConverter.java @@ -18,7 +18,7 @@ package com.vaadin.ui.declarative.converters; import java.util.Locale; import com.vaadin.ui.declarative.DesignAttributeHandler; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * An converter for Enum to/from String for {@link DesignAttributeHandler} to @@ -27,12 +27,12 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; * @since 7.4 * @author Vaadin Ltd */ -public class DesignEnumConverter implements LegacyConverter<String, Enum> { +public class DesignEnumConverter implements Converter<String, Enum> { @Override public Enum convertToModel(String value, Class<? extends Enum> 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.trim().equals("")) { return null; } @@ -42,7 +42,7 @@ public class DesignEnumConverter implements LegacyConverter<String, Enum> { @Override public String convertToPresentation(Enum 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/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java index cc9dce4425..22d44a1fb5 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignObjectConverter.java @@ -18,7 +18,7 @@ package com.vaadin.ui.declarative.converters; import java.util.Locale; import com.vaadin.ui.declarative.DesignAttributeHandler; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * An converter for Object to/from String for {@link DesignAttributeHandler} to @@ -27,19 +27,19 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; * @since 7.4 * @author Vaadin Ltd */ -public class DesignObjectConverter implements LegacyConverter<String, Object> { +public class DesignObjectConverter implements Converter<String, Object> { @Override public Object convertToModel(String value, Class<? extends Object> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { return value; } @Override public String convertToPresentation(Object 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/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java index bf2b5446f7..a55cfd070b 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignResourceConverter.java @@ -30,7 +30,7 @@ import com.vaadin.server.Resource; import com.vaadin.server.ResourceReference; import com.vaadin.server.ThemeResource; import com.vaadin.ui.declarative.DesignAttributeHandler; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * A converter for {@link Resource} implementations supported by @@ -41,12 +41,12 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; */ @SuppressWarnings("serial") public class DesignResourceConverter - implements LegacyConverter<String, Resource> { + implements Converter<String, Resource> { @Override public Resource convertToModel(String value, Class<? extends Resource> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (!value.contains("://")) { // assume it'is "file://" protocol, one that is used to access a // file on a given path on the server, this will later be striped @@ -68,13 +68,13 @@ public class DesignResourceConverter @Override public String convertToPresentation(Resource value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { ResourceConverterByProtocol byType = ResourceConverterByProtocol .byType(value.getClass()); if (byType != null) { return byType.format(value); } else { - throw new LegacyConverter.ConversionException( + throw new Converter.ConversionException( "unknown Resource type - " + value.getClass().getName()); } } @@ -109,7 +109,7 @@ public class DesignResourceConverter @Override public String format(Resource value) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { return new ResourceReference(value, null, null).getURL(); } }, @@ -139,7 +139,7 @@ public class DesignResourceConverter @Override public String format(Resource value) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { FontIcon icon = (FontIcon) value; return new ResourceReference(icon, null, null).getURL(); @@ -163,7 +163,7 @@ public class DesignResourceConverter @Override public String format(Resource value) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { throw new UnsupportedOperationException( "Use " + ResourceConverterByProtocol.FONTICON.toString() + " instead"); @@ -177,7 +177,7 @@ public class DesignResourceConverter @Override public String format(Resource value) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { String path = ((FileResource) value).getSourceFile().getPath(); if (File.separatorChar != '/') { // make sure we use '/' as file separator in templates @@ -197,7 +197,7 @@ public class DesignResourceConverter @Override public String format(Resource value) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { // default behavior for HTTP, HTTPS, FTP and FTPS return ((ExternalResource) value).getURL(); } diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java index 8ca4cbc905..12d96abb63 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignShortcutActionConverter.java @@ -24,7 +24,7 @@ import java.util.Map.Entry; import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * Converter for {@link ShortcutActions}. @@ -33,7 +33,7 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; * @author Vaadin Ltd */ public class DesignShortcutActionConverter - implements LegacyConverter<String, ShortcutAction> { + implements Converter<String, ShortcutAction> { private final Map<Integer, String> keyCodeMap; private final Map<String, Integer> presentationMap; @@ -122,7 +122,7 @@ public class DesignShortcutActionConverter @Override public ShortcutAction convertToModel(String value, Class<? extends ShortcutAction> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (value.length() == 0) { return null; } @@ -163,7 +163,7 @@ public class DesignShortcutActionConverter @Override public String convertToPresentation(ShortcutAction value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { StringBuilder sb = new StringBuilder(); // handle modifiers if (value.getModifiers() != null) { diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java index bb8819034a..4ef52d0819 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignTimeZoneConverter.java @@ -19,7 +19,7 @@ import java.util.Locale; import java.util.TimeZone; import com.vaadin.ui.declarative.DesignAttributeHandler; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * Utility class for {@link DesignAttributeHandler} that deals with converting @@ -29,12 +29,12 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; * @author Vaadin Ltd */ public class DesignTimeZoneConverter - implements LegacyConverter<String, TimeZone> { + implements Converter<String, TimeZone> { @Override public TimeZone convertToModel(String value, Class<? extends TimeZone> targetTimeZone, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (value == null || value.isEmpty()) { return null; } @@ -45,7 +45,7 @@ public class DesignTimeZoneConverter @Override public String convertToPresentation(TimeZone value, Class<? extends String> targetTimeZone, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (value == null) { return ""; } else { diff --git a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java index 8979bcef76..9127832690 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java +++ b/server/src/main/java/com/vaadin/ui/declarative/converters/DesignToStringConverter.java @@ -19,7 +19,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Locale; import com.vaadin.ui.declarative.DesignAttributeHandler; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.util.converter.Converter; /** * Utility class for {@link DesignAttributeHandler} that deals with converting @@ -31,7 +31,7 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; * Type of the data being converted. */ public class DesignToStringConverter<TYPE> - implements LegacyConverter<String, TYPE> { + implements Converter<String, TYPE> { private final Class<? extends TYPE> type; @@ -73,29 +73,29 @@ public class DesignToStringConverter<TYPE> @Override public TYPE convertToModel(String value, Class<? extends TYPE> targetType, - Locale locale) throws LegacyConverter.ConversionException { + Locale locale) throws Converter.ConversionException { try { return type.cast(type.getMethod(this.staticMethodName, String.class) .invoke(null, value)); } catch (IllegalAccessException e) { - throw new LegacyConverter.ConversionException(e); + throw new Converter.ConversionException(e); } catch (IllegalArgumentException e) { - throw new LegacyConverter.ConversionException(e); + throw new Converter.ConversionException(e); } catch (InvocationTargetException e) { - throw new LegacyConverter.ConversionException(e.getCause()); + throw new Converter.ConversionException(e.getCause()); } catch (NoSuchMethodException e) { - throw new LegacyConverter.ConversionException(e); + throw new Converter.ConversionException(e); } catch (SecurityException e) { - throw new LegacyConverter.ConversionException(e); + throw new Converter.ConversionException(e); } catch (RuntimeException e) { - throw new LegacyConverter.ConversionException(e); + throw new Converter.ConversionException(e); } } @Override public String convertToPresentation(TYPE value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (value == null) { return NULL_VALUE_REPRESENTATION; } else { diff --git a/server/src/main/java/com/vaadin/data/Buffered.java b/server/src/main/java/com/vaadin/v7/data/Buffered.java index bc3c2327fe..cec9916b6a 100644 --- a/server/src/main/java/com/vaadin/data/Buffered.java +++ b/server/src/main/java/com/vaadin/v7/data/Buffered.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data; +package com.vaadin.v7.data; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/data/BufferedValidatable.java b/server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java index 0a7c875a96..ea0b3c0ebd 100644 --- a/server/src/main/java/com/vaadin/data/BufferedValidatable.java +++ b/server/src/main/java/com/vaadin/v7/data/BufferedValidatable.java @@ -14,12 +14,10 @@ * the License. */ -package com.vaadin.data; +package com.vaadin.v7.data; import java.io.Serializable; -import com.vaadin.v7.data.Validatable; - /** * <p> * This interface defines the combination of <code>Validatable</code> and diff --git a/server/src/main/java/com/vaadin/data/Collapsible.java b/server/src/main/java/com/vaadin/v7/data/Collapsible.java index 9f57b2e445..a5d63c5a50 100644 --- a/server/src/main/java/com/vaadin/data/Collapsible.java +++ b/server/src/main/java/com/vaadin/v7/data/Collapsible.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data; +package com.vaadin.v7.data; -import com.vaadin.data.Container.Hierarchical; -import com.vaadin.data.Container.Ordered; +import com.vaadin.v7.data.Container.Hierarchical; +import com.vaadin.v7.data.Container.Ordered; /** * Container needed by large lazy loading hierarchies displayed e.g. in diff --git a/server/src/main/java/com/vaadin/data/Container.java b/server/src/main/java/com/vaadin/v7/data/Container.java index 1618c456a6..c280525dcd 100644 --- a/server/src/main/java/com/vaadin/data/Container.java +++ b/server/src/main/java/com/vaadin/v7/data/Container.java @@ -14,14 +14,14 @@ * the License. */ -package com.vaadin.data; +package com.vaadin.v7.data; import java.io.Serializable; import java.util.Collection; import java.util.List; -import com.vaadin.data.util.filter.SimpleStringFilter; -import com.vaadin.data.util.filter.UnsupportedFilterException; +import com.vaadin.v7.data.util.filter.SimpleStringFilter; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; /** * <p> @@ -736,7 +736,7 @@ public interface Container extends Serializable { * <p> * The children must be first explicitly removed with * {@link #setParent(Object itemId, Object newParentId)}or - * {@link com.vaadin.data.Container#removeItem(Object itemId)}. + * {@link com.vaadin.v7.data.Container#removeItem(Object itemId)}. * </p> * * <p> @@ -839,7 +839,7 @@ public interface Container extends Serializable { * Adding items (if supported) to a filtered {@link Ordered} or * {@link Indexed} container should insert them immediately after the * indicated visible item. The unfiltered position of items added at index - * 0, at index {@link com.vaadin.data.Container#size()} or at an undefined + * 0, at index {@link com.vaadin.v7.data.Container#size()} or at an undefined * position is up to the implementation. * </p> * <p> @@ -974,7 +974,7 @@ public interface Container extends Serializable { * Adding items (if supported) to a filtered {@link Ordered} or * {@link Indexed} container should insert them immediately after the * indicated visible item. However, the unfiltered position of items added - * at index 0, at index {@link com.vaadin.data.Container#size()} or at an + * at index 0, at index {@link com.vaadin.v7.data.Container#size()} or at an * undefined position is up to the implementation. * </p> * diff --git a/server/src/main/java/com/vaadin/data/ContainerHelpers.java b/server/src/main/java/com/vaadin/v7/data/ContainerHelpers.java index f2d891c845..c782f33133 100644 --- a/server/src/main/java/com/vaadin/data/ContainerHelpers.java +++ b/server/src/main/java/com/vaadin/v7/data/ContainerHelpers.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data; +package com.vaadin.v7.data; import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.vaadin.data.Container.Indexed; +import com.vaadin.v7.data.Container.Indexed; /** * Contains helper methods for containers that can be used to ease development diff --git a/server/src/main/java/com/vaadin/data/Item.java b/server/src/main/java/com/vaadin/v7/data/Item.java index 478aa206ea..d90cdca3f7 100644 --- a/server/src/main/java/com/vaadin/data/Item.java +++ b/server/src/main/java/com/vaadin/v7/data/Item.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data; +package com.vaadin.v7.data; import java.io.Serializable; import java.util.Collection; diff --git a/server/src/main/java/com/vaadin/data/Property.java b/server/src/main/java/com/vaadin/v7/data/Property.java index bc0a902d3c..21129a64f9 100644 --- a/server/src/main/java/com/vaadin/data/Property.java +++ b/server/src/main/java/com/vaadin/v7/data/Property.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data; +package com.vaadin.v7.data; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/data/util/AbstractProperty.java b/server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java index 6e046ddbf4..33d22777ad 100644 --- a/server/src/main/java/com/vaadin/data/util/AbstractProperty.java +++ b/server/src/main/java/com/vaadin/v7/data/util/AbstractProperty.java @@ -13,14 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.logging.Logger; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Property; /** * Abstract base class for {@link Property} implementations. @@ -118,7 +118,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #addReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -142,7 +142,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #removeReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -205,7 +205,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -223,7 +223,7 @@ public abstract class AbstractProperty<T> implements Property<T>, /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java index c92769eac1..9ac8038f03 100644 --- a/server/src/main/java/com/vaadin/data/util/ContainerOrderedWrapper.java +++ b/server/src/main/java/com/vaadin/v7/data/util/ContainerOrderedWrapper.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.ArrayList; import java.util.Collection; @@ -23,14 +23,14 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import com.vaadin.data.Container; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; /** * <p> * A wrapper class for adding external ordering to containers not implementing - * the {@link com.vaadin.data.Container.Ordered} interface. + * the {@link com.vaadin.v7.data.Container.Ordered} interface. * </p> * * <p> @@ -547,7 +547,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #addItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #addItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -572,7 +572,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #removeItemSetChangeListener(com.vaadin.data.Container.ItemSetChangeListener)} + * {@link #removeItemSetChangeListener(com.vaadin.v7.data.Container.ItemSetChangeListener)} **/ @Override @Deprecated @@ -597,7 +597,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Override @Deprecated @@ -622,7 +622,7 @@ public class ContainerOrderedWrapper implements Container.Ordered, /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Container.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Container.PropertySetChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java b/server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java index 2ef33c1ec2..345d50614f 100644 --- a/server/src/main/java/com/vaadin/data/util/DefaultItemSorter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/DefaultItemSorter.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.ArrayList; @@ -21,10 +21,10 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Sortable; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Container.Sortable; /** * Provides a default implementation of an ItemSorter. The diff --git a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java b/server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java index 765f0a4f5f..f25842aec9 100644 --- a/server/src/main/java/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java +++ b/server/src/main/java/com/vaadin/v7/data/util/HierarchicalContainerOrderedWrapper.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Collection; -import com.vaadin.data.Container.Hierarchical; +import com.vaadin.v7.data.Container.Hierarchical; /** * A wrapper class for adding external ordering to containers not implementing - * the {@link com.vaadin.data.Container.Ordered} interface while retaining + * the {@link com.vaadin.v7.data.Container.Ordered} interface while retaining * {@link Hierarchical} features. * * @see ContainerOrderedWrapper diff --git a/server/src/main/java/com/vaadin/data/util/ItemSorter.java b/server/src/main/java/com/vaadin/v7/data/util/ItemSorter.java index 2df551cdbc..9ca21ca137 100644 --- a/server/src/main/java/com/vaadin/data/util/ItemSorter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/ItemSorter.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; import java.util.Comparator; -import com.vaadin.data.Container; -import com.vaadin.data.Container.Sortable; +import com.vaadin.v7.data.Container; +import com.vaadin.v7.data.Container.Sortable; /** * An item comparator which is compatible with the {@link Sortable} interface. diff --git a/server/src/main/java/com/vaadin/data/util/ListSet.java b/server/src/main/java/com/vaadin/v7/data/util/ListSet.java index 9a5ef1d172..2fd182238d 100644 --- a/server/src/main/java/com/vaadin/data/util/ListSet.java +++ b/server/src/main/java/com/vaadin/v7/data/util/ListSet.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.ArrayList; import java.util.Collection; diff --git a/server/src/main/java/com/vaadin/data/util/MethodProperty.java b/server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java index 6f18b88344..86fb0ae40d 100644 --- a/server/src/main/java/com/vaadin/data/util/MethodProperty.java +++ b/server/src/main/java/com/vaadin/v7/data/util/MethodProperty.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static com.vaadin.util.ReflectTools.convertPrimitiveType; @@ -25,9 +25,9 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; -import com.vaadin.data.Property; import com.vaadin.shared.util.SharedUtil; import com.vaadin.util.SerializerHelper; +import com.vaadin.v7.data.Property; /** * <p> diff --git a/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java b/server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java index cba5f3e51d..dfffb5b189 100644 --- a/server/src/main/java/com/vaadin/data/util/MethodPropertyDescriptor.java +++ b/server/src/main/java/com/vaadin/v7/data/util/MethodPropertyDescriptor.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.IOException; import java.lang.reflect.Method; import java.util.logging.Level; import java.util.logging.Logger; -import com.vaadin.data.Property; import com.vaadin.util.ReflectTools; import com.vaadin.util.SerializerHelper; +import com.vaadin.v7.data.Property; /** * Property descriptor that is able to create simple {@link MethodProperty} diff --git a/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java b/server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java index 59c5324858..38bf7300aa 100644 --- a/server/src/main/java/com/vaadin/data/util/NestedMethodProperty.java +++ b/server/src/main/java/com/vaadin/v7/data/util/NestedMethodProperty.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import static com.vaadin.util.ReflectTools.convertPrimitiveType; @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.vaadin.data.Property; -import com.vaadin.data.util.MethodProperty.MethodException; import com.vaadin.shared.util.SharedUtil; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.MethodProperty.MethodException; /** * Nested accessor based property for a bean. diff --git a/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java b/server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java index 91481230db..7bbf6253a5 100644 --- a/server/src/main/java/com/vaadin/data/util/NestedPropertyDescriptor.java +++ b/server/src/main/java/com/vaadin/v7/data/util/NestedPropertyDescriptor.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Property; /** * Property descriptor that is able to create nested property instances for a diff --git a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java b/server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java index 0855924bde..cd9f6c36c7 100644 --- a/server/src/main/java/com/vaadin/data/util/ObjectProperty.java +++ b/server/src/main/java/com/vaadin/v7/data/util/ObjectProperty.java @@ -14,13 +14,13 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Property; /** * A simple data object containing one typed value. This class is a - * straightforward implementation of the the {@link com.vaadin.data.Property} + * straightforward implementation of the the {@link com.vaadin.v7.data.Property} * interface. * * @author Vaadin Ltd. diff --git a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java b/server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java index 908c7fb1e5..c95f97a1f1 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertyFormatter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/PropertyFormatter.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; -import com.vaadin.data.Property; -import com.vaadin.v7.data.util.converter.LegacyConverter; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.converter.Converter; /** * Formatting proxy for a {@link Property}. @@ -46,7 +46,7 @@ import com.vaadin.v7.data.util.converter.LegacyConverter; * type of the underlying property (a PropertyFormatter is always a * Property<String>) * - * @deprecated As of 7.0, replaced by {@link LegacyConverter} + * @deprecated As of 7.0, replaced by {@link Converter} * @author Vaadin Ltd. * @since 5.3.0 */ @@ -239,7 +239,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> * This should not be called directly. */ @Override - public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { + public void valueChange(com.vaadin.v7.data.Property.ValueChangeEvent event) { fireValueChange(); } @@ -250,7 +250,7 @@ public abstract class PropertyFormatter<T> extends AbstractProperty<String> */ @Override public void readOnlyStatusChange( - com.vaadin.data.Property.ReadOnlyStatusChangeEvent event) { + com.vaadin.v7.data.Property.ReadOnlyStatusChangeEvent event) { fireReadOnlyStatusChange(); } diff --git a/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java b/server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java index 25067d09f5..8cc4e7ac10 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertyValueGenerator.java +++ b/server/src/main/java/com/vaadin/v7/data/util/PropertyValueGenerator.java @@ -13,15 +13,15 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.Property; import com.vaadin.data.sort.SortOrder; -import com.vaadin.data.util.filter.UnsupportedFilterException; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Container.Filter; +import com.vaadin.v7.data.util.filter.UnsupportedFilterException; /** * PropertyValueGenerator for GeneratedPropertyContainer. diff --git a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java b/server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java index 9fc3eca4e3..092cf3f36e 100644 --- a/server/src/main/java/com/vaadin/data/util/PropertysetItem.java +++ b/server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.util.Collection; import java.util.Collections; @@ -23,8 +23,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; /** * Class for handling a set of identified Properties. The elements contained in @@ -211,7 +211,7 @@ public class PropertysetItem /** * @deprecated As of 7.0, replaced by - * {@link #addPropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)} + * {@link #addPropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)} **/ @Override @Deprecated @@ -235,7 +235,7 @@ public class PropertysetItem /** * @deprecated As of 7.0, replaced by - * {@link #removePropertySetChangeListener(com.vaadin.data.Item.PropertySetChangeListener)} + * {@link #removePropertySetChangeListener(com.vaadin.v7.data.Item.PropertySetChangeListener)} **/ @Override @Deprecated diff --git a/server/src/main/java/com/vaadin/data/util/TextFileProperty.java b/server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java index 2e84d93dc3..ce5bed8968 100644 --- a/server/src/main/java/com/vaadin/data/util/TextFileProperty.java +++ b/server/src/main/java/com/vaadin/v7/data/util/TextFileProperty.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java b/server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java index c81aa6fcfd..21afa4bc92 100644 --- a/server/src/main/java/com/vaadin/data/util/TransactionalPropertyWrapper.java +++ b/server/src/main/java/com/vaadin/v7/data/util/TransactionalPropertyWrapper.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; -import com.vaadin.data.Property; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeNotifier; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.v7.data.Property.ValueChangeNotifier; /** * Wrapper class that helps implement two-phase commit for a non-transactional @@ -34,7 +34,7 @@ import com.vaadin.data.Property.ValueChangeNotifier; * fired at the end of a successful transaction, whereas listeners attached to * the underlying property may receive multiple value change events. * - * @see com.vaadin.data.Property.Transactional + * @see com.vaadin.v7.data.Property.Transactional * * @author Vaadin Ltd * @since 7.0 diff --git a/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.java b/server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java index 90e82b37af..71c562d425 100644 --- a/server/src/main/java/com/vaadin/data/util/VaadinPropertyDescriptor.java +++ b/server/src/main/java/com/vaadin/v7/data/util/VaadinPropertyDescriptor.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util; +package com.vaadin.v7.data.util; import java.io.Serializable; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Property; /** * Property descriptor that can create a property instance for a bean. diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyAbstractStringToNumberConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/AbstractStringToNumberConverter.java index d927bd57de..bd9392ee01 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyAbstractStringToNumberConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/AbstractStringToNumberConverter.java @@ -32,8 +32,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.1 */ -public abstract class LegacyAbstractStringToNumberConverter<T> - implements LegacyConverter<String, T> { +public abstract class AbstractStringToNumberConverter<T> + implements Converter<String, T> { /** * Returns the format used by {@link #convertToPresentation(Object, Locale)} diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/Converter.java index ee1aea81c7..e545c6ea6b 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/Converter.java @@ -47,7 +47,7 @@ import java.util.Locale; * @author Vaadin Ltd. * @since 7.0 */ -public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable { +public interface Converter<PRESENTATION, MODEL> extends Serializable { /** * Converts the given value from target type to source type. @@ -121,8 +121,8 @@ public interface LegacyConverter<PRESENTATION, MODEL> extends Serializable { /** * An exception that signals that the value passed to - * {@link LegacyConverter#convertToPresentation(Object, Class, Locale)} or - * {@link LegacyConverter#convertToModel(Object, Class, Locale)} could not + * {@link Converter#convertToPresentation(Object, Class, Locale)} or + * {@link Converter#convertToModel(Object, Class, Locale)} could not * be converted. * * @author Vaadin Ltd diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterFactory.java b/server/src/main/java/com/vaadin/v7/data/util/converter/ConverterFactory.java index a177e7673e..e4ec82c056 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterFactory.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/ConverterFactory.java @@ -26,8 +26,8 @@ import java.io.Serializable; * @since 7.0 * */ -public interface LegacyConverterFactory extends Serializable { - public <PRESENTATION, MODEL> LegacyConverter<PRESENTATION, MODEL> createConverter( +public interface ConverterFactory extends Serializable { + public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter( Class<PRESENTATION> presentationType, Class<MODEL> modelType); } diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterUtil.java b/server/src/main/java/com/vaadin/v7/data/util/converter/ConverterUtil.java index f6e0fec69c..b0679e9caf 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyConverterUtil.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/ConverterUtil.java @@ -20,12 +20,12 @@ import java.util.Locale; import com.vaadin.server.VaadinSession; -public class LegacyConverterUtil implements Serializable { +public class ConverterUtil implements Serializable { /** * Finds a converter that can convert from the given presentation type to * the given model type and back. Uses the given application to find a - * {@link LegacyConverterFactory} or, if application is null, uses the + * {@link ConverterFactory} or, if application is null, uses the * {@link VaadinSession#getCurrent()}. * * @param <PRESENTATIONTYPE> @@ -42,16 +42,16 @@ public class LegacyConverterUtil implements Serializable { * @return a Converter capable of converting between the given types or null * if no converter was found */ - public static <PRESENTATIONTYPE, MODELTYPE> LegacyConverter<PRESENTATIONTYPE, MODELTYPE> getConverter( + public static <PRESENTATIONTYPE, MODELTYPE> Converter<PRESENTATIONTYPE, MODELTYPE> getConverter( Class<PRESENTATIONTYPE> presentationType, Class<MODELTYPE> modelType, VaadinSession session) { - LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter = null; + Converter<PRESENTATIONTYPE, MODELTYPE> converter = null; if (session == null) { session = VaadinSession.getCurrent(); } if (session != null) { - LegacyConverterFactory factory = session.getConverterFactory(); + ConverterFactory factory = session.getConverterFactory(); converter = factory.createConverter(presentationType, modelType); } return converter; @@ -77,15 +77,15 @@ public class LegacyConverterUtil implements Serializable { * @return the converted value, compatible with the presentation type, or * the original value if its type is compatible and no converter is * set. - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * if there was a problem converting the value */ @SuppressWarnings("unchecked") public static <PRESENTATIONTYPE, MODELTYPE> PRESENTATIONTYPE convertFromModel( MODELTYPE modelValue, Class<? extends PRESENTATIONTYPE> presentationType, - LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, - Locale locale) throws LegacyConverter.ConversionException { + Converter<PRESENTATIONTYPE, MODELTYPE> converter, + Locale locale) throws Converter.ConversionException { if (converter != null) { /* * If there is a converter, always use it. It must convert or throw @@ -95,7 +95,7 @@ public class LegacyConverterUtil implements Serializable { modelValue, presentationType, locale); if (presentation != null && !presentationType.isInstance(presentation)) { - throw new LegacyConverter.ConversionException( + throw new Converter.ConversionException( "Converter returned an object of type " + presentation.getClass().getName() + " when expecting " @@ -113,7 +113,7 @@ public class LegacyConverterUtil implements Serializable { if (presentationType.isAssignableFrom(modelValue.getClass())) { return (PRESENTATIONTYPE) modelValue; } else { - throw new LegacyConverter.ConversionException( + throw new Converter.ConversionException( "Unable to convert value of type " + modelValue.getClass().getName() + " to presentation type " + presentationType @@ -140,13 +140,13 @@ public class LegacyConverterUtil implements Serializable { * * @return the converted value, compatible with the model type, or the * original value if its type is compatible and no converter is set. - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * if there was a problem converting the value */ public static <MODELTYPE, PRESENTATIONTYPE> MODELTYPE convertToModel( PRESENTATIONTYPE presentationValue, Class<MODELTYPE> modelType, - LegacyConverter<PRESENTATIONTYPE, MODELTYPE> converter, - Locale locale) throws LegacyConverter.ConversionException { + Converter<PRESENTATIONTYPE, MODELTYPE> converter, + Locale locale) throws Converter.ConversionException { if (converter != null) { /* * If there is a converter, always use it. It must convert or throw @@ -155,7 +155,7 @@ public class LegacyConverterUtil implements Serializable { MODELTYPE model = converter.convertToModel(presentationValue, modelType, locale); if (model != null && !modelType.isInstance(model)) { - throw new LegacyConverter.ConversionException( + throw new Converter.ConversionException( "Converter returned an object of type " + model.getClass().getName() + " when expecting " + modelType.getName()); @@ -177,7 +177,7 @@ public class LegacyConverterUtil implements Serializable { // presentation type directly compatible with model type return modelType.cast(presentationValue); } else { - throw new LegacyConverter.ConversionException( + throw new Converter.ConversionException( "Unable to convert value of type " + presentationValue.getClass().getName() + " to model type " + modelType @@ -191,7 +191,7 @@ public class LegacyConverterUtil implements Serializable { * presentation and model type. Does strict type checking and only returns * true if the converter claims it can handle exactly the given types. * - * @see #canConverterPossiblyHandle(LegacyConverter, Class, Class) + * @see #canConverterPossiblyHandle(Converter, Class, Class) * * @param converter * The converter to check. If this is null the result is always @@ -203,7 +203,7 @@ public class LegacyConverterUtil implements Serializable { * @return true if the converter supports conversion between the given * presentation and model type, false otherwise */ - public static boolean canConverterHandle(LegacyConverter<?, ?> converter, + public static boolean canConverterHandle(Converter<?, ?> converter, Class<?> presentationType, Class<?> modelType) { if (converter == null) { return false; @@ -234,7 +234,7 @@ public class LegacyConverterUtil implements Serializable { * given presentation and model type, false otherwise */ public static boolean canConverterPossiblyHandle( - LegacyConverter<?, ?> converter, Class<?> presentationType, + Converter<?, ?> converter, Class<?> presentationType, Class<?> modelType) { if (converter == null) { return false; diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToLongConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/DateToLongConverter.java index 495d43d2de..467b848988 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToLongConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/DateToLongConverter.java @@ -25,7 +25,7 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyDateToLongConverter implements LegacyConverter<Date, Long> { +public class DateToLongConverter implements Converter<Date, Long> { /* * (non-Javadoc) diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToSqlDateConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/DateToSqlDateConverter.java index a64a7ab04c..c789e7d1e8 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDateToSqlDateConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/DateToSqlDateConverter.java @@ -32,8 +32,8 @@ import java.util.Locale; * @since 7.1 * @author Vaadin Ltd */ -public class LegacyDateToSqlDateConverter - implements LegacyConverter<Date, java.sql.Date> { +public class DateToSqlDateConverter + implements Converter<Date, java.sql.Date> { @Override public java.sql.Date convertToModel(Date value, diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDefaultConverterFactory.java b/server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java index 5becb07143..681cbfc6b2 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyDefaultConverterFactory.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/DefaultConverterFactory.java @@ -24,26 +24,26 @@ import java.util.logging.Logger; import com.vaadin.server.VaadinSession; /** - * Default implementation of {@link LegacyConverterFactory}. Provides converters + * Default implementation of {@link ConverterFactory}. Provides converters * for standard types like {@link String}, {@link Double} and {@link Date}. * </p> * <p> * Custom converters can be provided by extending this class and using - * {@link VaadinSession#setConverterFactory(LegacyConverterFactory)}. + * {@link VaadinSession#setConverterFactory(ConverterFactory)}. * </p> * * @author Vaadin Ltd * @since 7.0 */ -public class LegacyDefaultConverterFactory implements LegacyConverterFactory { +public class DefaultConverterFactory implements ConverterFactory { private final static Logger log = Logger - .getLogger(LegacyDefaultConverterFactory.class.getName()); + .getLogger(DefaultConverterFactory.class.getName()); @Override - public <PRESENTATION, MODEL> LegacyConverter<PRESENTATION, MODEL> createConverter( + public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter( Class<PRESENTATION> presentationType, Class<MODEL> modelType) { - LegacyConverter<PRESENTATION, MODEL> converter = findConverter( + Converter<PRESENTATION, MODEL> converter = findConverter( presentationType, modelType); if (converter != null) { log.finest(getClass().getName() + " created a " @@ -52,12 +52,12 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { } // Try to find a reverse converter - LegacyConverter<MODEL, PRESENTATION> reverseConverter = findConverter( + Converter<MODEL, PRESENTATION> reverseConverter = findConverter( modelType, presentationType); if (reverseConverter != null) { log.finest(getClass().getName() + " created a reverse " + reverseConverter.getClass()); - return new LegacyReverseConverter<PRESENTATION, MODEL>( + return new ReverseConverter<PRESENTATION, MODEL>( reverseConverter); } @@ -68,18 +68,18 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { } - protected <PRESENTATION, MODEL> LegacyConverter<PRESENTATION, MODEL> findConverter( + protected <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> findConverter( Class<PRESENTATION> presentationType, Class<MODEL> modelType) { if (presentationType == String.class) { // TextField converters and more - LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createStringConverter( + Converter<PRESENTATION, MODEL> converter = (Converter<PRESENTATION, MODEL>) createStringConverter( modelType); if (converter != null) { return converter; } } else if (presentationType == Date.class) { // DateField converters and more - LegacyConverter<PRESENTATION, MODEL> converter = (LegacyConverter<PRESENTATION, MODEL>) createDateConverter( + Converter<PRESENTATION, MODEL> converter = (Converter<PRESENTATION, MODEL>) createDateConverter( modelType); if (converter != null) { return converter; @@ -90,41 +90,41 @@ public class LegacyDefaultConverterFactory implements LegacyConverterFactory { } - protected LegacyConverter<Date, ?> createDateConverter( + protected Converter<Date, ?> createDateConverter( Class<?> sourceType) { if (Long.class.isAssignableFrom(sourceType)) { - return new LegacyDateToLongConverter(); + return new DateToLongConverter(); } else if (java.sql.Date.class.isAssignableFrom(sourceType)) { - return new LegacyDateToSqlDateConverter(); + return new DateToSqlDateConverter(); } else { return null; } } - protected LegacyConverter<String, ?> createStringConverter( + protected Converter<String, ?> createStringConverter( Class<?> sourceType) { if (Double.class.isAssignableFrom(sourceType)) { - return new LegacyStringToDoubleConverter(); + return new StringToDoubleConverter(); } else if (Float.class.isAssignableFrom(sourceType)) { - return new LegacyStringToFloatConverter(); + return new StringToFloatConverter(); } else if (Integer.class.isAssignableFrom(sourceType)) { - return new LegacyStringToIntegerConverter(); + return new StringToIntegerConverter(); } else if (Long.class.isAssignableFrom(sourceType)) { - return new LegacyStringToLongConverter(); + return new StringToLongConverter(); } else if (BigDecimal.class.isAssignableFrom(sourceType)) { - return new LegacyStringToBigDecimalConverter(); + return new StringToBigDecimalConverter(); } else if (Boolean.class.isAssignableFrom(sourceType)) { - return new LegacyStringToBooleanConverter(); + return new StringToBooleanConverter(); } else if (Date.class.isAssignableFrom(sourceType)) { - return new LegacyStringToDateConverter(); + return new StringToDateConverter(); } else if (Enum.class.isAssignableFrom(sourceType)) { - return new LegacyStringToEnumConverter(); + return new StringToEnumConverter(); } else if (BigInteger.class.isAssignableFrom(sourceType)) { - return new LegacyStringToBigIntegerConverter(); + return new StringToBigIntegerConverter(); } else if (Short.class.isAssignableFrom(sourceType)) { - return new LegacyStringToShortConverter(); + return new StringToShortConverter(); } else if (Byte.class.isAssignableFrom(sourceType)) { - return new LegacyStringToByteConverter(); + return new StringToByteConverter(); } else { return null; } diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyReverseConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java index 7a4a968b99..cbbf62ad6c 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyReverseConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/ReverseConverter.java @@ -19,7 +19,7 @@ package com.vaadin.v7.data.util.converter; import java.util.Locale; /** - * A converter that wraps another {@link LegacyConverter} and reverses source + * A converter that wraps another {@link Converter} and reverses source * and target types. * * @param <MODEL> @@ -30,10 +30,10 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyReverseConverter<PRESENTATION, MODEL> - implements LegacyConverter<PRESENTATION, MODEL> { +public class ReverseConverter<PRESENTATION, MODEL> + implements Converter<PRESENTATION, MODEL> { - private LegacyConverter<MODEL, PRESENTATION> realConverter; + private Converter<MODEL, PRESENTATION> realConverter; /** * Creates a converter from source to target based on a converter that @@ -42,8 +42,8 @@ public class LegacyReverseConverter<PRESENTATION, MODEL> * @param converter * The converter to use in a reverse fashion */ - public LegacyReverseConverter( - LegacyConverter<MODEL, PRESENTATION> converter) { + public ReverseConverter( + Converter<MODEL, PRESENTATION> converter) { this.realConverter = converter; } @@ -56,7 +56,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL> @Override public MODEL convertToModel(PRESENTATION value, Class<? extends MODEL> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { return realConverter.convertToPresentation(value, targetType, locale); } @@ -70,7 +70,7 @@ public class LegacyReverseConverter<PRESENTATION, MODEL> @Override public PRESENTATION convertToPresentation(MODEL value, Class<? extends PRESENTATION> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { return realConverter.convertToModel(value, targetType, locale); } diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigDecimalConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigDecimalConverter.java index 60374d4255..ff8649b7d8 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigDecimalConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigDecimalConverter.java @@ -34,8 +34,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.2 */ -public class LegacyStringToBigDecimalConverter - extends LegacyAbstractStringToNumberConverter<BigDecimal> { +public class StringToBigDecimalConverter + extends AbstractStringToNumberConverter<BigDecimal> { @Override protected NumberFormat getFormat(Locale locale) { NumberFormat numberFormat = super.getFormat(locale); @@ -49,7 +49,7 @@ public class LegacyStringToBigDecimalConverter @Override public BigDecimal convertToModel(String value, Class<? extends BigDecimal> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { return (BigDecimal) convertToNumber(value, BigDecimal.class, locale); } diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigIntegerConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigIntegerConverter.java index 76cd77d86f..d645fd35ad 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBigIntegerConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToBigIntegerConverter.java @@ -35,8 +35,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToBigIntegerConverter - extends LegacyAbstractStringToNumberConverter<BigInteger> { +public class StringToBigIntegerConverter + extends AbstractStringToNumberConverter<BigInteger> { @Override protected NumberFormat getFormat(Locale locale) { @@ -51,7 +51,7 @@ public class LegacyStringToBigIntegerConverter @Override public BigInteger convertToModel(String value, Class<? extends BigInteger> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { BigDecimal bigDecimalValue = (BigDecimal) convertToNumber(value, BigDecimal.class, locale); diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBooleanConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToBooleanConverter.java index f43144f56b..c8ebea6e5b 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToBooleanConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToBooleanConverter.java @@ -33,8 +33,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToBooleanConverter - implements LegacyConverter<String, Boolean> { +public class StringToBooleanConverter + implements Converter<String, Boolean> { private final String trueString; @@ -45,7 +45,7 @@ public class LegacyStringToBooleanConverter * "false" * */ - public LegacyStringToBooleanConverter() { + public StringToBooleanConverter() { this(Boolean.TRUE.toString(), Boolean.FALSE.toString()); } @@ -58,7 +58,7 @@ public class LegacyStringToBooleanConverter * @param trueString * string representation for <code>true</code> */ - public LegacyStringToBooleanConverter(String trueString, + public StringToBooleanConverter(String trueString, String falseString) { this.trueString = trueString; this.falseString = falseString; diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToByteConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToByteConverter.java index 5d24211286..e915a95550 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToByteConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToByteConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToByteConverter - extends LegacyAbstractStringToNumberConverter<Byte> { +public class StringToByteConverter + extends AbstractStringToNumberConverter<Byte> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToCollectionConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToCollectionConverter.java index f4475ad4a3..708cc13fe8 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToCollectionConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToCollectionConverter.java @@ -38,11 +38,11 @@ import java.util.Locale; * * @author Vaadin Ltd */ -public class LegacyStringToCollectionConverter - implements LegacyConverter<String, Collection> { +public class StringToCollectionConverter + implements Converter<String, Collection> { private final String delimiter; - private final LegacyConverter<String, ?> tokenConverter; + private final Converter<String, ?> tokenConverter; private final Class<?> tokenType; private final CollectionFactory factory; @@ -50,7 +50,7 @@ public class LegacyStringToCollectionConverter * Creates converter with <code>", "</code> as delimiter and {@link String} * as token model type in collection. */ - public LegacyStringToCollectionConverter() { + public StringToCollectionConverter() { this(", ", null, String.class); } @@ -61,7 +61,7 @@ public class LegacyStringToCollectionConverter * @param delimiter * custom delimiter */ - public LegacyStringToCollectionConverter(String delimiter) { + public StringToCollectionConverter(String delimiter) { this(delimiter, null, String.class); } @@ -77,8 +77,8 @@ public class LegacyStringToCollectionConverter * @param tokenType * expected token model type */ - public LegacyStringToCollectionConverter( - LegacyConverter<String, ?> tokenConverter, Class<?> tokenType) { + public StringToCollectionConverter( + Converter<String, ?> tokenConverter, Class<?> tokenType) { this(", ", tokenConverter, tokenType); } @@ -96,8 +96,8 @@ public class LegacyStringToCollectionConverter * @param delimiter * delimiter in presentation string */ - public LegacyStringToCollectionConverter(String delimiter, - LegacyConverter<String, ?> tokenConverter, Class<?> tokenClass) { + public StringToCollectionConverter(String delimiter, + Converter<String, ?> tokenConverter, Class<?> tokenClass) { this(delimiter, tokenConverter, tokenClass, new DefaultCollectionFactory()); } @@ -118,8 +118,8 @@ public class LegacyStringToCollectionConverter * @param factory * factory to create resulting collection */ - public LegacyStringToCollectionConverter(String delimiter, - LegacyConverter<String, ?> tokenConverter, Class<?> tokenClass, + public StringToCollectionConverter(String delimiter, + Converter<String, ?> tokenConverter, Class<?> tokenClass, CollectionFactory factory) { if (delimiter == null || delimiter.isEmpty()) { throw new IllegalArgumentException( @@ -144,7 +144,7 @@ public class LegacyStringToCollectionConverter @Override public Collection convertToModel(String value, Class<? extends Collection> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (value == null) { return null; } @@ -152,7 +152,7 @@ public class LegacyStringToCollectionConverter int index = value.indexOf(delimiter); int previous = 0; Collection result = factory.createCollection(targetType); - LegacyConverter converter = tokenConverter; + Converter converter = tokenConverter; while (index != -1) { collectToken(value.substring(previous, index), result, converter, locale); @@ -166,12 +166,12 @@ public class LegacyStringToCollectionConverter @Override public String convertToPresentation(Collection value, Class<? extends String> targetType, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { if (value == null) { return null; } StringBuilder builder = new StringBuilder(); - LegacyConverter converter = tokenConverter; + Converter converter = tokenConverter; for (Iterator<?> iterator = value.iterator(); iterator.hasNext();) { if (converter == null) { builder.append(iterator.next()); @@ -189,7 +189,7 @@ public class LegacyStringToCollectionConverter } private void collectToken(String token, Collection collection, - LegacyConverter converter, Locale locale) { + Converter converter, Locale locale) { if (converter == null) { collection.add(token); } else { diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDateConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToDateConverter.java index 8987f525f2..7d7f5b96aa 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDateConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToDateConverter.java @@ -34,8 +34,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToDateConverter - implements LegacyConverter<String, Date> { +public class StringToDateConverter + implements Converter<String, Date> { /** * Returns the format used by @@ -67,7 +67,7 @@ public class LegacyStringToDateConverter @Override public Date convertToModel(String value, Class<? extends Date> targetType, Locale locale) - throws com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException { + throws com.vaadin.v7.data.util.converter.Converter.ConversionException { if (targetType != getModelType()) { throw new ConversionException( "Converter only supports " + getModelType().getName() @@ -101,7 +101,7 @@ public class LegacyStringToDateConverter @Override public String convertToPresentation(Date 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/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDoubleConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToDoubleConverter.java index a1cdf53f51..1da06aa834 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToDoubleConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToDoubleConverter.java @@ -33,8 +33,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToDoubleConverter - extends LegacyAbstractStringToNumberConverter<Double> { +public class StringToDoubleConverter + extends AbstractStringToNumberConverter<Double> { /* * (non-Javadoc) diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToEnumConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToEnumConverter.java index 5b51fc5bfc..d753b1e73f 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToEnumConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToEnumConverter.java @@ -36,8 +36,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToEnumConverter - implements LegacyConverter<String, Enum> { +public class StringToEnumConverter + implements Converter<String, Enum> { @Override public Enum convertToModel(String value, Class<? extends Enum> targetType, diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToFloatConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToFloatConverter.java index 49f1a19c84..e37cf89784 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToFloatConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToFloatConverter.java @@ -33,8 +33,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToFloatConverter - extends LegacyAbstractStringToNumberConverter<Float> { +public class StringToFloatConverter + extends AbstractStringToNumberConverter<Float> { /* * (non-Javadoc) diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToIntegerConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToIntegerConverter.java index 52e57ee180..82dcf7e6b8 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToIntegerConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToIntegerConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.0 */ -public class LegacyStringToIntegerConverter - extends LegacyAbstractStringToNumberConverter<Integer> { +public class StringToIntegerConverter + extends AbstractStringToNumberConverter<Integer> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToLongConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToLongConverter.java index 6ce152f8db..29c129c3fd 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToLongConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToLongConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.2 */ -public class LegacyStringToLongConverter - extends LegacyAbstractStringToNumberConverter<Long> { +public class StringToLongConverter + extends AbstractStringToNumberConverter<Long> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToShortConverter.java b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToShortConverter.java index 8f05fea8a3..71408eb53e 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/converter/LegacyStringToShortConverter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/converter/StringToShortConverter.java @@ -30,8 +30,8 @@ import java.util.Locale; * @author Vaadin Ltd * @since 7.4 */ -public class LegacyStringToShortConverter - extends LegacyAbstractStringToNumberConverter<Short> { +public class StringToShortConverter + extends AbstractStringToNumberConverter<Short> { /** * Returns the format used by diff --git a/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java b/server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java index 0922657cac..17b708a22c 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/AbstractJunctionFilter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/AbstractJunctionFilter.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import com.vaadin.data.Container.Filter; +import com.vaadin.v7.data.Container.Filter; /** * Abstract base class for filters that are composed of multiple sub-filters. diff --git a/server/src/main/java/com/vaadin/data/util/filter/And.java b/server/src/main/java/com/vaadin/v7/data/util/filter/And.java index f930d09ca8..b7b5a18f3d 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/And.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/And.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Container.Filter; /** * A compound {@link Filter} that accepts an item if all of its filters accept diff --git a/server/src/main/java/com/vaadin/data/util/filter/Between.java b/server/src/main/java/com/vaadin/v7/data/util/filter/Between.java index 9b81ef610d..ec0e468554 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/Between.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/Between.java @@ -13,13 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import java.util.Arrays; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; import com.vaadin.shared.util.SharedUtil; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Container.Filter; public class Between implements Filter { diff --git a/server/src/main/java/com/vaadin/data/util/filter/Compare.java b/server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java index c2c8f23777..5b945ff411 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/Compare.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/Compare.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Container.Filter; /** * Simple container filter comparing an item property value against a given diff --git a/server/src/main/java/com/vaadin/data/util/filter/IsNull.java b/server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java index 3e5fb985fe..0a7e115255 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/IsNull.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/IsNull.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Container.Filter; /** * Simple container filter checking whether an item property value is null. diff --git a/server/src/main/java/com/vaadin/data/util/filter/Like.java b/server/src/main/java/com/vaadin/v7/data/util/filter/Like.java index 71d6ee5ec5..5d92271afe 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/Like.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/Like.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Container.Filter; public class Like implements Filter { private final Object propertyId; diff --git a/server/src/main/java/com/vaadin/data/util/filter/Not.java b/server/src/main/java/com/vaadin/v7/data/util/filter/Not.java index 566ad9cc56..d0680eb481 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/Not.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/Not.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Container.Filter; /** * Negating filter that accepts the items rejected by another filter. diff --git a/server/src/main/java/com/vaadin/data/util/filter/Or.java b/server/src/main/java/com/vaadin/v7/data/util/filter/Or.java index fffa2242d0..5062e6d987 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/Or.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/Or.java @@ -13,10 +13,10 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Container.Filter; /** * A compound {@link Filter} that accepts an item if any of its filters accept diff --git a/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java b/server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java index 51f9e19b61..b3f7d032e1 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/SimpleStringFilter.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/SimpleStringFilter.java @@ -13,11 +13,11 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; -import com.vaadin.data.Container.Filter; -import com.vaadin.data.Item; -import com.vaadin.data.Property; +import com.vaadin.v7.data.Item; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Container.Filter; /** * Simple string filter for matching items that start with or contain a diff --git a/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java b/server/src/main/java/com/vaadin/v7/data/util/filter/UnsupportedFilterException.java index 507c1a8163..68e18da32a 100644 --- a/server/src/main/java/com/vaadin/data/util/filter/UnsupportedFilterException.java +++ b/server/src/main/java/com/vaadin/v7/data/util/filter/UnsupportedFilterException.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.data.util.filter; +package com.vaadin.v7.data.util.filter; import java.io.Serializable; diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java b/server/src/main/java/com/vaadin/v7/ui/AbstractField.java index dec8f9fef7..33f262d581 100644 --- a/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractField.java +++ b/server/src/main/java/com/vaadin/v7/ui/AbstractField.java @@ -30,8 +30,6 @@ import java.util.logging.Logger; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; -import com.vaadin.data.Buffered; -import com.vaadin.data.Property; import com.vaadin.event.Action; import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutListener; @@ -44,24 +42,26 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Buffered; +import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Validatable; import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.data.util.converter.LegacyConverterUtil; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.data.util.converter.ConverterUtil; /** * <p> * Abstract field component for implementing buffered property editors. The * field may hold an internal value, or it may be connected to any data source - * that implements the {@link com.vaadin.data.Property}interface. + * that implements the {@link com.vaadin.v7.data.Property}interface. * <code>LegacyAbstractField</code> implements that interface itself, too, so * accessing the Property value represented by it is straightforward. * </p> * * <p> - * LegacyAbstractField also provides the {@link com.vaadin.data.Buffered} + * LegacyAbstractField also provides the {@link com.vaadin.v7.data.Buffered} * interface for buffering the data source value. By default the LegacyField is * in write through-mode and {@link #setWriteThrough(boolean)}should be called * to enable buffering. @@ -83,8 +83,8 @@ import com.vaadin.v7.data.util.converter.LegacyConverterUtil; */ @SuppressWarnings("serial") @Deprecated -public abstract class LegacyAbstractField<T> extends AbstractComponent - implements LegacyField<T>, Property.ReadOnlyStatusChangeListener, +public abstract class AbstractField<T> extends AbstractComponent + implements Field<T>, Property.ReadOnlyStatusChangeListener, Property.ReadOnlyStatusChangeNotifier, Action.ShortcutNotifier { /* Private members */ @@ -98,7 +98,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * A converter used to convert from the data model type to the field type * and vice versa. */ - private LegacyConverter<T, Object> converter = null; + private Converter<T, Object> converter = null; /** * Connected data-source. */ @@ -228,7 +228,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent /** * Tests if the invalid data is committed to datasource. * - * @see com.vaadin.data.BufferedValidatable#isInvalidCommitted() + * @see com.vaadin.v7.data.BufferedValidatable#isInvalidCommitted() */ @Override public boolean isInvalidCommitted() { @@ -238,7 +238,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent /** * Sets if the invalid data should be committed to datasource. * - * @see com.vaadin.data.BufferedValidatable#setInvalidCommitted(boolean) + * @see com.vaadin.v7.data.BufferedValidatable#setInvalidCommitted(boolean) */ @Override public void setInvalidCommitted(boolean isCommitted) { @@ -425,7 +425,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent */ @Override public void setValue(T newFieldValue) throws Property.ReadOnlyException, - LegacyConverter.ConversionException { + Converter.ConversionException { setValue(newFieldValue, false); } @@ -437,7 +437,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * @param repaintIsNotNeeded * True iff caller is sure that repaint is not needed. * @throws Property.ReadOnlyException - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * @throws InvalidValueException */ protected void setValue(T newFieldValue, boolean repaintIsNotNeeded) { @@ -455,12 +455,12 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * @param ignoreReadOnly * True iff if the read-only check should be ignored * @throws Property.ReadOnlyException - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * @throws InvalidValueException */ protected void setValue(T newFieldValue, boolean repaintIsNotNeeded, boolean ignoreReadOnly) throws Property.ReadOnlyException, - LegacyConverter.ConversionException, InvalidValueException { + Converter.ConversionException, InvalidValueException { if (!SharedUtil.equals(newFieldValue, getInternalValue())) { @@ -584,13 +584,13 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * * <p> * If the data source implements - * {@link com.vaadin.data.Property.ValueChangeNotifier} and/or - * {@link com.vaadin.data.Property.ReadOnlyStatusChangeNotifier}, the field + * {@link com.vaadin.v7.data.Property.ValueChangeNotifier} and/or + * {@link com.vaadin.v7.data.Property.ReadOnlyStatusChangeNotifier}, the field * registers itself as a listener and updates itself according to the events * it receives. To avoid memory leaks caused by references to a field no * longer in use, the listener registrations are removed on - * {@link LegacyAbstractField#detach() detach} and re-added on - * {@link LegacyAbstractField#attach() attach}. + * {@link AbstractField#detach() detach} and re-added on + * {@link AbstractField#attach() attach}. * </p> * * <p> @@ -621,7 +621,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent // Check if the current converter is compatible. if (newDataSource != null - && !LegacyConverterUtil.canConverterPossiblyHandle( + && !ConverterUtil.canConverterPossiblyHandle( getConverter(), getType(), newDataSource.getType())) { // There is no converter set or there is no way the current // converter can be compatible. @@ -678,7 +678,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * from */ public void setConverter(Class<?> datamodelType) { - LegacyConverter<T, ?> c = (LegacyConverter<T, ?>) LegacyConverterUtil + Converter<T, ?> c = (Converter<T, ?>) ConverterUtil .getConverter(getType(), datamodelType, getSession()); setConverter(c); } @@ -690,7 +690,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * The data source value to convert. * @return The converted value that is compatible with the UI type or the * original value if its type is compatible and no converter is set. - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * if there is no converter and the type is not compatible with * the data source type. */ @@ -705,12 +705,12 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * The data source value to convert. * @return The converted value that is compatible with the UI type or the * original value if its type is compatible and no converter is set. - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * if there is no converter and the type is not compatible with * the data source type. */ private T convertFromModel(Object newValue, Locale locale) { - return LegacyConverterUtil.convertFromModel(newValue, getType(), + return ConverterUtil.convertFromModel(newValue, getType(), getConverter(), locale); } @@ -721,12 +721,12 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * The value to convert. Typically returned by * {@link #getFieldValue()} * @return The converted value that is compatible with the data source type. - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * if there is no converter and the type is not compatible with * the data source type. */ private Object convertToModel(T fieldValue) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { return convertToModel(fieldValue, getLocale()); } @@ -739,15 +739,15 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * @param locale * The locale to use for the conversion * @return The converted value that is compatible with the data source type. - * @throws LegacyConverter.ConversionException + * @throws Converter.ConversionException * if there is no converter and the type is not compatible with * the data source type. */ private Object convertToModel(T fieldValue, Locale locale) - throws LegacyConverter.ConversionException { + throws Converter.ConversionException { Class<?> modelType = getModelType(); try { - return LegacyConverterUtil.convertToModel(fieldValue, + return ConverterUtil.convertToModel(fieldValue, (Class<Object>) modelType, getConverter(), locale); } catch (ConversionException e) { throw new ConversionException(getConversionError(modelType, e), e); @@ -805,7 +805,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * Returns the current value (as returned by {@link #getValue()}) converted * to the data source type. * <p> - * This returns the same as {@link LegacyAbstractField#getValue()} if no + * This returns the same as {@link AbstractField#getValue()} if no * converter has been set. The value is not necessarily the same as the data * source value e.g. if the field is in buffered mode and has been modified. * </p> @@ -1091,7 +1091,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent */ @Override public void addValueChangeListener(Property.ValueChangeListener listener) { - addListener(LegacyAbstractField.ValueChangeEvent.class, listener, + addListener(AbstractField.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD); // ensure "automatic immediate handling" works markAsDirty(); @@ -1099,7 +1099,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1115,7 +1115,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent @Override public void removeValueChangeListener( Property.ValueChangeListener listener) { - removeListener(LegacyAbstractField.ValueChangeEvent.class, listener, + removeListener(AbstractField.ValueChangeEvent.class, listener, VALUE_CHANGE_METHOD); // ensure "automatic immediate handling" works markAsDirty(); @@ -1123,7 +1123,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.data.Property.ValueChangeListener)} + * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} **/ @Override @Deprecated @@ -1136,7 +1136,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * validated before the event is created. */ protected void fireValueChange(boolean repaintIsNotNeeded) { - fireEvent(new LegacyAbstractField.ValueChangeEvent(this)); + fireEvent(new AbstractField.ValueChangeEvent(this)); if (!repaintIsNotNeeded) { markAsDirty(); } @@ -1194,7 +1194,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * @param source * the Source of the event. */ - public ReadOnlyStatusChangeEvent(LegacyAbstractField source) { + public ReadOnlyStatusChangeEvent(AbstractField source) { super(source); } @@ -1223,7 +1223,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #addReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #addReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -1245,7 +1245,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent /** * @deprecated As of 7.0, replaced by - * {@link #removeReadOnlyStatusChangeListener(com.vaadin.data.Property.ReadOnlyStatusChangeListener)} + * {@link #removeReadOnlyStatusChangeListener(com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener)} **/ @Override @Deprecated @@ -1258,7 +1258,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * is validated before the event is created. */ protected void fireReadOnlyStatusChange() { - fireEvent(new LegacyAbstractField.ReadOnlyStatusChangeEvent(this)); + fireEvent(new AbstractField.ReadOnlyStatusChangeEvent(this)); } /** @@ -1584,7 +1584,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent /** * A ready-made {@link ShortcutListener} that focuses the given - * {@link Focusable} (usually a {@link LegacyField}) when the keyboard + * {@link Focusable} (usually a {@link Field}) when the keyboard * shortcut is invoked. * */ @@ -1685,7 +1685,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * * @return The converter or null if none is set. */ - public LegacyConverter<T, Object> getConverter() { + public Converter<T, Object> getConverter() { return converter; } @@ -1697,8 +1697,8 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent * @param converter * The new converter to use. */ - public void setConverter(LegacyConverter<T, ?> converter) { - this.converter = (LegacyConverter<T, Object>) converter; + public void setConverter(Converter<T, ?> converter) { + this.converter = (Converter<T, Object>) converter; markAsDirty(); } @@ -1796,7 +1796,7 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - LegacyAbstractField def = (LegacyAbstractField) designContext + AbstractField def = (AbstractField) designContext .getDefaultInstance(this); Attributes attr = design.attributes(); // handle readonly @@ -1805,6 +1805,6 @@ public abstract class LegacyAbstractField<T> extends AbstractComponent } private static final Logger getLogger() { - return Logger.getLogger(LegacyAbstractField.class.getName()); + return Logger.getLogger(AbstractField.class.getName()); } } diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractTextField.java b/server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java index 31f794f8c9..3f2e62afff 100644 --- a/server/src/main/java/com/vaadin/v7/ui/LegacyAbstractTextField.java +++ b/server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java @@ -40,8 +40,8 @@ import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; @Deprecated -public abstract class LegacyAbstractTextField - extends LegacyAbstractField<String> implements BlurNotifier, +public abstract class AbstractTextField + extends AbstractField<String> implements BlurNotifier, FocusNotifier, TextChangeNotifier, LegacyComponent { /** @@ -95,7 +95,7 @@ public abstract class LegacyAbstractTextField */ private boolean changingVariables; - protected LegacyAbstractTextField() { + protected AbstractTextField() { super(); } @@ -250,7 +250,7 @@ public abstract class LegacyAbstractTextField * </p> * * @return the String Textual representation for null strings. - * @see LegacyTextField#isNullSettingAllowed() + * @see TextField#isNullSettingAllowed() */ public String getNullRepresentation() { return nullRepresentation; @@ -274,7 +274,7 @@ public abstract class LegacyAbstractTextField * * @return boolean Should the null-string represenation be always converted * to null-values. - * @see LegacyTextField#getNullRepresentation() + * @see TextField#getNullRepresentation() */ public boolean isNullSettingAllowed() { return nullSettingAllowed; @@ -295,7 +295,7 @@ public abstract class LegacyAbstractTextField * * @param nullRepresentation * Textual representation for null strings. - * @see LegacyTextField#setNullSettingAllowed(boolean) + * @see TextField#setNullSettingAllowed(boolean) */ public void setNullRepresentation(String nullRepresentation) { this.nullRepresentation = nullRepresentation; @@ -321,7 +321,7 @@ public abstract class LegacyAbstractTextField * @param nullSettingAllowed * Should the null-string representation always be converted to * null-values. - * @see LegacyTextField#getNullRepresentation() + * @see TextField#getNullRepresentation() */ public void setNullSettingAllowed(boolean nullSettingAllowed) { this.nullSettingAllowed = nullSettingAllowed; @@ -601,15 +601,15 @@ public abstract class LegacyAbstractTextField private String curText; private int cursorPosition; - private TextChangeEventImpl(final LegacyAbstractTextField tf) { + private TextChangeEventImpl(final AbstractTextField tf) { super(tf); curText = tf.getCurrentTextContent(); cursorPosition = tf.getCursorPosition(); } @Override - public LegacyAbstractTextField getComponent() { - return (LegacyAbstractTextField) super.getComponent(); + public AbstractTextField getComponent() { + return (AbstractTextField) super.getComponent(); } @Override @@ -804,7 +804,7 @@ public abstract class LegacyAbstractTextField @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - LegacyAbstractTextField def = (LegacyAbstractTextField) designContext + AbstractTextField def = (AbstractTextField) designContext .getDefaultInstance(this); Attributes attr = design.attributes(); DesignAttributeHandler.writeAttribute("maxlength", attr, getMaxLength(), diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyCheckBox.java b/server/src/main/java/com/vaadin/v7/ui/CheckBox.java index 4696e104a3..84488bc875 100644 --- a/server/src/main/java/com/vaadin/v7/ui/LegacyCheckBox.java +++ b/server/src/main/java/com/vaadin/v7/ui/CheckBox.java @@ -21,7 +21,6 @@ import java.util.Collection; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl; @@ -32,8 +31,9 @@ import com.vaadin.shared.ui.checkbox.CheckBoxServerRpc; import com.vaadin.shared.ui.checkbox.CheckBoxState; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Property; -public class LegacyCheckBox extends LegacyAbstractField<Boolean> { +public class CheckBox extends AbstractField<Boolean> { private CheckBoxServerRpc rpc = new CheckBoxServerRpc() { @@ -52,7 +52,7 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { * * See #11028, #10030. */ - getUI().getConnectorTracker().getDiffState(LegacyCheckBox.this) + getUI().getConnectorTracker().getDiffState(CheckBox.this) .put("checked", checked); final Boolean oldValue = getValue(); @@ -70,14 +70,14 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { this) { @Override protected void fireEvent(Event event) { - LegacyCheckBox.this.fireEvent(event); + CheckBox.this.fireEvent(event); } }; /** * Creates a new checkbox. */ - public LegacyCheckBox() { + public CheckBox() { registerRpc(rpc); registerRpc(focusBlurRpc); setValue(Boolean.FALSE); @@ -89,7 +89,7 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { * @param caption * the Checkbox caption. */ - public LegacyCheckBox(String caption) { + public CheckBox(String caption) { this(); setCaption(caption); } @@ -102,7 +102,7 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { * @param initialState * the initial state of the checkbox */ - public LegacyCheckBox(String caption, boolean initialState) { + public CheckBox(String caption, boolean initialState) { this(caption); setValue(initialState); } @@ -114,7 +114,7 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { * the Initial state of the switch-button. * @param dataSource */ - public LegacyCheckBox(String caption, Property<?> dataSource) { + public CheckBox(String caption, Property<?> dataSource) { this(caption); setPropertyDataSource(dataSource); } @@ -248,7 +248,7 @@ public class LegacyCheckBox extends LegacyAbstractField<Boolean> { @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - LegacyCheckBox def = (LegacyCheckBox) designContext + CheckBox def = (CheckBox) designContext .getDefaultInstance(this); Attributes attr = design.attributes(); DesignAttributeHandler.writeAttribute("checked", attr, getValue(), diff --git a/server/src/main/java/com/vaadin/legacy/ui/LegacyCustomField.java b/server/src/main/java/com/vaadin/v7/ui/CustomField.java index 4ef634e69b..f55b3307a3 100644 --- a/server/src/main/java/com/vaadin/legacy/ui/LegacyCustomField.java +++ b/server/src/main/java/com/vaadin/v7/ui/CustomField.java @@ -14,22 +14,19 @@ * the License. */ -package com.vaadin.legacy.ui; +package com.vaadin.v7.ui; import java.io.Serializable; import java.util.Iterator; -import com.vaadin.data.Property; import com.vaadin.ui.Component; import com.vaadin.ui.HasComponents; -import com.vaadin.v7.ui.LegacyAbstractField; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.data.Property; /** - * A {@link LegacyField} whose UI content can be constructed by the user, - * enabling the creation of e.g. form fields by composing Vaadin components. - * Customization of both the visual presentation and the logic of the field is - * possible. + * A {@link Field} whose UI content can be constructed by the user, enabling the + * creation of e.g. form fields by composing Vaadin components. Customization of + * both the visual presentation and the logic of the field is possible. * * Subclasses must implement {@link #getType()} and {@link #initContent()}. * @@ -48,7 +45,7 @@ import com.vaadin.v7.ui.LegacyField; * * @since 7.0 */ -public abstract class LegacyCustomField<T> extends LegacyAbstractField<T> +public abstract class CustomField<T> extends AbstractField<T> implements HasComponents { /** @@ -65,14 +62,14 @@ public abstract class LegacyCustomField<T> extends LegacyAbstractField<T> * before the component can be used. * </p> */ - public LegacyCustomField() { + public CustomField() { // expand horizontally by default setWidth(100, Unit.PERCENTAGE); } /** - * Constructs the content and notifies it that the {@link LegacyCustomField} - * is attached to a window. + * Constructs the content and notifies it that the {@link CustomField} is + * attached to a window. * * @see com.vaadin.ui.Component#attach() */ @@ -102,11 +99,11 @@ public abstract class LegacyCustomField<T> extends LegacyAbstractField<T> /** * Create the content component or layout for the field. Subclasses of - * {@link LegacyCustomField} should implement this method. + * {@link CustomField} should implement this method. * * Note that this method is called when the CustomField is attached to a * layout or when {@link #getContent()} is called explicitly for the first - * time. It is only called once for a {@link LegacyCustomField}. + * time. It is only called once for a {@link CustomField}. * * @return {@link Component} representing the UI of the CustomField */ diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyField.java b/server/src/main/java/com/vaadin/v7/ui/Field.java index 79b4a6f3fc..0756dfaf90 100644 --- a/server/src/main/java/com/vaadin/v7/ui/LegacyField.java +++ b/server/src/main/java/com/vaadin/v7/ui/Field.java @@ -16,19 +16,19 @@ package com.vaadin.v7.ui; -import com.vaadin.data.BufferedValidatable; import com.vaadin.data.HasRequired; import com.vaadin.data.HasValue.ValueChange; -import com.vaadin.data.Property; import com.vaadin.ui.Component; import com.vaadin.ui.Component.Focusable; +import com.vaadin.v7.data.BufferedValidatable; +import com.vaadin.v7.data.Property; /** * LegacyField interface is implemented by all legacy field components that have * a value that the user can change through the user interface. * * LegacyField components are built upon the framework defined in the - * LegacyField interface and the {@link com.vaadin.LegacyAbstractField} base + * LegacyField interface and the {@link com.vaadin.AbstractField} base * class. * * The LegacyField interface inherits the {@link com.vaadin.ui.Component} @@ -47,7 +47,7 @@ import com.vaadin.ui.Component.Focusable; * extend {@link com.vaadin.ui.AbstractField} instead. */ @Deprecated -public interface LegacyField<T> extends Component, BufferedValidatable, +public interface Field<T> extends Component, BufferedValidatable, Property<T>, Property.ValueChangeNotifier, Property.ValueChangeListener, Property.Editor, Focusable, HasRequired { /** @@ -110,7 +110,7 @@ public interface LegacyField<T> extends Component, BufferedValidatable, * @param source * the field that caused the event. */ - public ValueChangeEvent(LegacyField source) { + public ValueChangeEvent(Field source) { super(source); } diff --git a/server/src/main/java/com/vaadin/ui/LegacyWindow.java b/server/src/main/java/com/vaadin/v7/ui/LegacyWindow.java index a6771da379..c313dcb627 100644 --- a/server/src/main/java/com/vaadin/ui/LegacyWindow.java +++ b/server/src/main/java/com/vaadin/v7/ui/LegacyWindow.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.ui; import java.net.MalformedURLException; import java.net.URL; @@ -24,6 +24,11 @@ import com.vaadin.server.Page.BrowserWindowResizeListener; import com.vaadin.server.Resource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.BorderStyle; +import com.vaadin.ui.Component; +import com.vaadin.ui.ComponentContainer; +import com.vaadin.ui.Link; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; /** * Helper class to emulate the main window from Vaadin 6 using UIs. This class diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyPasswordField.java b/server/src/main/java/com/vaadin/v7/ui/PasswordField.java index 35916959c8..787e024cc6 100644 --- a/server/src/main/java/com/vaadin/v7/ui/LegacyPasswordField.java +++ b/server/src/main/java/com/vaadin/v7/ui/PasswordField.java @@ -18,21 +18,21 @@ package com.vaadin.v7.ui; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Property; /** * A field that is used to enter secret text information like passwords. The * entered text is not displayed on the screen. */ @Deprecated -public class LegacyPasswordField extends LegacyAbstractTextField { +public class PasswordField extends AbstractTextField { /** * Constructs an empty PasswordField. */ - public LegacyPasswordField() { + public PasswordField() { setValue(""); } @@ -42,7 +42,7 @@ public class LegacyPasswordField extends LegacyAbstractTextField { * @param dataSource * the property data source for the field */ - public LegacyPasswordField(Property dataSource) { + public PasswordField(Property dataSource) { setPropertyDataSource(dataSource); } @@ -54,7 +54,7 @@ public class LegacyPasswordField extends LegacyAbstractTextField { * @param dataSource * the property data source for the field */ - public LegacyPasswordField(String caption, Property dataSource) { + public PasswordField(String caption, Property dataSource) { this(dataSource); setCaption(caption); } @@ -67,7 +67,7 @@ public class LegacyPasswordField extends LegacyAbstractTextField { * @param value * the value for the field */ - public LegacyPasswordField(String caption, String value) { + public PasswordField(String caption, String value) { setValue(value); setCaption(caption); } @@ -78,7 +78,7 @@ public class LegacyPasswordField extends LegacyAbstractTextField { * @param caption * the caption for the field */ - public LegacyPasswordField(String caption) { + public PasswordField(String caption) { this(); setCaption(caption); } @@ -108,7 +108,7 @@ public class LegacyPasswordField extends LegacyAbstractTextField { @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - LegacyAbstractTextField def = (LegacyAbstractTextField) designContext + AbstractTextField def = (AbstractTextField) designContext .getDefaultInstance(this); Attributes attr = design.attributes(); DesignAttributeHandler.writeAttribute("value", attr, getValue(), diff --git a/server/src/main/java/com/vaadin/v7/ui/LegacyTextField.java b/server/src/main/java/com/vaadin/v7/ui/TextField.java index 49da438660..0bd9511a71 100644 --- a/server/src/main/java/com/vaadin/v7/ui/LegacyTextField.java +++ b/server/src/main/java/com/vaadin/v7/ui/TextField.java @@ -19,9 +19,9 @@ package com.vaadin.v7.ui; import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; -import com.vaadin.data.Property; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.data.Property; /** * <p> @@ -32,9 +32,9 @@ import com.vaadin.ui.declarative.DesignContext; * * <p> * Since <code>TextField</code> extends <code>LegacyAbstractField</code> it - * implements the {@link com.vaadin.data.Buffered} interface. A + * implements the {@link com.vaadin.v7.data.Buffered} interface. A * <code>TextField</code> is in write-through mode by default, so - * {@link com.vaadin.v7.ui.LegacyAbstractField#setWriteThrough(boolean)} + * {@link com.vaadin.v7.ui.AbstractField#setWriteThrough(boolean)} * must be called to enable buffering. * </p> * @@ -43,12 +43,12 @@ import com.vaadin.ui.declarative.DesignContext; */ @SuppressWarnings("serial") @Deprecated -public class LegacyTextField extends LegacyAbstractTextField { +public class TextField extends AbstractTextField { /** * Constructs an empty <code>TextField</code> with no caption. */ - public LegacyTextField() { + public TextField() { clear(); } @@ -58,7 +58,7 @@ public class LegacyTextField extends LegacyAbstractTextField { * @param caption * the caption <code>String</code> for the editor. */ - public LegacyTextField(String caption) { + public TextField(String caption) { this(); setCaption(caption); } @@ -70,7 +70,7 @@ public class LegacyTextField extends LegacyAbstractTextField { * @param dataSource * the Property to be edited with this editor. */ - public LegacyTextField(Property dataSource) { + public TextField(Property dataSource) { setPropertyDataSource(dataSource); } @@ -83,7 +83,7 @@ public class LegacyTextField extends LegacyAbstractTextField { * @param dataSource * the Property to be edited with this editor. */ - public LegacyTextField(String caption, Property dataSource) { + public TextField(String caption, Property dataSource) { this(dataSource); setCaption(caption); } @@ -92,7 +92,7 @@ public class LegacyTextField extends LegacyAbstractTextField { * Constructs a new <code>TextField</code> with the given caption and * initial text contents. The editor constructed this way will not be bound * to a Property unless - * {@link com.vaadin.data.Property.Viewer#setPropertyDataSource(Property)} + * {@link com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(Property)} * is called to bind it. * * @param caption @@ -100,7 +100,7 @@ public class LegacyTextField extends LegacyAbstractTextField { * @param value * the initial text content of the editor. */ - public LegacyTextField(String caption, String value) { + public TextField(String caption, String value) { setValue(value); setCaption(caption); } @@ -131,7 +131,7 @@ public class LegacyTextField extends LegacyAbstractTextField { @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - LegacyAbstractTextField def = (LegacyAbstractTextField) designContext + AbstractTextField def = (AbstractTextField) designContext .getDefaultInstance(this); Attributes attr = design.attributes(); DesignAttributeHandler.writeAttribute("value", attr, getValue(), diff --git a/server/src/test/java/com/vaadin/tests/VaadinClasses.java b/server/src/test/java/com/vaadin/tests/VaadinClasses.java index e5397c8b47..ad1119a8ad 100644 --- a/server/src/test/java/com/vaadin/tests/VaadinClasses.java +++ b/server/src/test/java/com/vaadin/tests/VaadinClasses.java @@ -29,7 +29,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.Window; import com.vaadin.ui.themes.BaseTheme; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.Field; @SuppressWarnings("deprecation") public class VaadinClasses { @@ -63,9 +63,9 @@ public class VaadinClasses { } } - public static List<Class<? extends LegacyField>> getFields() { + public static List<Class<? extends Field>> getFields() { try { - return findClasses(LegacyField.class, "com.vaadin.ui"); + return findClasses(Field.class, "com.vaadin.ui"); } catch (IOException e) { e.printStackTrace(); return null; diff --git a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java index e727687228..7b5773b070 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java @@ -22,17 +22,17 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.data.bean.AnotherTestEnum; import com.vaadin.tests.data.bean.TestEnum; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyReverseConverter; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ReverseConverter; +import com.vaadin.v7.ui.TextField; public class AnyEnumToStringConverterTest { public class AnyEnumToStringConverter - implements LegacyConverter<Enum, String> { + implements Converter<Enum, String> { public AnyEnumToStringConverter() { } @@ -40,7 +40,7 @@ public class AnyEnumToStringConverterTest { @Override public String convertToModel(Enum 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; } @@ -51,7 +51,7 @@ public class AnyEnumToStringConverterTest { @Override public Enum convertToPresentation(String value, Class<? extends Enum> 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; } @@ -107,8 +107,8 @@ public class AnyEnumToStringConverterTest { @Test public void stringToEnumWithField() { - LegacyTextField tf = new LegacyTextField(); - tf.setConverter(new LegacyReverseConverter(converter)); + TextField tf = new TextField(); + tf.setConverter(new ReverseConverter(converter)); tf.setPropertyDataSource(new ObjectProperty(AnotherTestEnum.TWO)); Assert.assertEquals(AnotherTestEnum.TWO.toString(), tf.getValue()); tf.setValue(AnotherTestEnum.ONE.toString()); diff --git a/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java index 41886edc62..be3bf0db97 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/ConverterFactoryTest.java @@ -22,26 +22,26 @@ import org.junit.Test; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.DefaultConverterFactory; +import com.vaadin.v7.ui.TextField; public class ConverterFactoryTest { public static class ConvertTo42 - 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 { return 42; } @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 "42"; } @@ -58,12 +58,12 @@ public class ConverterFactoryTest { } public static class ConverterFactory42 - extends LegacyDefaultConverterFactory { + extends DefaultConverterFactory { @Override - public <PRESENTATION, MODEL> LegacyConverter<PRESENTATION, MODEL> createConverter( + public <PRESENTATION, MODEL> Converter<PRESENTATION, MODEL> createConverter( Class<PRESENTATION> presentationType, Class<MODEL> modelType) { if (modelType == Integer.class) { - return (LegacyConverter<PRESENTATION, MODEL>) new ConvertTo42(); + return (Converter<PRESENTATION, MODEL>) new ConvertTo42(); } return super.createConverter(presentationType, modelType); @@ -78,7 +78,7 @@ public class ConverterFactoryTest { appWithCustomIntegerConverter .setConverterFactory(new ConverterFactory42()); - LegacyTextField tf = new LegacyTextField("", "123") { + TextField tf = new TextField("", "123") { @Override public VaadinSession getSession() { return appWithCustomIntegerConverter; @@ -98,7 +98,7 @@ public class ConverterFactoryTest { .setConverterFactory(new ConverterFactory42()); VaadinSession.setCurrent(appWithCustomIntegerConverter); - LegacyTextField tf = new LegacyTextField("", "123"); + TextField tf = new TextField("", "123"); tf.setConverter(Integer.class); // The application converter always returns 42. Current application is // null @@ -113,7 +113,7 @@ public class ConverterFactoryTest { .setConverterFactory(new ConverterFactory42()); VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null)); - LegacyTextField tf = new LegacyTextField("", "123") { + TextField tf = new TextField("", "123") { @Override public VaadinSession getSession() { return fieldAppWithCustomIntegerConverter; diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java index ff64465282..e8932b9600 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToLongConverterTest.java @@ -5,11 +5,11 @@ import java.util.Date; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyDateToLongConverter; +import com.vaadin.v7.data.util.converter.DateToLongConverter; public class DateToLongConverterTest { - LegacyDateToLongConverter converter = new LegacyDateToLongConverter(); + DateToLongConverter converter = new DateToLongConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java index 87b2ab6e85..607d71b70e 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java @@ -6,11 +6,11 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyDateToSqlDateConverter; +import com.vaadin.v7.data.util.converter.DateToSqlDateConverter; public class DateToSqlDateConverterTest { - LegacyDateToSqlDateConverter converter = new LegacyDateToSqlDateConverter(); + DateToSqlDateConverter converter = new DateToSqlDateConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java index f5e8213e80..518ca1936f 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java @@ -23,11 +23,11 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyDefaultConverterFactory; +import com.vaadin.v7.data.util.converter.DefaultConverterFactory; public class DefaultConverterFactoryTest { - private LegacyDefaultConverterFactory factory = new LegacyDefaultConverterFactory(); + private DefaultConverterFactory factory = new DefaultConverterFactory(); @Test public void stringToBigDecimal() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java index 87080e1151..627ab7943d 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java @@ -22,17 +22,17 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.data.bean.AnotherTestEnum; import com.vaadin.tests.data.bean.TestEnum; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyReverseConverter; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ReverseConverter; +import com.vaadin.v7.ui.TextField; public class SpecificEnumToStringConverterTest { public class SpecificEnumToStringConverter - implements LegacyConverter<Enum, String> { + implements Converter<Enum, String> { private Class<? extends Enum> enumClass; @@ -43,7 +43,7 @@ public class SpecificEnumToStringConverterTest { @Override public String convertToModel(Enum 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; } @@ -54,7 +54,7 @@ public class SpecificEnumToStringConverterTest { @Override public Enum convertToPresentation(String value, Class<? extends Enum> 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; } @@ -111,8 +111,8 @@ public class SpecificEnumToStringConverterTest { @Test public void stringToEnumWithField() { - LegacyTextField tf = new LegacyTextField(); - tf.setConverter(new LegacyReverseConverter(anotherTestEnumConverter)); + TextField tf = new TextField(); + tf.setConverter(new ReverseConverter(anotherTestEnumConverter)); tf.setPropertyDataSource(new ObjectProperty(AnotherTestEnum.TWO)); Assert.assertEquals(AnotherTestEnum.TWO.toString(), tf.getValue()); tf.setValue(AnotherTestEnum.ONE.toString()); diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java index 9fdd6f01b4..ff57849bf8 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java @@ -21,11 +21,11 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyStringToBigDecimalConverter; +import com.vaadin.v7.data.util.converter.StringToBigDecimalConverter; public class StringToBigDecimalConverterTest { - LegacyStringToBigDecimalConverter converter = new LegacyStringToBigDecimalConverter(); + StringToBigDecimalConverter converter = new StringToBigDecimalConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java index e40abf162a..db0edfce71 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java @@ -21,11 +21,11 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyStringToBigIntegerConverter; +import com.vaadin.v7.data.util.converter.StringToBigIntegerConverter; public class StringToBigIntegerConverterTest { - LegacyStringToBigIntegerConverter converter = new LegacyStringToBigIntegerConverter(); + StringToBigIntegerConverter converter = new StringToBigIntegerConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java index 1225b59f23..9889036f7d 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java @@ -7,14 +7,14 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyStringToBooleanConverter; +import com.vaadin.v7.data.util.converter.StringToBooleanConverter; public class StringToBooleanConverterTest { - LegacyStringToBooleanConverter converter = new LegacyStringToBooleanConverter(); - LegacyStringToBooleanConverter yesNoConverter = new LegacyStringToBooleanConverter( + StringToBooleanConverter converter = new StringToBooleanConverter(); + StringToBooleanConverter yesNoConverter = new StringToBooleanConverter( "yes", "no"); - LegacyStringToBooleanConverter localeConverter = new LegacyStringToBooleanConverter() { + StringToBooleanConverter localeConverter = new StringToBooleanConverter() { @Override public String getFalseString(Locale locale) { Date d = new Date(3000000000000L); diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java index dcbab5de06..a28d16797f 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToByteConverterTest.java @@ -3,15 +3,15 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.data.util.converter.LegacyReverseConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToByteConverter; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.data.util.converter.ReverseConverter; +import com.vaadin.v7.data.util.converter.StringToByteConverter; public class StringToByteConverterTest { - LegacyStringToByteConverter converter = new LegacyStringToByteConverter(); - LegacyConverter<Byte, String> reverseConverter = new LegacyReverseConverter<Byte, String>( + StringToByteConverter converter = new StringToByteConverter(); + Converter<Byte, String> reverseConverter = new ReverseConverter<Byte, String>( converter); @Test diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java index 3befeaffdf..d21f6c5803 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToCollectionConverterTest.java @@ -29,13 +29,13 @@ import java.util.Vector; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyStringToCollectionConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToCollectionConverter.CollectionFactory; -import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.util.converter.StringToCollectionConverter; +import com.vaadin.v7.data.util.converter.StringToCollectionConverter.CollectionFactory; +import com.vaadin.v7.data.util.converter.StringToEnumConverter; +import com.vaadin.v7.data.util.converter.StringToIntegerConverter; /** - * Tests for {@link LegacyStringToCollectionConverter}. + * Tests for {@link StringToCollectionConverter}. * * @author Vaadin Ltd */ @@ -43,7 +43,7 @@ public class StringToCollectionConverterTest { @Test public void convertToModel_defaultCtor() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter(); + StringToCollectionConverter converter = new StringToCollectionConverter(); Collection<?> model = converter.convertToModel("a, b, c", List.class, null); Assert.assertTrue("Unexpected model class", model instanceof ArrayList); @@ -55,7 +55,7 @@ public class StringToCollectionConverterTest { @Test public void convertToModel_customDelimiter() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter( + StringToCollectionConverter converter = new StringToCollectionConverter( "x"); Collection<?> model = converter.convertToModel("axbxc", List.class, null); @@ -68,8 +68,8 @@ public class StringToCollectionConverterTest { @Test public void convertToModel_customConverter() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter( - ",", new LegacyStringToIntegerConverter(), Integer.class); + StringToCollectionConverter converter = new StringToCollectionConverter( + ",", new StringToIntegerConverter(), Integer.class); Collection<?> model = converter.convertToModel("6,2,5", List.class, null); Assert.assertTrue("Unexpected model class", model instanceof ArrayList); @@ -81,8 +81,8 @@ public class StringToCollectionConverterTest { @Test public void convertToModel_setAsCollection() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter( - " ", new LegacyStringToEnumConverter(), TestEnum.class); + StringToCollectionConverter converter = new StringToCollectionConverter( + " ", new StringToEnumConverter(), TestEnum.class); Collection<?> model = converter.convertToModel("Z X Y", Set.class, null); Assert.assertTrue("Unexpected model class", model instanceof HashSet); @@ -102,7 +102,7 @@ public class StringToCollectionConverterTest { return new Vector(); } }; - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter( + StringToCollectionConverter converter = new StringToCollectionConverter( ", ", null, String.class, factory); Collection<?> model = converter.convertToModel("a, b, c", Collection.class, null); @@ -115,7 +115,7 @@ public class StringToCollectionConverterTest { @Test public void convertToPresentation_default() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter(); + StringToCollectionConverter converter = new StringToCollectionConverter(); String presentation = converter.convertToPresentation( Arrays.asList("a", "b", "c"), String.class, null); @@ -124,7 +124,7 @@ public class StringToCollectionConverterTest { @Test public void convertToPresentation_customDelimiter() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter( + StringToCollectionConverter converter = new StringToCollectionConverter( "x"); String presentation = converter.convertToPresentation( Arrays.asList("a", "b", "c"), String.class, null); @@ -134,8 +134,8 @@ public class StringToCollectionConverterTest { @Test public void convertToPresentation_customConverter() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter( - ",", new LegacyStringToEnumConverter(), TestEnum.class); + StringToCollectionConverter converter = new StringToCollectionConverter( + ",", new StringToEnumConverter(), TestEnum.class); String presentation = converter.convertToPresentation( Arrays.asList(TestEnum.Z, TestEnum.Y), String.class, null); @@ -144,7 +144,7 @@ public class StringToCollectionConverterTest { @Test public void convertToModel_singleItem() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter(); + StringToCollectionConverter converter = new StringToCollectionConverter(); Collection<?> model = converter.convertToModel("a", List.class, null); Iterator<?> iterator = model.iterator(); Assert.assertEquals("Incorrect fist token", "a", iterator.next()); @@ -154,14 +154,14 @@ public class StringToCollectionConverterTest { @Test public void convertToModel_null() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter(); + StringToCollectionConverter converter = new StringToCollectionConverter(); Assert.assertNull(converter.convertToModel(null, ArrayList.class, Locale.ENGLISH)); } @Test public void convertToPresentation_null() { - LegacyStringToCollectionConverter converter = new LegacyStringToCollectionConverter(); + StringToCollectionConverter converter = new StringToCollectionConverter(); Assert.assertNull(converter.convertToPresentation(null, String.class, Locale.ENGLISH)); } diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java index 3a5fbde5e7..b6f8214f36 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDateConverterTest.java @@ -6,11 +6,11 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyStringToDateConverter; +import com.vaadin.v7.data.util.converter.StringToDateConverter; public class StringToDateConverterTest { - LegacyStringToDateConverter converter = new LegacyStringToDateConverter(); + StringToDateConverter converter = new StringToDateConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java index 427606e942..d3e9831b4b 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java @@ -3,11 +3,11 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyStringToDoubleConverter; +import com.vaadin.v7.data.util.converter.StringToDoubleConverter; public class StringToDoubleConverterTest { - LegacyStringToDoubleConverter converter = new LegacyStringToDoubleConverter(); + StringToDoubleConverter converter = new StringToDoubleConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java index 270958dd9d..4e7131e956 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToEnumConverterTest.java @@ -3,10 +3,10 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.data.util.converter.LegacyReverseConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToEnumConverter; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.data.util.converter.ReverseConverter; +import com.vaadin.v7.data.util.converter.StringToEnumConverter; public class StringToEnumConverterTest { @@ -32,8 +32,8 @@ public class StringToEnumConverterTest { } } - LegacyStringToEnumConverter converter = new LegacyStringToEnumConverter(); - LegacyConverter<Enum, String> reverseConverter = new LegacyReverseConverter<Enum, String>( + StringToEnumConverter converter = new StringToEnumConverter(); + Converter<Enum, String> reverseConverter = new ReverseConverter<Enum, String>( converter); private String convertToString(Enum value) { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java index fee3612a88..e6768e30d9 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToFloatConverterTest.java @@ -3,11 +3,11 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyStringToFloatConverter; +import com.vaadin.v7.data.util.converter.StringToFloatConverter; public class StringToFloatConverterTest { - LegacyStringToFloatConverter converter = new LegacyStringToFloatConverter(); + StringToFloatConverter converter = new StringToFloatConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java index c1955d87f8..3d1f6985d2 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java @@ -3,12 +3,12 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.data.util.converter.StringToIntegerConverter; public class StringToIntegerConverterTest { - LegacyStringToIntegerConverter converter = new LegacyStringToIntegerConverter(); + StringToIntegerConverter converter = new StringToIntegerConverter(); @Test public void testNullConversion() { diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java index c1a749326d..77f1167769 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToLongConverterTest.java @@ -5,14 +5,14 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyReverseConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToLongConverter; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ReverseConverter; +import com.vaadin.v7.data.util.converter.StringToLongConverter; public class StringToLongConverterTest { - LegacyStringToLongConverter converter = new LegacyStringToLongConverter(); - LegacyConverter<Long, String> reverseConverter = new LegacyReverseConverter<Long, String>( + StringToLongConverter converter = new StringToLongConverter(); + Converter<Long, String> reverseConverter = new ReverseConverter<Long, String>( converter); @Test diff --git a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java index 5c29c39452..ca5c257f80 100644 --- a/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java +++ b/server/src/test/java/com/vaadin/tests/data/converter/StringToShortConverterTest.java @@ -3,15 +3,15 @@ package com.vaadin.tests.data.converter; import org.junit.Assert; import org.junit.Test; -import com.vaadin.v7.data.util.converter.LegacyConverter; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.data.util.converter.LegacyReverseConverter; -import com.vaadin.v7.data.util.converter.LegacyStringToShortConverter; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.data.util.converter.ReverseConverter; +import com.vaadin.v7.data.util.converter.StringToShortConverter; public class StringToShortConverterTest { - LegacyStringToShortConverter converter = new LegacyStringToShortConverter(); - LegacyConverter<Short, String> reverseConverter = new LegacyReverseConverter<Short, String>( + StringToShortConverter converter = new StringToShortConverter(); + Converter<Short, String> reverseConverter = new ReverseConverter<Short, String>( converter); @Test diff --git a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java index 3f304b6eb2..4c957f7491 100644 --- a/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java +++ b/server/src/test/java/com/vaadin/tests/design/DesignFormatterTest.java @@ -42,7 +42,7 @@ import com.vaadin.server.ThemeResource; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.declarative.DesignFormatter; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; /** * Various tests related to formatter. diff --git a/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java b/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java index 232d26d1d6..854f3666ac 100644 --- a/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/AbstractPropertyListenersTest.java @@ -2,13 +2,13 @@ package com.vaadin.tests.server; import org.junit.Test; -import com.vaadin.data.Property.ReadOnlyStatusChangeEvent; -import com.vaadin.data.Property.ReadOnlyStatusChangeListener; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.data.util.AbstractProperty; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +import com.vaadin.v7.data.Property.ReadOnlyStatusChangeEvent; +import com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener; +import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.v7.data.util.AbstractProperty; +import com.vaadin.v7.data.util.ObjectProperty; public class AbstractPropertyListenersTest extends AbstractListenerMethodsTestBase { diff --git a/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java index 920b2a7915..8c88257da4 100644 --- a/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java @@ -2,9 +2,9 @@ package com.vaadin.tests.server; import org.junit.Test; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; -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 EventRouterTest { @@ -12,7 +12,7 @@ public class EventRouterTest { @Test public void testAddInEventListener() { - final LegacyTextField tf = new LegacyTextField(); + final TextField tf = new TextField(); final ValueChangeListener outer = new ValueChangeListener() { diff --git a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java index df50893420..80c2b12fc1 100644 --- a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.AbstractExtension; import com.vaadin.ui.Label; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.TextField; public class ExtensionTest { @@ -33,7 +33,7 @@ public class ExtensionTest { @Test(expected = IllegalArgumentException.class) public void testRemoveExtensionFromWrongConnector() { Label l = new Label(); - LegacyTextField t = new LegacyTextField(); + TextField t = new TextField(); t.removeExtension(new DummyExtension(l)); } diff --git a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java index cc67c40dbb..775018642a 100644 --- a/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java +++ b/server/src/test/java/com/vaadin/tests/server/PropertyFormatterTest.java @@ -6,8 +6,8 @@ import java.util.Date; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.data.util.PropertyFormatter; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.PropertyFormatter; @SuppressWarnings("unchecked") public class PropertyFormatterTest { diff --git a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java b/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java index ee5f36323e..883130db32 100644 --- a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java @@ -1,9 +1,9 @@ package com.vaadin.tests.server; -import com.vaadin.data.Item.PropertySetChangeEvent; -import com.vaadin.data.Item.PropertySetChangeListener; -import com.vaadin.data.util.PropertysetItem; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +import com.vaadin.v7.data.Item.PropertySetChangeEvent; +import com.vaadin.v7.data.Item.PropertySetChangeListener; +import com.vaadin.v7.data.util.PropertysetItem; public class PropertysetItemListenersTest extends AbstractListenerMethodsTestBase { diff --git a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java index e96f3d36f3..ba2bccfb78 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java @@ -23,13 +23,13 @@ import org.junit.Test; import com.vaadin.tests.VaadinClasses; import com.vaadin.ui.Slider; -import com.vaadin.v7.ui.LegacyField; +import com.vaadin.v7.ui.Field; public class FieldDefaultValuesTest { @Test public void testFieldsHaveDefaultValueAfterClear() throws Exception { - for (LegacyField<?> field : createFields()) { + for (Field<?> field : createFields()) { Object originalValue = field.getValue(); field.clear(); @@ -45,7 +45,7 @@ public class FieldDefaultValuesTest { @Test public void testFieldsAreEmptyAfterClear() throws Exception { - for (LegacyField<?> field : createFields()) { + for (Field<?> field : createFields()) { field.clear(); if (field instanceof Slider) { @@ -63,11 +63,11 @@ public class FieldDefaultValuesTest { } @SuppressWarnings("rawtypes") - private static List<LegacyField<?>> createFields() + private static List<Field<?>> createFields() throws InstantiationException, IllegalAccessException { - List<LegacyField<?>> fieldInstances = new ArrayList<LegacyField<?>>(); + List<Field<?>> fieldInstances = new ArrayList<Field<?>>(); - for (Class<? extends LegacyField> fieldType : VaadinClasses + for (Class<? extends Field> fieldType : VaadinClasses .getFields()) { fieldInstances.add(fieldType.newInstance()); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java index 6efd37ff45..478f1bf54e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java @@ -9,11 +9,11 @@ import org.easymock.EasyMock; import org.junit.Test; import com.vaadin.v7.data.Validator; -import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.ui.AbstractField; public class AbsFieldValidatorsTest { - LegacyAbstractField<Object> field = new LegacyAbstractField<Object>() { + AbstractField<Object> field = new AbstractField<Object>() { @Override public Class getType() { return Object.class; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java index bb4cc33040..c022aed3da 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java @@ -5,15 +5,15 @@ import static org.junit.Assert.fail; import org.junit.Assert; import org.junit.Test; -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.data.Validator.InvalidValueException; -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.MethodProperty; +import com.vaadin.v7.data.util.converter.StringToIntegerConverter; +import com.vaadin.v7.ui.TextField; public class AbsFieldValueConversionErrorTest { @@ -23,8 +23,8 @@ public class AbsFieldValueConversionErrorTest { @Test public void testValidateConversionErrorParameters() { - LegacyTextField tf = new LegacyTextField(); - tf.setConverter(new LegacyStringToIntegerConverter()); + TextField tf = new TextField(); + tf.setConverter(new StringToIntegerConverter()); tf.setPropertyDataSource(new MethodProperty<String>(paulaBean, "age")); tf.setConversionError("(Type: {0}) Converter exception message: {1}"); tf.setValue("abc"); @@ -41,8 +41,8 @@ public class AbsFieldValueConversionErrorTest { @Test public void testConvertToModelConversionErrorParameters() { - LegacyTextField tf = new LegacyTextField(); - tf.setConverter(new LegacyStringToIntegerConverter()); + TextField tf = new TextField(); + tf.setConverter(new StringToIntegerConverter()); tf.setPropertyDataSource(new MethodProperty<String>(paulaBean, "age")); tf.setConversionError("(Type: {0}) Converter exception message: {1}"); tf.setValue("abc"); @@ -59,8 +59,8 @@ public class AbsFieldValueConversionErrorTest { @Test public void testNullConversionMessages() { - LegacyTextField tf = new LegacyTextField(); - tf.setConverter(new LegacyStringToIntegerConverter()); + TextField tf = new TextField(); + tf.setConverter(new StringToIntegerConverter()); tf.setPropertyDataSource(new MethodProperty<String>(paulaBean, "age")); tf.setConversionError(null); tf.setValue("abc"); @@ -75,8 +75,8 @@ public class AbsFieldValueConversionErrorTest { @Test public void testDefaultConversionErrorMessage() { - LegacyTextField tf = new LegacyTextField(); - tf.setConverter(new LegacyStringToIntegerConverter()); + TextField tf = new TextField(); + tf.setConverter(new StringToIntegerConverter()); tf.setPropertyDataSource(new MethodProperty<String>(paulaBean, "age")); tf.setValue("abc"); diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java index 4193aa9141..235cfdb93e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java @@ -8,18 +8,18 @@ import java.util.Locale; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.MethodProperty; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.server.VaadinSession; 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.AlwaysLockedVaadinSession; -import com.vaadin.v7.data.util.converter.LegacyConverter; -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.MethodProperty; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.data.util.converter.Converter; +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 AbsFieldValueConversionsTest { @@ -35,7 +35,7 @@ public class AbsFieldValueConversionsTest { @Test public void testWithoutConversion() { - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); tf.setPropertyDataSource( new MethodProperty<String>(paulaBean, "firstName")); assertEquals("Paula", tf.getValue()); @@ -49,7 +49,7 @@ public class AbsFieldValueConversionsTest { @Test public void testNonmodifiedBufferedFieldConversion() { VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null)); - LegacyTextField tf = new LegacyTextField("salary"); + TextField tf = new TextField("salary"); tf.setBuffered(true); tf.setLocale(new Locale("en", "US")); ObjectProperty<Integer> ds = new ObjectProperty<Integer>(123456789); @@ -66,7 +66,7 @@ public class AbsFieldValueConversionsTest { @Test public void testModifiedBufferedFieldConversion() { VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null)); - LegacyTextField tf = new LegacyTextField("salary"); + TextField tf = new TextField("salary"); tf.setBuffered(true); tf.setLocale(new Locale("en", "US")); ObjectProperty<Integer> ds = new ObjectProperty<Integer>(123456789); @@ -85,8 +85,8 @@ public class AbsFieldValueConversionsTest { @Test public void testStringIdentityConversion() { - LegacyTextField tf = new LegacyTextField(); - tf.setConverter(new LegacyConverter<String, String>() { + TextField tf = new TextField(); + tf.setConverter(new Converter<String, String>() { @Override public String convertToModel(String value, @@ -122,9 +122,9 @@ public class AbsFieldValueConversionsTest { @Test public void testIntegerStringConversion() { - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); - tf.setConverter(new LegacyStringToIntegerConverter()); + tf.setConverter(new StringToIntegerConverter()); tf.setPropertyDataSource(new MethodProperty<Integer>(paulaBean, "age")); assertEquals(34, tf.getPropertyDataSource().getValue()); assertEquals("34", tf.getValue()); @@ -140,7 +140,7 @@ public class AbsFieldValueConversionsTest { public void testChangeReadOnlyFieldLocale() { VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null)); - LegacyTextField tf = new LegacyTextField("salary"); + TextField tf = new TextField("salary"); tf.setLocale(new Locale("en", "US")); ObjectProperty<Integer> ds = new ObjectProperty<Integer>(123456789); ds.setReadOnly(true); @@ -171,7 +171,7 @@ public class AbsFieldValueConversionsTest { public void testNumberDoubleConverterChange() { final VaadinSession a = new AlwaysLockedVaadinSession(null); VaadinSession.setCurrent(a); - LegacyTextField tf = new LegacyTextField() { + TextField tf = new TextField() { @Override public VaadinSession getSession() { return a; @@ -184,10 +184,10 @@ public class AbsFieldValueConversionsTest { assertEquals(490, tf.getPropertyDataSource().getValue()); assertEquals("490", tf.getValue()); - LegacyConverter c1 = tf.getConverter(); + Converter c1 = tf.getConverter(); tf.setPropertyDataSource(new MethodProperty<Number>(nb, "number")); - LegacyConverter c2 = tf.getConverter(); + Converter c2 = tf.getConverter(); assertTrue( "StringToInteger converter is ok for integer types and should stay even though property is changed", c1 == c2); @@ -198,10 +198,10 @@ public class AbsFieldValueConversionsTest { @Test public void testNullConverter() { - LegacyTextField tf = new LegacyTextField("foo"); - tf.setConverter(new LegacyStringToIntegerConverter()); + TextField tf = new TextField("foo"); + tf.setConverter(new StringToIntegerConverter()); tf.setPropertyDataSource(new ObjectProperty<Integer>(12)); - tf.setConverter((LegacyConverter) null); + tf.setConverter((Converter) null); try { Object v = tf.getConvertedValue(); System.out.println(v); diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java index 8fe1cc89db..775ef29292 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java @@ -5,15 +5,15 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.vaadin.data.Property.ReadOnlyStatusChangeEvent; -import com.vaadin.data.Property.ReadOnlyStatusChangeListener; -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.ui.Label; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.Property.ReadOnlyStatusChangeEvent; +import com.vaadin.v7.data.Property.ReadOnlyStatusChangeListener; +import com.vaadin.v7.data.util.MethodProperty; +import com.vaadin.v7.ui.TextField; public class AbstractFieldReadOnlyTest { @@ -23,7 +23,7 @@ public class AbstractFieldReadOnlyTest { @Test public void testReadOnlyProperty() { - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); tf.setPropertyDataSource( new MethodProperty<String>(paulaBean, "firstName")); assertFalse(tf.isReadOnly()); @@ -34,7 +34,7 @@ public class AbstractFieldReadOnlyTest { @Test public void testReadOnlyEventFromProperty() { final Label valueStore = new Label(""); - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); tf.addReadOnlyStatusChangeListener(new ReadOnlyStatusChangeListener() { @Override public void readOnlyStatusChange(ReadOnlyStatusChangeEvent event) { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java index 61c94cd061..a355e7ebfa 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java @@ -7,14 +7,14 @@ import java.util.Locale; import org.junit.Test; -import com.vaadin.data.util.MethodProperty; import com.vaadin.server.VaadinSession; 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.AlwaysLockedVaadinSession; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.util.MethodProperty; +import com.vaadin.v7.ui.TextField; public class DefaultConverterFactoryTest { @@ -87,7 +87,7 @@ public class DefaultConverterFactoryTest { VaadinSession sess = new AlwaysLockedVaadinSession(null); VaadinSession.setCurrent(sess); - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); tf.setLocale(new Locale("en", "US")); tf.setPropertyDataSource( new MethodProperty<Integer>(new FloatBean(12f, 23f), "f2")); @@ -103,7 +103,7 @@ public class DefaultConverterFactoryTest { VaadinSession sess = new AlwaysLockedVaadinSession(null); VaadinSession.setCurrent(sess); - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); tf.setLocale(new Locale("en", "US")); tf.setPropertyDataSource(new MethodProperty<Integer>( new LongBean(12, 1982739187238L), "l2")); @@ -118,7 +118,7 @@ public class DefaultConverterFactoryTest { public void testDefaultNumberConversion() { VaadinSession app = new AlwaysLockedVaadinSession(null); VaadinSession.setCurrent(app); - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); tf.setLocale(new Locale("en", "US")); tf.setPropertyDataSource( new MethodProperty<Integer>(paulaBean, "salary")); diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java index a3fa5a7af6..d956fc95a0 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java @@ -4,21 +4,21 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.vaadin.data.Property; -import com.vaadin.data.util.AbstractProperty; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; import com.vaadin.ui.UI; -import com.vaadin.v7.data.util.converter.LegacyConverter.ConversionException; -import com.vaadin.v7.ui.LegacyAbstractField; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.AbstractProperty; +import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.ui.AbstractField; public class RemoveListenersOnDetachTest { int numValueChanges = 0; int numReadOnlyChanges = 0; - LegacyAbstractField field = new LegacyAbstractField() { + AbstractField field = new AbstractField() { final private VaadinSession application = new AlwaysLockedVaadinSession( null); private UI uI = new UI() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java index f501daf54b..f6924e9b0a 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java @@ -9,26 +9,26 @@ import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.TextField; public class AbstractTextFieldListenersTest extends AbstractListenerMethodsTestBase { @Test public void testTextChangeListenerAddGetRemove() throws Exception { - testListenerAddGetRemove(LegacyTextField.class, TextChangeEvent.class, + testListenerAddGetRemove(TextField.class, TextChangeEvent.class, TextChangeListener.class); } @Test public void testFocusListenerAddGetRemove() throws Exception { - testListenerAddGetRemove(LegacyTextField.class, FocusEvent.class, + testListenerAddGetRemove(TextField.class, FocusEvent.class, FocusListener.class); } @Test public void testBlurListenerAddGetRemove() throws Exception { - testListenerAddGetRemove(LegacyTextField.class, BlurEvent.class, + testListenerAddGetRemove(TextField.class, BlurEvent.class, BlurListener.class); } } diff --git a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java index 6283ccf6af..3d6a6136dc 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/button/ButtonClickTest.java @@ -3,11 +3,11 @@ package com.vaadin.tests.server.component.button; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; 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.v7.data.util.ObjectProperty; import com.vaadin.ui.UI; /** diff --git a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java index 4e7d5c1e79..0cb6f850d3 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.TextField; public class DefaultAlignmentTest { @@ -21,7 +21,7 @@ public class DefaultAlignmentTest { @Test public void testDefaultAlignment() { Label label = new Label("A label"); - LegacyTextField tf = new LegacyTextField("A TextField"); + TextField tf = new TextField("A TextField"); gridLayout.addComponent(label); gridLayout.addComponent(tf); Assert.assertEquals(Alignment.TOP_LEFT, @@ -33,7 +33,7 @@ public class DefaultAlignmentTest { @Test public void testAlteredDefaultAlignment() { Label label = new Label("A label"); - LegacyTextField tf = new LegacyTextField("A TextField"); + TextField tf = new TextField("A TextField"); gridLayout.setDefaultComponentAlignment(Alignment.MIDDLE_CENTER); gridLayout.addComponent(label); gridLayout.addComponent(tf); diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java index b22cbfde2f..3c80f11b36 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java @@ -22,13 +22,13 @@ import static org.junit.Assert.fail; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Property; -import com.vaadin.data.util.MethodProperty; import com.vaadin.server.VaadinSession; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.util.AlwaysLockedVaadinSession; import com.vaadin.ui.Label; import com.vaadin.util.CurrentInstance; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.MethodProperty; public class LabelConvertersTest { @Before diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java index 9fe345ea85..212187e7ec 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java @@ -9,11 +9,11 @@ import static org.easymock.EasyMock.verify; import org.easymock.EasyMock; import org.junit.Test; -import com.vaadin.data.Property; -import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; import com.vaadin.ui.Label; import com.vaadin.ui.Label.ValueChangeEvent; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.Property.ValueChangeListener; public class LabelListenersTest extends AbstractListenerMethodsTestBase { @@ -32,7 +32,7 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { ValueChangeListener.class); // record mockListener.valueChange( - anyObject(com.vaadin.data.Property.ValueChangeEvent.class)); + anyObject(com.vaadin.v7.data.Property.ValueChangeEvent.class)); // test underTest.addValueChangeListener(mockListener); @@ -55,7 +55,7 @@ public class LabelListenersTest extends AbstractListenerMethodsTestBase { ValueChangeListener.class); // record mockListener.valueChange( - anyObject(com.vaadin.data.Property.ValueChangeEvent.class)); + anyObject(com.vaadin.v7.data.Property.ValueChangeEvent.class)); expect(mockProperty.getType()).andReturn(String.class).atLeastOnce(); expect(mockProperty.getValue()).andReturn("Any").atLeastOnce(); diff --git a/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java index f0e21992d7..38d7924437 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java @@ -9,7 +9,7 @@ import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.ui.TextField; public class DefaultAlignmentTest { @@ -34,7 +34,7 @@ public class DefaultAlignmentTest { public void testDefaultAlignment(AbstractOrderedLayout layout) { Label label = new Label("A label"); - LegacyTextField tf = new LegacyTextField("A TextField"); + TextField tf = new TextField("A TextField"); layout.addComponent(label); layout.addComponent(tf); Assert.assertEquals(Alignment.TOP_LEFT, @@ -55,7 +55,7 @@ public class DefaultAlignmentTest { public void testAlteredDefaultAlignment(AbstractOrderedLayout layout) { Label label = new Label("A label"); - LegacyTextField tf = new LegacyTextField("A TextField"); + TextField tf = new TextField("A TextField"); layout.setDefaultComponentAlignment(Alignment.MIDDLE_CENTER); layout.addComponent(label); layout.addComponent(tf); diff --git a/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java b/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java index 2a88bb3208..d4b6baa503 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/ui/LegacyUIAddRemoveComponentsTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.LegacyWindow; +import com.vaadin.v7.ui.LegacyWindow; public class LegacyUIAddRemoveComponentsTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java b/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java index 7fa8665c01..9ec970faba 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/window/AddRemoveSubWindowTest.java @@ -9,9 +9,9 @@ import org.junit.Test; import com.vaadin.server.LegacyApplication; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.UI; import com.vaadin.ui.Window; +import com.vaadin.v7.ui.LegacyWindow; public class AddRemoveSubWindowTest { diff --git a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java index 52c8f61466..36057e935f 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java @@ -3,11 +3,11 @@ package com.vaadin.tests.server.components; import org.easymock.EasyMock; import org.junit.Test; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.data.Property.ValueChangeNotifier; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.v7.ui.LegacyAbstractField; +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.data.util.ObjectProperty; +import com.vaadin.v7.ui.AbstractField; /** * Base class for tests for checking that value change listeners for fields are @@ -18,15 +18,15 @@ import com.vaadin.v7.ui.LegacyAbstractField; * * Subclasses should implement {@link #setValue()} and call * <code>super.setValue(LegacyAbstractField)</code>. Also, subclasses should - * typically override {@link #setValue(LegacyAbstractField)} to set the field + * typically override {@link #setValue(AbstractField)} to set the field * value via <code>changeVariables()</code>. */ public abstract class AbstractFieldValueChangeTestBase<T> { - private LegacyAbstractField<T> field; + private AbstractField<T> field; private ValueChangeListener listener; - protected void setUp(LegacyAbstractField<T> field) { + protected void setUp(AbstractField<T> field) { this.field = field; listener = EasyMock.createStrictMock(ValueChangeListener.class); @@ -116,14 +116,14 @@ public abstract class AbstractFieldValueChangeTestBase<T> { EasyMock.verify(listener); } - protected LegacyAbstractField<T> getField() { + protected AbstractField<T> getField() { return field; } /** * Override in subclasses to set value with changeVariables(). */ - protected void setValue(LegacyAbstractField<T> field) { + protected void setValue(AbstractField<T> field) { field.setValue((T) "newValue"); } diff --git a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java index 4f2fc60bfe..971e075b2e 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java @@ -8,10 +8,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.v7.ui.LegacyAbstractField; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.ui.AbstractField; +import com.vaadin.v7.ui.TextField; /** * Check that the value change listener for a text field is triggered exactly @@ -24,7 +24,7 @@ public class TextFieldValueChangeTest @Before public void setUp() { - super.setUp(new LegacyTextField()); + super.setUp(new TextField()); } /** @@ -39,10 +39,10 @@ public class TextFieldValueChangeTest } @Override - protected void setValue(LegacyAbstractField<String> field) { + protected void setValue(AbstractField<String> field) { Map<String, Object> variables = new HashMap<String, Object>(); variables.put("text", "newValue"); - ((LegacyTextField) field).changeVariables(field, variables); + ((TextField) field).changeVariables(field, variables); } /** diff --git a/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java b/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java index ed22870b59..2cd9236458 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/WindowTest.java @@ -7,12 +7,12 @@ import org.easymock.EasyMock; import org.junit.Before; import org.junit.Test; -import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Window; import com.vaadin.ui.Window.CloseEvent; import com.vaadin.ui.Window.CloseListener; import com.vaadin.ui.Window.ResizeEvent; import com.vaadin.ui.Window.ResizeListener; +import com.vaadin.v7.ui.LegacyWindow; public class WindowTest { diff --git a/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java b/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java index 1844495f6d..96212ac085 100644 --- a/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java +++ b/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java @@ -10,8 +10,8 @@ import org.junit.Test; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -import com.vaadin.v7.data.util.converter.LegacyStringToIntegerConverter; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.util.converter.StringToIntegerConverter; +import com.vaadin.v7.ui.TextField; public class AbsFieldDataSourceLocaleChangeTest { @@ -35,9 +35,9 @@ public class AbsFieldDataSourceLocaleChangeTest { @Test public void localeChangesOnAttach() { - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); - tf.setConverter(new LegacyStringToIntegerConverter() { + tf.setConverter(new StringToIntegerConverter() { @Override protected NumberFormat getFormat(Locale locale) { if (locale == null) { diff --git a/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java b/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java index 5853efd01d..e164534918 100644 --- a/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java +++ b/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java @@ -21,10 +21,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; import com.vaadin.tests.util.MockUI; +import com.vaadin.v7.data.util.ObjectProperty; public class LabelDataSourceTest { diff --git a/server/src/test/java/com/vaadin/ui/TextFieldTest.java b/server/src/test/java/com/vaadin/ui/TextFieldTest.java index 9093b40bea..dbd2e82fdf 100644 --- a/server/src/test/java/com/vaadin/ui/TextFieldTest.java +++ b/server/src/test/java/com/vaadin/ui/TextFieldTest.java @@ -18,20 +18,20 @@ package com.vaadin.ui; import org.junit.Assert; import org.junit.Test; -import com.vaadin.data.util.ObjectProperty; -import com.vaadin.v7.ui.LegacyTextField; +import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.ui.TextField; public class TextFieldTest { @Test public void initiallyEmpty() { - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); Assert.assertTrue(tf.isEmpty()); } @Test public void emptyAfterClearUsingPDS() { - LegacyTextField tf = new LegacyTextField( + TextField tf = new TextField( new ObjectProperty<String>("foo")); Assert.assertFalse(tf.isEmpty()); tf.clear(); @@ -40,7 +40,7 @@ public class TextFieldTest { @Test public void emptyAfterClear() { - LegacyTextField tf = new LegacyTextField(); + TextField tf = new TextField(); tf.setValue("foobar"); Assert.assertFalse(tf.isEmpty()); tf.clear(); diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateFieldElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateFieldElement.java new file mode 100644 index 0000000000..3c0348ee02 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateFieldElement.java @@ -0,0 +1,13 @@ +package com.vaadin.testbench.customelements; + +import org.openqa.selenium.By; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.ui.DateField") +public class DateFieldElement + extends com.vaadin.testbench.elements.DateFieldElement { + public void openPopup() { + findElement(By.tagName("button")).click(); + } +} diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/FixedNotificationElement.java index b10ea2bed8..696cbeb95c 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/FixedNotificationElement.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.tb3.newelements; +package com.vaadin.testbench.customelements; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/MenuBarElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/MenuBarElement.java new file mode 100644 index 0000000000..55a0785e3d --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/MenuBarElement.java @@ -0,0 +1,15 @@ +package com.vaadin.testbench.customelements; + +import com.vaadin.testbench.By; +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.ui.MenuBar") +public class MenuBarElement + extends com.vaadin.testbench.elements.MenuBarElement { + + public void openMenuPath(String... captions) { + for (String c : captions) { + findElement(By.vaadin("#" + c)).click(); + } + } +} diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java b/uitest-common/src/main/java/com/vaadin/testbench/customelements/WindowElement.java index 784d203ab0..28d2dd63cc 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/WindowElement.java +++ b/uitest-common/src/main/java/com/vaadin/testbench/customelements/WindowElement.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.tb3.newelements; +package com.vaadin.testbench.customelements; import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CalendarElement.java index 8e07b61e26..c43ebd80ba 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/CalendarElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CalendarElement.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.tb3.newelements; +package com.vaadin.v7.testbench.customelements; import java.util.List; @@ -7,7 +7,7 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; import com.vaadin.testbench.elementsbase.ServerClass; -@ServerClass("com.vaadin.ui.Calendar") +@ServerClass("com.vaadin.v7.ui.Calendar") public class CalendarElement extends com.vaadin.testbench.elements.CalendarElement { public List<WebElement> getWeekNumbers() { diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java new file mode 100644 index 0000000000..9ab5ceae89 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/CheckBoxElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.CheckBox") +public class CheckBoxElement + extends com.vaadin.testbench.elements.CheckBoxElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java new file mode 100644 index 0000000000..151dee9915 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerAreaElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.ColorPickerArea") +public class ColorPickerAreaElement + extends com.vaadin.testbench.elements.ColorPickerAreaElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java new file mode 100644 index 0000000000..749a54f967 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ColorPickerElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.ColorPicker") +public class ColorPickerElement + extends com.vaadin.testbench.elements.ColorPickerElement { + +} diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java index f1f16d3e00..d5208e6338 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/newelements/ComboBoxElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ComboBoxElement.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.tb3.newelements; +package com.vaadin.v7.testbench.customelements; import org.junit.Assert; import org.openqa.selenium.WebElement; @@ -6,7 +6,7 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; import com.vaadin.testbench.elementsbase.ServerClass; -@ServerClass("com.vaadin.ui.ComboBox") +@ServerClass("com.vaadin.v7.ui.ComboBox") public class ComboBoxElement extends com.vaadin.testbench.elements.ComboBoxElement { diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java index 7bfcd826c8..c69c2ad22c 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyInlineDateFieldElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/DateFieldElement.java @@ -13,16 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.v7.tests.elements; +package com.vaadin.v7.testbench.customelements; -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 { +@ServerClass("com.vaadin.v7.ui.DateField") +public class DateFieldElement + extends com.vaadin.testbench.elements.DateFieldElement { } diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java index cc3821c769..0edd4d0f46 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/element/CustomGridElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/GridElement.java @@ -1,29 +1,32 @@ -/* - * Copyright 2000-2016 Vaadin Ltd. +/** + * Copyright (C) 2012 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 + * This program is available under Commercial Vaadin Add-On License 3.0 + * (CVALv3). * - * http://www.apache.org/licenses/LICENSE-2.0 + * See the file licensing.txt distributed with this software for more + * information about licensing. * - * 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. + * You should have received a copy of the license along with this program. + * If not, see <http://vaadin.com/license/cval-3>. */ -package com.vaadin.tests.components.grid.basicfeatures.element; +package com.vaadin.v7.testbench.customelements; 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 { +/** + * TestBench Element API for Grid + * + * @since + * @author Vaadin Ltd + */ +@ServerClass("com.vaadin.v7.ui.Grid") +public class GridElement extends com.vaadin.testbench.elements.GridElement { + /** * Gets the element that contains the details of a row. * @@ -43,4 +46,5 @@ public class CustomGridElement extends GridElement { private TestBenchElement getSubPart(String subPartSelector) { return (TestBenchElement) findElement(By.vaadin(subPartSelector)); } + } diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java index a599cf7ff2..22618d73d5 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyDateFieldElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/InlineDateFieldElement.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.v7.tests.elements; +package com.vaadin.v7.testbench.customelements; -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 { +@ServerClass("com.vaadin.v7.ui.InlineDateField") +public class InlineDateFieldElement + extends com.vaadin.testbench.elements.InlineDateFieldElement { } diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java new file mode 100644 index 0000000000..ac59fd62e4 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ListSelectElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.ListSelect") +public class ListSelectElement + extends com.vaadin.testbench.elements.ListSelectElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java new file mode 100644 index 0000000000..ffb116a6fb --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/NativeSelectElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.NativeSelect") +public class NativeSelectElement + extends com.vaadin.testbench.elements.NativeSelectElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java new file mode 100644 index 0000000000..fed5533f18 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/OptionGroupElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.OptionGroup") +public class OptionGroupElement + extends com.vaadin.testbench.elements.OptionGroupElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java new file mode 100644 index 0000000000..dccf14351f --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PasswordFieldElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.PasswordField") +public class PasswordFieldElement + extends com.vaadin.testbench.elements.PasswordFieldElement { + +} diff --git a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java index ea27aa8811..777e55ae0a 100644 --- a/uitest/src/test/java/com/vaadin/v7/tests/elements/LegacyPopupDateFieldElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/PopupDateFieldElement.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.v7.tests.elements; +package com.vaadin.v7.testbench.customelements; -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 { +@ServerClass("com.vaadin.v7.ui.PopupDateField") +public class PopupDateFieldElement + extends com.vaadin.testbench.elements.PopupDateFieldElement { } diff --git a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ProgressBarElement.java index 90ac1c3a27..7aaaf954d2 100644 --- a/uitest/src/test/java/com/vaadin/tests/customelements/CustomProgressBarElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/ProgressBarElement.java @@ -13,16 +13,16 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.customelements; +package com.vaadin.v7.testbench.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 class ProgressBarElement + extends com.vaadin.testbench.elements.ProgressBarElement { public double getValue() { WebElement indicator = findElement( diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java new file mode 100644 index 0000000000..f83d83393a --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/RichTextAreaElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.RichTextArea") +public class RichTextAreaElement + extends com.vaadin.testbench.elements.RichTextAreaElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java new file mode 100644 index 0000000000..98080669a3 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/SelectElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.Select") +public class SelectElement + extends com.vaadin.testbench.elements.SelectElement { + +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TableElement.java index 78262f2f8b..3737fa0e04 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/table/CustomTableElement.java +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TableElement.java @@ -1,30 +1,13 @@ -/* - * 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; +package com.vaadin.v7.testbench.customelements; 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 { - +@ServerClass("com.vaadin.v7.ui.Table") +public class TableElement extends com.vaadin.testbench.elements.TableElement { public CollapseMenu openCollapseMenu() { getCollapseMenuToggle().click(); WebElement cm = getDriver() diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java new file mode 100644 index 0000000000..f4099985ad --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextAreaElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.TextArea") +public class TextAreaElement + extends com.vaadin.testbench.elements.TextAreaElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java new file mode 100644 index 0000000000..3329eed510 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TextFieldElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.TextField") +public class TextFieldElement + extends com.vaadin.testbench.elements.TextFieldElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java new file mode 100644 index 0000000000..2ce3d84e78 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.Tree") +public class TreeElement + extends com.vaadin.testbench.elements.TreeElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java new file mode 100644 index 0000000000..f236fc863a --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TreeTableElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.TreeTable") +public class TreeTableElement + extends com.vaadin.testbench.elements.TreeTableElement { + +} diff --git a/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java new file mode 100644 index 0000000000..663ebc0456 --- /dev/null +++ b/uitest-common/src/main/java/com/vaadin/v7/testbench/customelements/TwinColSelectElement.java @@ -0,0 +1,9 @@ +package com.vaadin.v7.testbench.customelements; + +import com.vaadin.testbench.elementsbase.ServerClass; + +@ServerClass("com.vaadin.v7.ui.TwinColSelect") +public class TwinColSelectElement + extends com.vaadin.testbench.elements.TwinColSelectElement { + +} 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/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/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/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/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/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 { - -} |