diff options
Diffstat (limited to 'compatibility-server/src')
5 files changed, 7 insertions, 7 deletions
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 e184cd0998..e30d666ea0 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 @@ -43,7 +43,6 @@ import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; 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; @@ -60,6 +59,7 @@ 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.shared.ui.combobox.FilteringMode; import com.vaadin.v7.data.util.converter.ConverterUtil; /** diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java index 50b6ac505c..08a17151b7 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/ComboBox.java @@ -33,12 +33,12 @@ import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; 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; +import com.vaadin.v7.shared.ui.combobox.ComboBoxServerRpc; +import com.vaadin.v7.shared.ui.combobox.ComboBoxState; +import com.vaadin.v7.shared.ui.combobox.FilteringMode; /** * A filtering dropdown single-select. Suitable for newItemsAllowed, but it's diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java index 09dc1378e9..1e32e1dd1a 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxDeclarativeTest.java @@ -17,8 +17,8 @@ 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.v7.shared.ui.combobox.FilteringMode; import com.vaadin.v7.ui.ComboBox; public class ComboBoxDeclarativeTest extends DeclarativeTestBase<ComboBox> { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java index 1e0233f76a..83febabf43 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/combobox/ComboBoxStateTest.java @@ -18,7 +18,7 @@ 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.v7.shared.ui.combobox.ComboBoxState; import com.vaadin.v7.ui.ComboBox; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java index 51007e0f8e..dbba1a0e9f 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/components/ComboBoxValueChangeTest.java @@ -4,8 +4,8 @@ import org.junit.Before; import com.vaadin.server.ServerRpcManager; import com.vaadin.server.ServerRpcMethodInvocation; -import com.vaadin.shared.ui.combobox.ComboBoxServerRpc; import com.vaadin.tests.server.components.AbstractFieldValueChangeTestBase; +import com.vaadin.v7.shared.ui.combobox.ComboBoxServerRpc; import com.vaadin.v7.ui.AbstractField; import com.vaadin.v7.ui.ComboBox; |