diff options
Diffstat (limited to 'compatibility-server')
4 files changed, 5 insertions, 5 deletions
diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java index 14d0145730..befdc26998 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/DateField.java @@ -34,7 +34,6 @@ import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.ui.Component; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; @@ -46,6 +45,7 @@ import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.validator.DateRangeValidator; import com.vaadin.v7.event.FieldEvents; import com.vaadin.v7.shared.ui.datefield.DateFieldConstants; +import com.vaadin.v7.shared.ui.datefield.Resolution; import com.vaadin.v7.shared.ui.datefield.TextualDateFieldState; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java index a5166f9373..35e8a93929 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/DateFieldConverterTest.java @@ -22,10 +22,10 @@ import java.util.Locale; import org.junit.Before; import org.junit.Test; -import com.vaadin.shared.ui.datefield.Resolution; 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.shared.ui.datefield.Resolution; import com.vaadin.v7.ui.DateField; public class DateFieldConverterTest { @@ -35,7 +35,7 @@ public class DateFieldConverterTest { @Before public void setUp() { - date = new ObjectProperty<Long>(0L); + date = new ObjectProperty<>(0L); datefield = new DateField(); datefield.setBuffered(false); datefield.setConverter(new Converter<Date, Long>() { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java index e001a3327f..e9b7ac7959 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/LegacyDateFieldDeclarativeTest.java @@ -21,8 +21,8 @@ import java.util.TimeZone; import org.junit.Test; -import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.design.DeclarativeTestBase; +import com.vaadin.v7.shared.ui.datefield.Resolution; import com.vaadin.v7.ui.DateField; /** diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java index e6316cec3f..7bfe4adf4a 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/datefield/PopupDateFieldDeclarativeTest.java @@ -19,8 +19,8 @@ import java.util.Date; import org.junit.Test; -import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.design.DeclarativeTestBase; +import com.vaadin.v7.shared.ui.datefield.Resolution; import com.vaadin.v7.ui.PopupDateField; /** |