diff options
53 files changed, 84 insertions, 82 deletions
diff --git a/server/src/main/java/com/vaadin/v7/data/Item.java b/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java index d90cdca3f7..d90cdca3f7 100644 --- a/server/src/main/java/com/vaadin/v7/data/Item.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/Item.java diff --git a/server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java index 092cf3f36e..092cf3f36e 100644 --- a/server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/data/util/PropertysetItem.java diff --git a/compatibility-server/src/main/java/com/vaadin/event/DataBoundTransferable.java b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java index d4b4a5ba6b..1285fdc797 100644 --- a/compatibility-server/src/main/java/com/vaadin/event/DataBoundTransferable.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/DataBoundTransferable.java @@ -13,10 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.event; +package com.vaadin.v7.event; import java.util.Map; +import com.vaadin.event.Transferable; +import com.vaadin.event.TransferableImpl; import com.vaadin.ui.Component; import com.vaadin.v7.data.Container; diff --git a/server/src/main/java/com/vaadin/event/ItemClickEvent.java b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java index 3680b7764a..e5f45728a9 100644 --- a/server/src/main/java/com/vaadin/event/ItemClickEvent.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/ItemClickEvent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.event; +package com.vaadin.v7.event; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java index b7b241598b..e184cd0998 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractSelect.java @@ -31,7 +31,6 @@ import java.util.Set; import org.jsoup.nodes.Element; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropTarget; @@ -60,6 +59,7 @@ import com.vaadin.v7.data.Validator.InvalidValueException; import com.vaadin.v7.data.util.IndexedContainer; import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.data.util.converter.ConverterUtil; /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java index 0a5e5b40a4..371520d5d5 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java @@ -45,9 +45,6 @@ import org.jsoup.select.Elements; import com.vaadin.data.sort.Sort; import com.vaadin.data.sort.SortOrder; import com.vaadin.event.ContextClickEvent; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; -import com.vaadin.event.ItemClickEvent.ItemClickNotifier; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; import com.vaadin.event.SelectionEvent.SelectionNotifier; @@ -112,6 +109,9 @@ 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.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier; import com.vaadin.v7.server.communication.data.DataGenerator; import com.vaadin.v7.server.communication.data.RpcDataProviderExtension; import com.vaadin.v7.ui.renderers.HtmlRenderer; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java index 760940a482..d47f5479f4 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Table.java @@ -40,10 +40,6 @@ import org.jsoup.select.Elements; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ContextClickEvent; -import com.vaadin.event.DataBoundTransferable; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; -import com.vaadin.event.ItemClickEvent.ItemClickNotifier; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DragSource; @@ -80,6 +76,10 @@ 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; +import com.vaadin.v7.event.DataBoundTransferable; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier; /** * <p> diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java index 83f805ffb4..5744879ea6 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Tree.java @@ -35,10 +35,6 @@ import org.jsoup.nodes.Element; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ContextClickEvent; -import com.vaadin.event.DataBoundTransferable; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; -import com.vaadin.event.ItemClickEvent.ItemClickNotifier; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DragSource; @@ -67,6 +63,10 @@ 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; +import com.vaadin.v7.event.DataBoundTransferable; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier; /** * Tree component. A Tree can be used to select an item (or multiple items) from diff --git a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java index 883130db32..883130db32 100644 --- a/server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java index 7f76b1c112..155f60f7ee 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/table/TableListenersTest.java @@ -2,9 +2,9 @@ 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.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnReorderEvent; import com.vaadin.v7.ui.Table.ColumnReorderListener; diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java index a7831dc628..b4b357ff7e 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/tree/TreeListenersTest.java @@ -2,9 +2,9 @@ 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.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Tree; import com.vaadin.v7.ui.Tree.CollapseEvent; import com.vaadin.v7.ui.Tree.CollapseListener; diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java index 0a9256364d..3b038672ab 100644 --- a/uitest/src/main/java/com/vaadin/tests/Components.java +++ b/uitest/src/main/java/com/vaadin/tests/Components.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.ExternalResource; import com.vaadin.server.LegacyApplication; import com.vaadin.server.Sizeable; @@ -26,6 +24,8 @@ 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.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.LegacyWindow; import com.vaadin.v7.ui.Tree; import com.vaadin.v7.ui.Tree.ItemStyleGenerator; 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 cb26a48486..4e002e0a97 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java +++ b/uitest/src/main/java/com/vaadin/tests/components/SaneErrors.java @@ -1,7 +1,5 @@ package com.vaadin.tests.components; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; @@ -9,6 +7,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.RowHeaderMode; 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 876c25dd69..8f6f98fd89 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TouchScrollables.java @@ -4,7 +4,6 @@ import java.util.Collection; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; @@ -28,6 +27,7 @@ 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.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.v7.ui.Table; 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 12dc93a1dd..de66680d75 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,8 +15,6 @@ */ package com.vaadin.tests.components.grid; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; @@ -25,6 +23,8 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.util.BeanItemContainer; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; 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 fadbf05e89..3f5a5ae46d 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 @@ -15,13 +15,13 @@ */ package com.vaadin.tests.components.grid; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; 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.Label; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; 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 5fde4a2226..50d5bc5419 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 @@ -15,13 +15,13 @@ */ package com.vaadin.tests.components.grid; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; 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.VerticalLayout; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.Column; import com.vaadin.v7.ui.Grid.DetailsGenerator; 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 b4452a6f98..14d179017f 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.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.grid.HeightMode; import com.vaadin.tests.components.AbstractTestUI; @@ -31,6 +29,8 @@ 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.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; 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 4b9c30c09e..cb3242d0e0 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 @@ -15,13 +15,13 @@ */ package com.vaadin.tests.components.grid; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; 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 844ce73a33..b04f6a5a9c 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 @@ -30,8 +30,6 @@ import java.util.Random; import com.vaadin.data.sort.Sort; import com.vaadin.data.sort.SortOrder; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.event.SelectionEvent; import com.vaadin.event.SelectionEvent.SelectionListener; import com.vaadin.event.SortEvent; @@ -55,6 +53,8 @@ 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.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.CellDescriptionGenerator; 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 3862542a19..f1ef5d5bcb 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 @@ -5,14 +5,14 @@ import java.util.LinkedHashMap; import java.util.List; 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.v7.data.Container; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier; import com.vaadin.v7.ui.AbstractSelect; public abstract class AbstractSelectTestCase<T extends AbstractSelect> 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 44299df643..c2b8c1f9d9 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,11 +5,11 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import com.vaadin.event.ItemClickEvent; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; import com.vaadin.v7.data.Container; +import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.ui.DefaultFieldFactory; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Table; 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 49ce5e20bb..6faa259d5a 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,8 +1,6 @@ package com.vaadin.tests.components.table; import com.vaadin.event.Action; -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; @@ -11,6 +9,8 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Link; import com.vaadin.ui.Notification; import com.vaadin.v7.data.Item; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; public class HeaderPositionWhenSorting extends AbstractTestUI 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 17096bf917..221919f9d4 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,7 +1,5 @@ package com.vaadin.tests.components.table; -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; @@ -11,6 +9,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.v7.data.Item; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Tree; 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 af985598c7..d398c0c325 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,7 +1,5 @@ package com.vaadin.tests.components.table; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.label.ContentMode; @@ -10,6 +8,8 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.v7.data.Item; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; public class LabelEmbeddedClickThroughForTable extends AbstractTestUI { 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 90d55da8d0..9c6293bc2d 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,10 +1,10 @@ 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.Label; import com.vaadin.v7.data.Item; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; @SuppressWarnings("serial") 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 5578b89327..eedb414070 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,14 +1,14 @@ package com.vaadin.tests.components.table; import com.vaadin.event.Action; -import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.ExternalResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Link; import com.vaadin.v7.data.Item; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; public class TableAndBrowserContextMenu extends TestBase 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 d57d8d0c3a..717d1a1548 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,6 +1,5 @@ package com.vaadin.tests.components.table; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptAll; @@ -14,6 +13,7 @@ import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.ColumnGenerator; 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 422dcdded7..b986a7d6f6 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.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; @@ -10,6 +8,8 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; public class TableClickValueChangeInteraction extends TestBase { 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 ba05c6e036..3b5395a796 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 @@ -1,8 +1,8 @@ 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.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; public class TableFocusOnRefreshRowCache extends TestBase { 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 6be49f5ac8..8c28b8f789 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 @@ -1,9 +1,9 @@ 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.Notification; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.TableDragMode; import com.vaadin.v7.ui.TextField; 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 56543d5c53..898733129a 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 @@ -7,7 +7,6 @@ import java.util.List; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.Resource; import com.vaadin.shared.ui.MultiSelectMode; import com.vaadin.shared.ui.label.ContentMode; @@ -16,6 +15,7 @@ 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.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.Align; import com.vaadin.v7.ui.Table.CellStyleGenerator; 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 6802248ef6..76ec5e4437 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,9 +1,9 @@ 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.v7.data.Item; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.CellStyleGenerator; 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 7a8eabe2a5..28094f0b89 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 @@ -1,8 +1,8 @@ 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.v7.event.ItemClickEvent; import com.vaadin.v7.ui.Tree; public class SelectItemAfterRemove extends AbstractTestUI { 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 d0f0a7a189..d83f044de3 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,12 +1,12 @@ package com.vaadin.tests.components.tree; -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.HorizontalLayout; import com.vaadin.v7.data.Container; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.TableDragMode; 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 a7d81d758e..e3bb8d16e9 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,10 +1,10 @@ package com.vaadin.tests.components.tree; -import com.vaadin.event.ItemClickEvent; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.ui.TextField; import com.vaadin.v7.ui.Tree; 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 453abc8a5b..ffb3f5bebf 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 @@ -1,8 +1,8 @@ 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.v7.event.ItemClickEvent; 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 3002e71b3f..cb235791df 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 @@ -1,10 +1,10 @@ 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.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.v7.event.ItemClickEvent; 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 780f694504..1db1b97f16 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 @@ -1,8 +1,8 @@ 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.v7.event.ItemClickEvent; import com.vaadin.v7.ui.Tree; @SuppressWarnings("serial") 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 caf69e5b29..2c563d3a70 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 @@ -1,9 +1,9 @@ package com.vaadin.tests.components.tree; -import com.vaadin.event.ItemClickEvent; import com.vaadin.event.MouseEvents; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.ui.Tree; /** 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 95ed21f17a..ebb6c8a700 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,12 +1,12 @@ package com.vaadin.tests.components.tree; -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.VerticalLayout; import com.vaadin.v7.data.util.HierarchicalContainer; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Tree; public class TreeScrollingOnSelection extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java index c978455cd7..da05406ca4 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptAnythingWindow.java @@ -1,6 +1,5 @@ package com.vaadin.tests.dd; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.TransferableImpl; import com.vaadin.event.dd.DragAndDropEvent; @@ -15,6 +14,7 @@ import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.DragStartMode; import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.ui.Label; import com.vaadin.ui.Window; 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 723cdea1f4..52ad62a33c 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/AcceptFromComponent.java @@ -1,6 +1,5 @@ package com.vaadin.tests.dd; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.TransferableImpl; import com.vaadin.event.dd.DragAndDropEvent; @@ -16,6 +15,7 @@ import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; import com.vaadin.ui.Label; import com.vaadin.ui.Window; +import com.vaadin.v7.event.DataBoundTransferable; 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 e406314c9d..d5295d4cde 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest1.java @@ -2,7 +2,6 @@ package com.vaadin.tests.dd; import java.util.Collection; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; @@ -18,6 +17,7 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.HierarchicalContainer; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AcceptItem; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.TableDragMode; 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 4d5b7b7506..ea688c7380 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest2.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; @@ -23,6 +22,7 @@ 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.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.v7.ui.AbstractSelect.AcceptItem; 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 b815cf0603..0ead6fb1bb 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest4.java @@ -2,7 +2,6 @@ package com.vaadin.tests.dd; import java.util.Collection; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; @@ -16,6 +15,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.UI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.v7.ui.Table; 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 f4357a49a1..69c9e3cfe9 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest6.java @@ -12,7 +12,6 @@ import java.util.Set; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.dd.DragAndDropEvent; @@ -44,6 +43,7 @@ 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.event.DataBoundTransferable; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Tree; import com.vaadin.v7.ui.Tree.TreeDragMode; 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 4c7a732974..0c0a631c46 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest7.java @@ -4,7 +4,6 @@ import java.util.Collection; import java.util.HashSet; import java.util.Set; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; @@ -16,6 +15,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.UI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.v7.ui.Table; 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 0a4a8dbe81..c0ed19d2d9 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DDTest8.java @@ -2,7 +2,6 @@ package com.vaadin.tests.dd; import java.util.Collection; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; @@ -13,6 +12,7 @@ import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.HierarchicalContainer; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.Tree; import com.vaadin.v7.ui.Tree.TreeDragMode; diff --git a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java index 79b21fffbc..020a8190a9 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/DragDropPane.java @@ -3,7 +3,6 @@ package com.vaadin.tests.dd; import java.io.ByteArrayOutputStream; import java.io.OutputStream; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; @@ -13,6 +12,7 @@ import com.vaadin.server.StreamVariable; import com.vaadin.shared.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbsoluteLayout.ComponentPosition; +import com.vaadin.v7.event.DataBoundTransferable; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.Html5File; 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 3616ea8233..1d88541841 100644 --- a/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java +++ b/uitest/src/main/java/com/vaadin/tests/dd/TreeDragStart.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; @@ -18,6 +17,7 @@ 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.event.DataBoundTransferable; import com.vaadin.v7.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.v7.ui.AbstractSelect.VerticalLocationIs; import com.vaadin.v7.ui.Table; 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 094e887426..723fd9673f 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 @@ -15,8 +15,6 @@ */ package com.vaadin.tests.minitutorials.v7_5; -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.minitutorials.v7_4.GridExampleBean; @@ -29,6 +27,8 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.DetailsGenerator; import com.vaadin.v7.ui.Grid.RowReference; 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 533e69b28b..5abeedcea6 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.event.ItemClickEvent; -import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.server.ErrorHandler; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; @@ -16,6 +14,8 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.v7.data.util.AbstractInMemoryContainer; import com.vaadin.v7.data.util.BeanContainer; +import com.vaadin.v7.event.ItemClickEvent; +import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; import com.vaadin.v7.ui.Table; public class PushErrorHandling extends AbstractTestUI { |