diff options
| author | Denis Anisimov <denis@vaadin.com> | 2016-08-10 12:34:56 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-08-12 09:08:05 +0000 |
| commit | bb9564db426d9d9471b6b07410d301fe1059ec19 (patch) | |
| tree | 54a85089346397079431d94dac8aed6195d4b375 /uitest | |
| parent | 2863eada413a37874027713f82acbddb577033c2 (diff) | |
| download | vaadin-framework-bb9564db426d9d9471b6b07410d301fe1059ec19.tar.gz vaadin-framework-bb9564db426d9d9471b6b07410d301fe1059ec19.zip | |
Move old DateField components to legacy package (pre-#57).
Change-Id: I9e766be232d90aab92b5daa77351f4b0a3933f1d
Diffstat (limited to 'uitest')
120 files changed, 712 insertions, 665 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java index f63989fafb..76f500d13b 100644 --- a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java @@ -1,11 +1,11 @@ package com.vaadin.tests; +import com.vaadin.legacy.ui.LegacyDateField; 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; @@ -31,7 +31,7 @@ public class FocusingComponents extends CustomComponent { addFocusableTest(f); addFocusableTest(new ComboBox()); addFocusableTest(new TextField()); - addFocusableTest(new DateField()); + addFocusableTest(new LegacyDateField()); addFocusableTest(new NativeSelect()); addFocusableTest(new ListSelect()); addFocusableTest(new OptionGroup()); diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java index c58c73753f..30b61d99f8 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java @@ -19,12 +19,12 @@ package com.vaadin.tests; import java.util.Date; import java.util.Map; +import com.vaadin.legacy.ui.LegacyDateField; 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; @@ -85,7 +85,7 @@ public class PerformanceTestBasicComponentRendering extends CustomComponent { tf.setComponentError(new UserError("dsfjklsdf")); testContainer.addComponent(tf); - testContainer.addComponent(new DateField("DateField" + i)); + testContainer.addComponent(new LegacyDateField("DateField" + i)); testContainer.addComponent(new Button("Button" + i)); diff --git a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java index e9f04a4c85..5b1e368574 100644 --- a/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java +++ b/uitest/src/main/java/com/vaadin/tests/RandomLayoutStress.java @@ -18,11 +18,11 @@ package com.vaadin.tests; import java.util.Random; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.ExternalResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.CustomLayout; -import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -180,15 +180,15 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication { break; case 6: // Datefield - result = new DateField(); - ((DateField) result).setStyleName("calendar"); - ((DateField) result).setValue(new java.util.Date()); + result = new LegacyDateField(); + ((LegacyDateField) result).setStyleName("calendar"); + ((LegacyDateField) result).setValue(new java.util.Date()); result.setCaption("Calendar component " + caption); break; case 7: // Datefield - result = new DateField(); - ((DateField) result).setValue(new java.util.Date()); + result = new LegacyDateField(); + ((LegacyDateField) result).setValue(new java.util.Date()); result.setCaption("Calendar component " + caption); break; } diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java index edd70ece4e..5d314d6bb3 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java @@ -16,6 +16,7 @@ package com.vaadin.tests; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.ClassResource; import com.vaadin.server.ErrorMessage; import com.vaadin.server.ExternalResource; @@ -26,7 +27,6 @@ import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component.Listener; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.DateField; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; @@ -119,7 +119,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { test(layout, button); button.addListener(this); - final DateField df = new DateField("DateField " + count++); + final LegacyDateField df = new LegacyDateField("DateField " + count++); test(layout, df); final CheckBox cb = new CheckBox("Checkbox " + count++); diff --git a/uitest/src/main/java/com/vaadin/tests/TestDateField.java b/uitest/src/main/java/com/vaadin/tests/TestDateField.java index b5611b8246..572075ead3 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestDateField.java +++ b/uitest/src/main/java/com/vaadin/tests/TestDateField.java @@ -18,11 +18,11 @@ package com.vaadin.tests; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.ClassResource; import com.vaadin.server.ErrorMessage; import com.vaadin.server.UserError; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.DateField; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; @@ -34,7 +34,7 @@ public class TestDateField extends CustomComponent { VerticalLayout main = new VerticalLayout(); - DateField df; + LegacyDateField df; public TestDateField() { setCompositionRoot(main); @@ -45,7 +45,7 @@ public class TestDateField extends CustomComponent { main.removeAllComponents(); main.addComponent(new Label("DateField")); - df = new DateField(); + df = new LegacyDateField(); main.addComponent(df); final ErrorMessage errorMsg = new UserError("User error " + df); @@ -58,19 +58,19 @@ public class TestDateField extends CustomComponent { df.addStyleName("thisShouldBeHarmless"); // Another test: locale - final DateField df1 = new DateField("US locale"); + final LegacyDateField df1 = new LegacyDateField("US locale"); main.addComponent(df1); df1.setLocale(new Locale("en", "US")); - final DateField df2 = new DateField("DE locale"); + final LegacyDateField df2 = new LegacyDateField("DE locale"); main.addComponent(df2); df2.setLocale(new Locale("de", "DE")); - final DateField df3 = new DateField("RU locale"); + final LegacyDateField df3 = new LegacyDateField("RU locale"); main.addComponent(df3); df3.setLocale(new Locale("ru", "RU")); - final DateField df4 = new DateField("FI locale"); + final LegacyDateField df4 = new LegacyDateField("FI locale"); main.addComponent(df4); df4.setLocale(new Locale("fi", "FI")); } diff --git a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java index 7927b7f0ee..9b68f48c93 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForAlignments.java @@ -16,10 +16,10 @@ package com.vaadin.tests; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.DateField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; @@ -36,8 +36,8 @@ public class TestForAlignments extends CustomComponent { final Button b4 = new Button("Top"); 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"); + final LegacyDateField d1 = new LegacyDateField("Center aligned"); + final LegacyDateField d2 = new LegacyDateField("Center aligned"); final VerticalLayout vert = new VerticalLayout(); vert.addComponent(b1); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java index 705f2e1766..e6bc87d2c5 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -18,12 +18,12 @@ package com.vaadin.tests; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.Sizeable; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomComponent; -import com.vaadin.ui.DateField; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -80,8 +80,8 @@ public class TestForBasicApplicationLayout extends CustomComponent { controls.addComponent(click); controls.addComponent(click2); reportLayout.addComponent(controls); - final DateField cal = new DateField(); - cal.setResolution(DateField.RESOLUTION_DAY); + final LegacyDateField cal = new LegacyDateField(); + cal.setResolution(LegacyDateField.RESOLUTION_DAY); cal.setLocale(new Locale("en", "US")); reportLayout.addComponent(cal); reportLayout.setExpandRatio(controls, 1); diff --git a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java index 84ea616e3f..f1d1cfd4ca 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/TestSelectAndDatefieldInDeepLayouts.java @@ -19,11 +19,11 @@ package com.vaadin.tests; import java.util.Collection; import java.util.Vector; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Component; 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; @@ -99,7 +99,7 @@ public class TestSelectAndDatefieldInDeepLayouts extends CustomComponent { } Component getDateField() { - return new DateField(getCaption("datefield")); + return new LegacyDateField(getCaption("datefield")); } private Collection<String> getSelectOptions() { 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 146e996eaf..3c74589c87 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java @@ -4,6 +4,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; +import com.vaadin.legacy.ui.LegacyInlineDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.ui.AbstractComponentContainer; import com.vaadin.ui.Button; import com.vaadin.ui.Component; @@ -12,9 +14,7 @@ import com.vaadin.ui.HasComponents.ComponentAttachListener; import com.vaadin.ui.HasComponents.ComponentDetachEvent; import com.vaadin.ui.HasComponents.ComponentDetachListener; 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; @@ -77,7 +77,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, ComponentSize> addInlineDateFieldCommand = new Command<T, ComponentSize>() { @Override public void execute(T c, ComponentSize size, Object data) { - InlineDateField tf = new InlineDateField(); + LegacyInlineDateField tf = new LegacyInlineDateField(); c.addComponent(tf); size.apply(tf); } @@ -85,7 +85,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, ComponentSize> addPopupDateFieldCommand = new Command<T, ComponentSize>() { @Override public void execute(T c, ComponentSize size, Object data) { - PopupDateField tf = new PopupDateField(); + LegacyPopupDateField tf = new LegacyPopupDateField(); c.addComponent(tf); size.apply(tf); } 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 c619ceb200..b5a8384ff1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.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 PopupDateField popupDateField; + private LegacyPopupDateField 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 PopupDateField("PopupDateField"); + popupDateField = new LegacyPopupDateField("PopupDateField"); popupDateField.setRequired(true); popupDateField.setRequiredError("abcd"); addComponent(popupDateField); 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 692e31526a..dfd279feb7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java +++ b/uitest/src/main/java/com/vaadin/tests/components/FocusAndBlurListeners.java @@ -6,12 +6,12 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; +import com.vaadin.legacy.ui.LegacyDateField; 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; @@ -49,7 +49,7 @@ public class FocusAndBlurListeners extends TestBase { TextField tf = new TextField("TextField"); l.addComponent(tf); - DateField df = new DateField("DateField"); + LegacyDateField df = new LegacyDateField("DateField"); l.addComponent(df); ComboBox cb = new ComboBox("ComboBox"); 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 d4b2f89522..ff6db2d88d 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.ui.DateField; +import com.vaadin.legacy.ui.LegacyDateField; public class DateFieldBackedByString extends AbstractComponentDataBindingTest { @@ -8,7 +8,7 @@ public class DateFieldBackedByString extends AbstractComponentDataBindingTest { @Override protected void createFields() { - DateField df = new DateField("Date field"); + LegacyDateField df = new LegacyDateField("Date field"); addComponent(df); df.setPropertyDataSource(new com.vaadin.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 aa8c7ff778..ebe87fdb4b 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 @@ -3,9 +3,9 @@ package com.vaadin.tests.components.abstractfield; import java.util.Date; import com.vaadin.data.util.ObjectProperty; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.PopupDateField; public class DateFieldBasedOnLong extends AbstractComponentDataBindingTest { @@ -14,7 +14,7 @@ public class DateFieldBasedOnLong extends AbstractComponentDataBindingTest { @Override protected void createFields() { - PopupDateField pdf = new PopupDateField("DateField"); + LegacyPopupDateField pdf = new LegacyPopupDateField("DateField"); addComponent(pdf); property = new ObjectProperty<Long>(l, Long.class); pdf.setPropertyDataSource(property); 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 bda3b34875..a88e603422 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 @@ -24,10 +24,10 @@ 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.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.ui.Calendar; -import com.vaadin.ui.DateField; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; @@ -138,10 +138,10 @@ public class BeanItemContainerTestUI extends UI { captionField.setImmediate(true); TextField descriptionField = new TextField("Description"); descriptionField.setImmediate(true); - DateField startField = new DateField("Start"); + LegacyDateField startField = new LegacyDateField("Start"); startField.setResolution(Resolution.MINUTE); startField.setImmediate(true); - DateField endField = new DateField("End"); + LegacyDateField endField = new LegacyDateField("End"); endField.setImmediate(true); endField.setResolution(Resolution.MINUTE); 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 6b79a44437..39abf7791f 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 @@ -30,6 +30,7 @@ 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.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.combobox.FilteringMode; @@ -42,7 +43,6 @@ 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.DateField; import com.vaadin.ui.FormLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -156,8 +156,8 @@ public class CalendarTest extends UI { private boolean useSecondResolution; - private DateField startDateField; - private DateField endDateField; + private LegacyDateField startDateField; + private LegacyDateField endDateField; @SuppressWarnings("serial") @Override @@ -548,8 +548,8 @@ public class CalendarTest extends UI { return f; } - private DateField createDateField(String caption) { - DateField f = new DateField(caption); + private LegacyDateField createDateField(String caption) { + LegacyDateField f = new LegacyDateField(caption); if (useSecondResolution) { f.setResolution(Resolution.SECOND); } else { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java index 0832f5afeb..6f65d50c7d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/AriaDisabled.java @@ -15,9 +15,9 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; import com.vaadin.ui.VerticalLayout; public class AriaDisabled extends AbstractTestUI { @@ -28,12 +28,12 @@ public class AriaDisabled extends AbstractTestUI { content.setMargin(true); content.setSpacing(true); - final DateField disabledDateField = new DateField("Disabled DateField"); + final LegacyDateField disabledDateField = new LegacyDateField("Disabled DateField"); disabledDateField.setEnabled(false); setContent(content); content.addComponent(disabledDateField); - content.addComponent(new DateField("Enabled DateField")); + content.addComponent(new LegacyDateField("Enabled DateField")); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java index ea33219ee3..8e18f41c4b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CommitInvalid.java @@ -6,11 +6,11 @@ import java.util.Locale; import com.vaadin.data.util.ObjectProperty; import com.vaadin.legacy.data.Validator.InvalidValueException; +import com.vaadin.legacy.ui.LegacyDateField; 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.DateField; import com.vaadin.ui.Form; import com.vaadin.ui.TextField; @@ -30,7 +30,7 @@ public class CommitInvalid extends TestBase { } ObjectProperty<Date> dateProperty; - private DateField dateField; + private LegacyDateField dateField; private ObjectProperty<Integer> integerProperty; private TextField integerField; private Log log; @@ -50,9 +50,9 @@ public class CommitInvalid extends TestBase { */ dateProperty = new ObjectProperty<Date>(new Date(2009 - 1900, 4 - 1, 1)); - dateField = new DateField("Year", dateProperty); + dateField = new LegacyDateField("Year", dateProperty); dateField.setLocale(new Locale("fi", "FI")); - dateField.setResolution(DateField.RESOLUTION_DAY); + dateField.setResolution(LegacyDateField.RESOLUTION_DAY); dateField.setId("_DF"); form.addField("date", dateField); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java index c2afb4cba3..7a02bdbd5d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormat.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; public class CustomDateFormat extends TestBase { @@ -15,8 +15,8 @@ public class CustomDateFormat extends TestBase { Calendar cal = Calendar.getInstance(); cal.set(2010, 0, 1); - DateField df = new DateField(); - df.setResolution(DateField.RESOLUTION_DAY); + LegacyDateField df = new LegacyDateField(); + df.setResolution(LegacyDateField.RESOLUTION_DAY); df.setLocale(locale); df.setWidth("300px"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java index fc3c8c97e8..828a17d5c3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/CustomDateFormatEEE.java @@ -18,10 +18,10 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; import com.vaadin.ui.VerticalLayout; public class CustomDateFormatEEE extends AbstractTestUI { @@ -31,7 +31,7 @@ public class CustomDateFormatEEE extends AbstractTestUI { Calendar cal = Calendar.getInstance(); cal.set(2014, 2, 14); // Friday - DateField df = new DateField("Should display 14/03/2014 Fri"); + LegacyDateField df = new LegacyDateField("Should display 14/03/2014 Fri"); df.setResolution(Resolution.DAY); df.setLocale(new Locale("en", "US")); 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 f51c75d57a..7098d1e5fd 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 @@ -10,9 +10,9 @@ import java.util.Set; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.legacy.ui.LegacyDateField; 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; @@ -140,8 +140,8 @@ public class CustomDateFormats extends TestBase { Label serversideValueLabel = new Label(); - DateField df = new DateField(); - df.setResolution(DateField.RESOLUTION_DAY); + LegacyDateField df = new LegacyDateField(); + df.setResolution(LegacyDateField.RESOLUTION_DAY); df.setLocale(locale); df.setWidth("300px"); df.setDateFormat(pattern); @@ -161,7 +161,7 @@ public class CustomDateFormats extends TestBase { @Override public void valueChange(ValueChangeEvent event) { - updateServerSideLabel((DateField) event.getProperty()); + updateServerSideLabel((LegacyDateField) event.getProperty()); } }); @@ -185,7 +185,7 @@ public class CustomDateFormats extends TestBase { updateServerSideLabel(df); } - private void updateServerSideLabel(DateField df) { + private void updateServerSideLabel(LegacyDateField df) { Data data = (Data) df.getData(); String pattern = data.pattern; Locale locale = df.getLocale(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java index 9dbd8fa6dc..8ddc4526d1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldChangeResolution.java @@ -15,16 +15,16 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; 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.DateField; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.PopupDateField; public class DateFieldChangeResolution extends AbstractTestUI { @@ -34,7 +34,7 @@ public class DateFieldChangeResolution extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final DateField dateField = new PopupDateField("Enter date"); + final LegacyDateField dateField = new LegacyPopupDateField("Enter date"); dateField.setResolution(Resolution.YEAR); dateField.setId(DATEFIELD_ID); dateField.setImmediate(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java index 9ce190a293..eaf060e020 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldClose.java @@ -15,9 +15,9 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; public class DateFieldClose extends AbstractTestUI { @@ -25,7 +25,7 @@ public class DateFieldClose extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); df.setId(DATEFIELD_ID); addComponent(df); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java index a6fda534b2..588f1ddf54 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffset.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.datefield; import com.vaadin.data.Property; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; import com.vaadin.ui.Label; import java.text.ParseException; @@ -24,7 +24,7 @@ public class DateFieldDayResolutionOffset extends AbstractTestUI { final TimeZone timezone = TimeZone.getTimeZone("GMT"); final SimpleDateFormat dateformat = getDateFormat(timezone); - final DateField dateField = getDateField(timezone, dateformat); + final LegacyDateField dateField = getDateField(timezone, dateformat); addComponent(dateValue); addComponent(dateField); @@ -37,9 +37,9 @@ public class DateFieldDayResolutionOffset extends AbstractTestUI { }); } - private DateField getDateField(TimeZone timezone, + private LegacyDateField getDateField(TimeZone timezone, SimpleDateFormat dateformat) { - final DateField dateField = new DateField(); + final LegacyDateField dateField = new LegacyDateField(); try { Date initialDate = dateformat.parse(initialDateString); dateField.setResolution(Resolution.DAY); 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 542a844434..d456acf1c6 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 @@ -7,15 +7,15 @@ 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.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.shared.ui.label.ContentMode; 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.DateField; import com.vaadin.ui.Label; -import com.vaadin.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 PopupDateField { + public class MyDateField extends LegacyPopupDateField { @Override public boolean isEmpty() { return super.isEmpty(); @@ -46,7 +46,7 @@ public class DateFieldEmptyValid extends TestBase { df.setLocale(new Locale("fi", "FI")); df.setValue(new Date(100000000000L)); df.setImmediate(true); - df.setResolution(DateField.RESOLUTION_DAY); + df.setResolution(LegacyDateField.RESOLUTION_DAY); df.addListener(new ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java index 8a15d83121..472d601e4e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldExtendedRange.java @@ -3,14 +3,14 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; 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.DateField; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.InlineDateField; -import com.vaadin.ui.PopupDateField; @SuppressWarnings("serial") public class DateFieldExtendedRange extends TestBase { @@ -25,7 +25,7 @@ public class DateFieldExtendedRange extends TestBase { layout.setWidth("600px"); layout.setSpacing(true); - final DateField[] fields = new DateField[6]; + final LegacyDateField[] fields = new LegacyDateField[6]; Locale fi = new Locale("fi", "FI"); Locale us = new Locale("en", "US"); @@ -41,7 +41,7 @@ public class DateFieldExtendedRange extends TestBase { fields[5] = makeDateField(false, fi, "Finnish locale with week numbers"); fields[5].setShowISOWeekNumbers(true); - for (DateField f : fields) { + for (LegacyDateField f : fields) { layout.addComponent(f); } @@ -51,7 +51,7 @@ public class DateFieldExtendedRange extends TestBase { @Override public void buttonClick(ClickEvent event) { date.set(2010, 1, 16); - for (DateField f : fields) { + for (LegacyDateField f : fields) { f.setValue(date.getTime()); } } @@ -68,10 +68,10 @@ public class DateFieldExtendedRange extends TestBase { return 6718; } - private DateField makeDateField(boolean isPopup, Locale locale, + private LegacyDateField makeDateField(boolean isPopup, Locale locale, String caption) { - DateField df = isPopup ? new PopupDateField() : new InlineDateField(); - df.setResolution(DateField.RESOLUTION_DAY); + LegacyDateField df = isPopup ? new LegacyPopupDateField() : new LegacyInlineDateField(); + df.setResolution(LegacyDateField.RESOLUTION_DAY); df.setValue(date.getTime()); df.setLocale(locale); df.setCaption(caption); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java index b38f58e5cc..e365dc50af 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldFastForward.java @@ -15,15 +15,15 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.InlineDateField; public class DateFieldFastForward extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - addComponent(new InlineDateField()); + addComponent(new LegacyInlineDateField()); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java index 1c13aec254..363cc46fcc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java @@ -4,12 +4,12 @@ import java.util.Date; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItem; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.legacy.ui.LegacyField; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; -import com.vaadin.ui.DateField; import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; @@ -65,8 +65,8 @@ public class DateFieldInSubWindow extends AbstractTestCase { LegacyField<?> f = super.createField(item, propertyId, uiContext); if ("myDate".equals(propertyId)) { - ((DateField) f).setResolution(DateField.RESOLUTION_MIN); - ((DateField) f).setCaption("This is my date"); + ((LegacyDateField) f).setResolution(LegacyDateField.RESOLUTION_MIN); + ((LegacyDateField) f).setCaption("This is my date"); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldIsValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldIsValid.java index 66d1c34ab7..55af9cc2d7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldIsValid.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldIsValid.java @@ -5,11 +5,11 @@ import java.util.Date; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyDateField; 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.DateField; public class DateFieldIsValid extends AbstractTestUIWithLog { @@ -29,7 +29,7 @@ public class DateFieldIsValid extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { - final DateField dateField = new DateField("Insert Date: "); + final LegacyDateField dateField = new LegacyDateField("Insert Date: "); dateField.setImmediate(true); dateField.setDateFormat(pattern); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java index 8157ce5028..76b4677d91 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInput.java @@ -21,10 +21,10 @@ import java.util.Locale; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; -import com.vaadin.ui.PopupDateField; public class DateFieldKeyboardInput extends AbstractTestUI { @@ -32,7 +32,7 @@ public class DateFieldKeyboardInput extends AbstractTestUI { protected void setup(VaadinRequest request) { Calendar c = new GregorianCalendar(Locale.ENGLISH); c.set(2014, 0, 15); - final PopupDateField dateField = new PopupDateField("Select date", + final LegacyPopupDateField dateField = new LegacyPopupDateField("Select date", c.getTime()); dateField.setDateFormat("dd.MM.yyyy"); addComponent(dateField); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java index a4fe2b0285..40290ea41d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldLocale.java @@ -3,21 +3,21 @@ package com.vaadin.tests.components.datefield; import java.util.Date; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; 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.DateField; public class DateFieldLocale extends TestBase { @Override public void setup() { - final DateField dateField = new DateField("DateField"); + final LegacyDateField dateField = new LegacyDateField("DateField"); dateField.setLocale(new Locale("fi", "FI")); dateField.setCaption(dateField.getLocale().toString()); dateField.setValue(new Date(2013 - 1900, 7 - 1, 27)); - dateField.setResolution(DateField.RESOLUTION_DAY); + dateField.setResolution(LegacyDateField.RESOLUTION_DAY); addComponent(new Button("Change locale", new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java index 1a3b3858b8..ff1f0ee98f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldMinResolution.java @@ -5,9 +5,9 @@ import java.util.Calendar; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; -import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; public class DateFieldMinResolution extends TestBase { @@ -21,8 +21,8 @@ public class DateFieldMinResolution extends TestBase { Calendar cal = Calendar.getInstance(); cal.set(2019, 1, 1, 1, 1); - DateField df = new DateField("foo"); - df.setResolution(DateField.RESOLUTION_MIN); + LegacyDateField df = new LegacyDateField("foo"); + df.setResolution(LegacyDateField.RESOLUTION_MIN); df.setDateFormat(dformat.toPattern()); df.setValue(cal.getTime()); df.setImmediate(true); @@ -32,8 +32,8 @@ public class DateFieldMinResolution extends TestBase { final Label lbl = new Label(dformat.format(cal.getTime())); lbl.setCaption("Selected date"); - InlineDateField idf = new InlineDateField("bar"); - idf.setResolution(DateField.RESOLUTION_MIN); + LegacyInlineDateField idf = new LegacyInlineDateField("bar"); + idf.setResolution(LegacyDateField.RESOLUTION_MIN); idf.setDateFormat(dformat.toPattern()); idf.setValue(cal.getTime()); idf.setImmediate(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java index 60508a30d4..9f36d56800 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosing.java @@ -15,9 +15,9 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; public class DateFieldPopupClosing extends AbstractTestUI { @@ -25,7 +25,7 @@ public class DateFieldPopupClosing extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); df.setId(DATEFIELD_ID); addComponent(df); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java index 247d1a079c..8df1efd232 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetach.java @@ -20,9 +20,9 @@ import java.util.TimerTask; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; public class DateFieldPopupClosingOnDetach extends AbstractTestUI { @@ -31,7 +31,7 @@ public class DateFieldPopupClosingOnDetach extends AbstractTestUI { // Use polling to notice the removal of DateField. getUI().setPollInterval(500); - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); getLayout().addLayoutClickListener(new LayoutClickListener() { @Override 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 1baea1b793..5139cf0357 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 @@ -3,10 +3,10 @@ package com.vaadin.tests.components.datefield; import java.util.Date; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.shared.ui.datefield.Resolution; 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; @@ -29,7 +29,7 @@ public class DateFieldPopupOffScreen extends AbstractTestCase { GridLayout mainLayout = new GridLayout(3, 3); mainLayout.setSizeFull(); - DateField df; + LegacyDateField df; df = createDateField(); mainLayout.addComponent(df, 2, 0); @@ -55,8 +55,8 @@ public class DateFieldPopupOffScreen extends AbstractTestCase { setMainWindow(mainWindow); } - private DateField createDateField() { - DateField df = new DateField(); + private LegacyDateField createDateField() { + LegacyDateField df = new LegacyDateField(); df.setLocale(new Locale("fi")); df.setResolution(Resolution.SECOND); df.setDescription("This is a long, multiline tooltip.<br/>It should always be on screen so it can be read."); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java index 4469ad3b1a..916099aeed 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPopupPosition.java @@ -15,11 +15,11 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.PopupDateField; /** * Test UI for date field Popup calendar. @@ -35,7 +35,7 @@ public abstract class DateFieldPopupPosition extends AbstractTestUI { Label gap = new Label(); gap.setWidth(250, Unit.PIXELS); layout.addComponent(gap); - PopupDateField field = new PopupDateField(); + LegacyPopupDateField field = new LegacyPopupDateField(); layout.addComponent(field); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java index e477ee8487..c8c23bbc24 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldPrimaryStyleNames.java @@ -1,20 +1,20 @@ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.DateField; -import com.vaadin.ui.InlineDateField; public class DateFieldPrimaryStyleNames extends TestBase { @Override protected void setup() { - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); df.setPrimaryStyleName("my-datefield"); addComponent(df); - final InlineDateField idf = new InlineDateField(); + final LegacyInlineDateField idf = new LegacyInlineDateField(); idf.setPrimaryStyleName("my-inline-datefield"); addComponent(idf); 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 c4008fdb3a..93c5997405 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 @@ -6,11 +6,11 @@ import java.util.Locale; import com.vaadin.data.HasValue; import com.vaadin.data.util.BeanItem; import com.vaadin.legacy.data.validator.LegacyRangeValidator; +import com.vaadin.legacy.ui.LegacyPopupDateField; 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.ui.PopupDateField; public class DateFieldRangeValidation extends TestBase { @@ -55,8 +55,9 @@ public class DateFieldRangeValidation extends TestBase { private Range range = new Range(); - private PopupDateField actualDateField; - private HasValue.ValueChangeListener<Boolean> refreshField = event -> actualDateField.markAsDirty(); + private LegacyPopupDateField actualDateField; + private HasValue.ValueChangeListener<Boolean> refreshField = event -> actualDateField + .markAsDirty(); @Override protected void setup() { @@ -64,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)); - PopupDateField fromField = createDateField(); + LegacyPopupDateField fromField = createDateField(); fromField.setPropertyDataSource(bi.getItemProperty("from")); CheckBox fromInclusive = new CheckBoxWithPropertyDataSource( "From inclusive", bi.getItemProperty("fromInclusive")); @@ -75,7 +76,7 @@ public class DateFieldRangeValidation extends TestBase { toInclusive.setImmediate(true); toInclusive.addValueChangeListener(refreshField); - PopupDateField toField = createDateField(); + LegacyPopupDateField toField = createDateField(); toField.setPropertyDataSource(bi.getItemProperty("to")); actualDateField = createDateField(); @@ -115,8 +116,8 @@ public class DateFieldRangeValidation extends TestBase { addComponent(actualDateField); } - private PopupDateField createDateField() { - PopupDateField df = new PopupDateField(); + private LegacyPopupDateField createDateField() { + LegacyPopupDateField df = new LegacyPopupDateField(); 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 3e52dfa516..df2b533234 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 @@ -6,6 +6,8 @@ import java.util.Locale; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.datefield.Resolution; @@ -13,10 +15,8 @@ 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.DateField; 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; @@ -30,17 +30,17 @@ public class DateFieldRanges extends AbstractTestUI { private Label label = new Label(); private NativeSelect resoSelect = new NativeSelect("Resolution"); - private DateField fromRange = new DateField("Range start"); - private DateField toRange = new DateField("Range end"); - private DateField valueDF = new DateField("Value"); + private LegacyDateField fromRange = new LegacyDateField("Range start"); + private LegacyDateField toRange = new LegacyDateField("Range end"); + private LegacyDateField valueDF = new LegacyDateField("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 DateField inlineDynamicDateField; - private DateField dynamicDateField; + private LegacyDateField inlineDynamicDateField; + private LegacyDateField dynamicDateField; private Calendar createCalendar() { Calendar c = Calendar.getInstance(); @@ -201,10 +201,10 @@ public class DateFieldRanges extends AbstractTestUI { endCal.add(Calendar.DATE, 30); GridLayout gl = new GridLayout(2, 2); gl.setSpacing(true); - DateField df = createDateField(startCal.getTime(), endCal.getTime(), + LegacyDateField df = createDateField(startCal.getTime(), endCal.getTime(), null, Resolution.DAY, false); gl.addComponent(df); - DateField inline = createDateField(startCal.getTime(), + LegacyDateField inline = createDateField(startCal.getTime(), endCal.getTime(), null, Resolution.DAY, true); gl.addComponent(inline); inline.setId("staticInline"); @@ -213,18 +213,18 @@ public class DateFieldRanges extends AbstractTestUI { return gl; } - private DateField createDateField(Date rangeStart, Date rangeEnd, + private LegacyDateField createDateField(Date rangeStart, Date rangeEnd, Date value, Resolution resolution, boolean inline) { - DateField df = null; + LegacyDateField df = null; if (inline) { - df = new InlineDateField(); + df = new LegacyInlineDateField(); } else { - df = new DateField(); + df = new LegacyDateField(); } - final DateField gg = df; + final LegacyDateField gg = df; updateValuesForDateField(df); df.addValueChangeListener(new ValueChangeListener() { @@ -246,7 +246,7 @@ public class DateFieldRanges extends AbstractTestUI { } - private void updateValuesForDateField(DateField df) { + private void updateValuesForDateField(LegacyDateField 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/DateFieldReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java index 304c978381..de847aa35f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java @@ -3,13 +3,13 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; 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.DateField; public class DateFieldReadOnly extends AbstractTestUI { @@ -25,8 +25,8 @@ public class DateFieldReadOnly extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final DateField timeField = new DateField("A read-only datefield"); - timeField.setResolution(DateField.RESOLUTION_SEC); + final LegacyDateField timeField = new LegacyDateField("A read-only datefield"); + timeField.setResolution(LegacyDateField.RESOLUTION_SEC); timeField.setDateFormat("HH:mm:ss"); timeField.setCaption(null); timeField.setIcon(null); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java index f7c98e77e8..aabf4c7ebb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java @@ -7,16 +7,16 @@ import java.util.Date; import java.util.LinkedHashMap; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest; -import com.vaadin.ui.DateField; -public class DateFieldTest<T extends DateField> extends LegacyAbstractFieldTest<T> { +public class DateFieldTest<T extends LegacyDateField> extends LegacyAbstractFieldTest<T> { @SuppressWarnings("unchecked") @Override protected Class<T> getTestClass() { - return (Class<T>) DateField.class; + return (Class<T>) LegacyDateField.class; } private Command<T, Date> setValue = new Command<T, Date>() { 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 6109b7cc14..dea53a7067 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 @@ -10,19 +10,19 @@ import java.util.TimeZone; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.legacy.ui.LegacyDateField; 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; public class DateFieldTimezone extends TestBase { private static final TimeZone UTC = TimeZone.getTimeZone("UTC"); private static final Locale EN = Locale.ENGLISH; private final Log log = new Log(5); - private final DateField dateField = new DateField(); + private final LegacyDateField dateField = new LegacyDateField(); private static final String nullValue = ""; @Override 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 917434ca37..cf8db98a9f 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 @@ -4,12 +4,12 @@ import java.util.Date; import com.vaadin.data.Property; import com.vaadin.legacy.data.util.converter.LegacyConverter; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; public class DateFieldUnparsableDate extends TestBase { - public class MyDateField extends DateField { + public class MyDateField extends LegacyDateField { Date oldDate = null; public MyDateField(String caption) { @@ -30,7 +30,7 @@ public class DateFieldUnparsableDate extends TestBase { } } - public class MyDateField2 extends DateField { + public class MyDateField2 extends LegacyDateField { public MyDateField2(String caption) { super(caption); } @@ -42,7 +42,7 @@ public class DateFieldUnparsableDate extends TestBase { } } - public class MyDateField3 extends DateField { + public class MyDateField3 extends LegacyDateField { public MyDateField3(String caption) { super(caption); } @@ -55,7 +55,7 @@ public class DateFieldUnparsableDate extends TestBase { } } - public class MyDateField4 extends DateField { + public class MyDateField4 extends LegacyDateField { public MyDateField4(String caption) { super(caption); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java index 7ff59ecf1c..f2ab5e139f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParent.java @@ -2,14 +2,15 @@ package com.vaadin.tests.components.datefield; import java.util.Date; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.DateField; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.VerticalLayout; -public class DateFieldWhenChangingValueAndEnablingParent extends AbstractTestUI { +public class DateFieldWhenChangingValueAndEnablingParent + extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { @@ -20,12 +21,12 @@ public class DateFieldWhenChangingValueAndEnablingParent extends AbstractTestUI main.setMargin(true); setContent(main); - final DateField df1 = createDateField(true); - final DateField df2 = createDateField(false); - final PopupDateField pdf1 = createPopupDateField(true, true); - final PopupDateField pdf2 = createPopupDateField(true, false); - final PopupDateField pdf3 = createPopupDateField(false, true); - final PopupDateField pdf4 = createPopupDateField(false, false); + final LegacyDateField df1 = createDateField(true); + final LegacyDateField df2 = createDateField(false); + final LegacyPopupDateField pdf1 = createPopupDateField(true, true); + final LegacyPopupDateField pdf2 = createPopupDateField(true, false); + final LegacyPopupDateField pdf3 = createPopupDateField(false, true); + final LegacyPopupDateField pdf4 = createPopupDateField(false, false); sub.addComponent(df1); sub.addComponent(df2); @@ -48,17 +49,17 @@ public class DateFieldWhenChangingValueAndEnablingParent extends AbstractTestUI }); } - private DateField createDateField(boolean enabled) { - DateField df = new DateField("DateField, " - + (enabled ? "enabled" : "disabled")); + private LegacyDateField createDateField(boolean enabled) { + LegacyDateField df = new LegacyDateField( + "DateField, " + (enabled ? "enabled" : "disabled")); df.setEnabled(enabled); df.setId("DATEFIELD_" + (enabled ? "ENABLED" : "DISABLED")); return df; } - private PopupDateField createPopupDateField(boolean enabled, + private LegacyPopupDateField createPopupDateField(boolean enabled, boolean textInputEnabled) { - PopupDateField df = new PopupDateField("PopupDateField, " + LegacyPopupDateField df = new LegacyPopupDateField("PopupDateField, " + (enabled ? "enabled" : "disabled") + ", text input " + (textInputEnabled ? "enabled" : "disabled")); df.setEnabled(enabled); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java index 66de59ffde..8d23b12655 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DatePopupStyleName.java @@ -2,18 +2,18 @@ package com.vaadin.tests.components.datefield; import java.util.Date; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; public class DatePopupStyleName extends TestBase { @Override public void setup() { setTheme("reindeer-tests"); - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); df.setValue(new Date(1203910239L)); - df.setResolution(DateField.RESOLUTION_SEC); + df.setResolution(LegacyDateField.RESOLUTION_SEC); df.setWidth("200px"); df.setRequired(true); df.setComponentError(new UserError("abc")); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java index d3bc4267ec..1358fb430a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateRangeWithSqlDate.java @@ -15,10 +15,10 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; -import com.vaadin.ui.InlineDateField; import java.util.Locale; @@ -34,7 +34,7 @@ public class DateRangeWithSqlDate extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - DateField df = new InlineDateField(); + LegacyDateField df = new LegacyInlineDateField(); df.setLocale(Locale.US); df.setRangeStart(startDate); df.setRangeEnd(endDate); 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 144e6fa945..272c29375b 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 @@ -3,15 +3,15 @@ package com.vaadin.tests.components.datefield; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.legacy.data.validator.LegacyNullValidator; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; @SuppressWarnings("serial") public class DefaultHandleUnparsableDateField extends TestBase { @Override protected void setup() { - final DateField date = new DateField("Default DateField"); + final LegacyDateField date = new LegacyDateField("Default DateField"); date.setImmediate(true); addComponent(date); date.addListener(new Property.ValueChangeListener() { @@ -25,7 +25,7 @@ public class DefaultHandleUnparsableDateField extends TestBase { } }); - final DateField validated = new DateField( + final LegacyDateField validated = new LegacyDateField( "Validated Default DateField"); validated.setImmediate(true); validated.addValidator( diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java index 49590a3cee..ab01916bf2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldPopup.java @@ -15,15 +15,15 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; public class DisabledDateFieldPopup extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - DateField field = new DateField(); + LegacyDateField field = new LegacyDateField(); field.setEnabled(false); addComponent(field); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java index 403b82a2a7..4af93da45d 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java @@ -1,17 +1,17 @@ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; public class DisabledDateFieldWidth extends TestBase { @Override public void setup() { - final DateField dateField1 = new DateField("DateField"); - dateField1.setResolution(DateField.RESOLUTION_YEAR); + final LegacyDateField dateField1 = new LegacyDateField("DateField"); + dateField1.setResolution(LegacyDateField.RESOLUTION_YEAR); dateField1.setEnabled(false); Button button = new Button("Repaint datefield", diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java index affc5d322c..9013b19f0e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledInlineDateField.java @@ -18,10 +18,10 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Date; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; -import com.vaadin.ui.InlineDateField; public class DisabledInlineDateField extends AbstractTestUI { @@ -34,12 +34,12 @@ public class DisabledInlineDateField extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - DateField df = new InlineDateField("Disabled"); + LegacyDateField df = new LegacyInlineDateField("Disabled"); df.setValue(testDate); df.setEnabled(false); addComponent(df); - df = new InlineDateField("Read-only"); + df = new LegacyInlineDateField("Read-only"); df.setValue(testDate); df.setReadOnly(true); addComponent(df); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java index 5ba158aef8..5562229758 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DisabledParentLayout.java @@ -15,10 +15,10 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; -import com.vaadin.ui.DateField; import com.vaadin.ui.VerticalLayout; /** @@ -35,13 +35,14 @@ public class DisabledParentLayout extends AbstractTestUI { content.setMargin(true); final VerticalLayout pane = new VerticalLayout(); - DateField dateField = new DateField(); + LegacyDateField dateField = new LegacyDateField(); // If the field is immediate, the UI behaves differently (the value is // updated and an error is indicated earlier instead of showing the date // selector on the first click as the test expects. Keeping as // non-immediate to test the old expected behavior. dateField.setImmediate(false); pane.addComponent(dateField); + pane.addComponent(new LegacyDateField()); content.addComponent(pane); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java index 31f97afabd..3a4e9a37df 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DynamicallyChangeDateRange.java @@ -3,13 +3,13 @@ package com.vaadin.tests.components.datefield; import java.util.Date; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; 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.DateField; -import com.vaadin.ui.InlineDateField; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.VerticalLayout; /** @@ -25,12 +25,12 @@ public class DynamicallyChangeDateRange extends AbstractTestUI { layout.setMargin(true); setContent(layout); - final PopupDateField df = new PopupDateField(); + final LegacyPopupDateField df = new LegacyPopupDateField(); df.setValue(new Date(2012 - 1900, 5 - 1, 12)); setRange(df, 5); layout.addComponent(df); - final InlineDateField df2 = new InlineDateField(); + final LegacyInlineDateField df2 = new LegacyInlineDateField(); df2.setValue(new Date(2012 - 1900, 11 - 1, 16)); setRange(df2, 5); @@ -62,7 +62,7 @@ public class DynamicallyChangeDateRange extends AbstractTestUI { * @param df * @param i */ - private void setRange(DateField df, int days) { + private void setRange(LegacyDateField df, int days) { df.setRangeStart(new Date(df.getValue().getTime() - days * 24 * 60 * 60 * 1000)); df.setRangeEnd(new Date(df.getValue().getTime() + days * 24 * 60 * 60 diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java index 1c8d8cfae6..160c57fdd6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFieldTest.java @@ -1,12 +1,12 @@ package com.vaadin.tests.components.datefield; -import com.vaadin.ui.InlineDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; -public class InlineDateFieldTest extends DateFieldTest<InlineDateField> { +public class InlineDateFieldTest extends DateFieldTest<LegacyInlineDateField> { @Override - protected Class<InlineDateField> getTestClass() { - return InlineDateField.class; + protected Class<LegacyInlineDateField> getTestClass() { + return LegacyInlineDateField.class; } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java index 1f8ef358af..186c77d458 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java @@ -5,32 +5,32 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Component; -import com.vaadin.ui.InlineDateField; @SuppressWarnings("serial") -public class InlineDateFields extends ComponentTestCase<InlineDateField> { +public class InlineDateFields extends ComponentTestCase<LegacyInlineDateField> { private static final Locale[] LOCALES = new Locale[] { Locale.US, Locale.TAIWAN, new Locale("fi", "FI") }; @Override - protected Class<InlineDateField> getTestClass() { - return InlineDateField.class; + protected Class<LegacyInlineDateField> getTestClass() { + return LegacyInlineDateField.class; } @Override protected void initializeComponents() { - InlineDateField hidden = new InlineDateField(); + LegacyInlineDateField hidden = new LegacyInlineDateField(); hidden.setVisible(false); // Used to break rest of layout #8693 addComponent(hidden); Locale locale = LOCALES[0]; - InlineDateField pd = createInlineDateField("Undefined width", "-1", + LegacyInlineDateField pd = createInlineDateField("Undefined width", "-1", locale); pd.setId("Locale-" + locale.toString() + "-undefined-wide"); addTestComponent(pd); @@ -44,9 +44,9 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> { } - private InlineDateField createInlineDateField(String caption, String width, + private LegacyInlineDateField createInlineDateField(String caption, String width, Locale locale) { - InlineDateField pd = new InlineDateField(caption + "(" + LegacyInlineDateField pd = new LegacyInlineDateField(caption + "(" + locale.toString() + ")"); pd.setWidth(width); pd.setValue(new Date(12312312313L)); @@ -78,10 +78,10 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> { options.put("Min", Resolution.MINUTE); options.put("Sec", Resolution.SECOND); return createSelectAction("Resolution", options, "Year", - new Command<InlineDateField, Resolution>() { + new Command<LegacyInlineDateField, Resolution>() { @Override - public void execute(InlineDateField c, Resolution value, + public void execute(LegacyInlineDateField c, Resolution value, Object data) { c.setResolution(value); @@ -95,10 +95,10 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> { options.put(locale.toString(), locale); } return createSelectAction("Locale", options, LOCALES[0].toString(), - new Command<InlineDateField, Locale>() { + new Command<LegacyInlineDateField, Locale>() { @Override - public void execute(InlineDateField c, Locale value, + public void execute(LegacyInlineDateField c, Locale value, Object data) { c.setCaption(c.getCaption().replaceAll( c.getLocale().toString(), value.toString())); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java index 585395d747..96c188148f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LenientMode.java @@ -5,9 +5,9 @@ import java.util.Locale; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.DateField; public class LenientMode extends TestBase implements ValueChangeListener { @@ -29,16 +29,16 @@ public class LenientMode extends TestBase implements ValueChangeListener { @SuppressWarnings("deprecation") Date d = new Date(2009 - 1900, 12 - 1, 31, 23, 59, 59); - DateField df = new DateField("Lenient "); + LegacyDateField df = new LegacyDateField("Lenient "); df.setLocale(new Locale("fi")); - df.setResolution(DateField.RESOLUTION_DAY); + df.setResolution(LegacyDateField.RESOLUTION_DAY); df.setLenient(true); df.setImmediate(true); df.setValue(d); - DateField df2 = new DateField("Normal "); + LegacyDateField df2 = new LegacyDateField("Normal "); df2.setLocale(new Locale("fi")); - df2.setResolution(DateField.RESOLUTION_DAY); + df2.setResolution(LegacyDateField.RESOLUTION_DAY); // df2.setLenient(false); df2.setValue(null); df2.setImmediate(true); @@ -50,13 +50,13 @@ public class LenientMode extends TestBase implements ValueChangeListener { df.addListener(this); df2.addListener(this); - df = new DateField("Lenient with time"); + df = new LegacyDateField("Lenient with time"); df.setLocale(new Locale("fi")); df.setLenient(true); df.setImmediate(true); df.setValue(d); - df2 = new DateField("Normal with time"); + df2 = new LegacyDateField("Normal with time"); df2.setLocale(new Locale("fi")); // df2.setLenient(false); df2.setValue(null); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java index f69c93419b..5aa8a0ade3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LocaleChange.java @@ -20,13 +20,13 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; 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.DateField; public class LocaleChange extends AbstractTestUI { @@ -46,7 +46,7 @@ public class LocaleChange extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); df.setLocale(locale24hClock); df.setResolution(Resolution.SECOND); df.setValue(dateValue); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java index 17b916ba56..cfa1384582 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LowResolution.java @@ -1,21 +1,21 @@ package com.vaadin.tests.components.datefield; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.legacy.ui.LegacyInlineDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.InlineDateField; -import com.vaadin.ui.PopupDateField; @SuppressWarnings("serial") public class LowResolution extends TestBase { @Override protected void setup() { - final PopupDateField dateField = new PopupDateField(); + final LegacyPopupDateField dateField = new LegacyPopupDateField(); dateField.setValue(new java.util.Date()); - dateField.setResolution(PopupDateField.RESOLUTION_MONTH); - dateField.addListener(new PopupDateField.ValueChangeListener() { + dateField.setResolution(LegacyPopupDateField.RESOLUTION_MONTH); + dateField.addListener(new LegacyPopupDateField.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( @@ -25,10 +25,10 @@ public class LowResolution extends TestBase { dateField.setImmediate(true); getLayout().addComponent(dateField); - final PopupDateField dateField3 = new PopupDateField(); + final LegacyPopupDateField dateField3 = new LegacyPopupDateField(); // dateField.setValue(new java.util.Date()); - dateField3.setResolution(PopupDateField.RESOLUTION_YEAR); - dateField3.addListener(new PopupDateField.ValueChangeListener() { + dateField3.setResolution(LegacyPopupDateField.RESOLUTION_YEAR); + dateField3.addListener(new LegacyPopupDateField.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( @@ -38,10 +38,10 @@ public class LowResolution extends TestBase { dateField3.setImmediate(true); getLayout().addComponent(dateField3); - final InlineDateField dateField2 = new InlineDateField(); + final LegacyInlineDateField dateField2 = new LegacyInlineDateField(); dateField2.setValue(new java.util.Date()); - dateField2.setResolution(PopupDateField.RESOLUTION_MONTH); - dateField2.addListener(new PopupDateField.ValueChangeListener() { + dateField2.setResolution(LegacyPopupDateField.RESOLUTION_MONTH); + dateField2.addListener(new LegacyPopupDateField.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( 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..c8dcbf100f 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 @@ -1,8 +1,8 @@ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.Table; public class NarrowPopupDateFieldInTable extends TestBase { @@ -11,7 +11,7 @@ public class NarrowPopupDateFieldInTable extends TestBase { @Override public void setup() { - PopupDateField df = new PopupDateField(); + LegacyPopupDateField df = new LegacyPopupDateField(); df.setWidth("100%"); Table t = new Table(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java index 0b8ffa52fa..724ddcb9c4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupClosingWithEsc.java @@ -15,29 +15,29 @@ */ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; import com.vaadin.ui.VerticalLayout; public class PopupClosingWithEsc extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - DateField df0 = new DateField("Minute"); + LegacyDateField df0 = new LegacyDateField("Minute"); df0.setId("minute"); df0.setResolution(Resolution.MINUTE); - DateField df1 = new DateField("Day"); + LegacyDateField df1 = new LegacyDateField("Day"); df1.setId("day"); df1.setResolution(Resolution.DAY); - DateField df2 = new DateField("Month"); + LegacyDateField df2 = new LegacyDateField("Month"); df2.setId("month"); df2.setResolution(Resolution.MONTH); - DateField df3 = new DateField("Year"); + LegacyDateField df3 = new LegacyDateField("Year"); df3.setId("year"); df3.setResolution(Resolution.YEAR); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java index 5cdc8f1396..436bff4922 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldConnector.java @@ -1,15 +1,15 @@ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; -import com.vaadin.ui.PopupDateField; public class PopupDateFieldConnector extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - addComponent(new PopupDateField()); - addComponent(new DateField()); + addComponent(new LegacyPopupDateField()); + addComponent(new LegacyDateField()); } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java index 2608e6e081..2499c5854c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java @@ -3,13 +3,13 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; 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.PopupDateField; @SuppressWarnings("serial") public class PopupDateFieldExtendedRange extends AbstractTestUI { @@ -22,7 +22,7 @@ public class PopupDateFieldExtendedRange extends AbstractTestUI { getLayout().setSpacing(true); - final PopupDateField[] fields = new PopupDateField[3]; + final LegacyPopupDateField[] fields = new LegacyPopupDateField[3]; fields[0] = makeDateField(); fields[0].setLocale(new Locale("fi", "FI")); @@ -37,7 +37,7 @@ public class PopupDateFieldExtendedRange extends AbstractTestUI { fields[2].setShowISOWeekNumbers(true); fields[2].setCaption("Finnish locale with week numbers"); - for (PopupDateField f : fields) { + for (LegacyPopupDateField f : fields) { addComponent(f); } @@ -45,7 +45,7 @@ public class PopupDateFieldExtendedRange extends AbstractTestUI { @Override public void buttonClick(ClickEvent event) { date.set(2010, 1, 16); - for (PopupDateField f : fields) { + for (LegacyPopupDateField f : fields) { f.setValue(date.getTime()); } } @@ -62,8 +62,8 @@ public class PopupDateFieldExtendedRange extends AbstractTestUI { return 6718; } - private PopupDateField makeDateField() { - PopupDateField pdf = new PopupDateField(); + private LegacyPopupDateField makeDateField() { + LegacyPopupDateField pdf = new LegacyPopupDateField(); pdf.setResolution(Resolution.DAY); pdf.setValue(date.getTime()); return pdf; diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java index a267d72b7f..0c7d35a666 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPrompt.java @@ -17,9 +17,9 @@ package com.vaadin.tests.components.datefield; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.TextField; /** @@ -31,7 +31,7 @@ import com.vaadin.ui.TextField; public class PopupDateFieldInputPrompt extends AbstractTestUI { private TextField text = new TextField("TextField"); - private PopupDateField dateField = new PopupDateField(); + private LegacyPopupDateField dateField = new LegacyPopupDateField(); @Override protected void setup(VaadinRequest request) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java index 86ce195609..c1fbf06ff0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldLocaleTest.java @@ -5,10 +5,10 @@ import java.util.Locale; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DateField; -import com.vaadin.ui.PopupDateField; public class PopupDateFieldLocaleTest extends AbstractTestUI { @@ -23,11 +23,11 @@ public class PopupDateFieldLocaleTest extends AbstractTestUI { cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); - final PopupDateField pdf = new PopupDateField(); + final LegacyPopupDateField pdf = new LegacyPopupDateField(); pdf.setLocale(Locale.ENGLISH); pdf.setValue(cal.getTime()); pdf.setImmediate(true); - pdf.setResolution(DateField.RESOLUTION_SEC); + pdf.setResolution(LegacyDateField.RESOLUTION_SEC); addComponent(pdf); pdf.addValueChangeListener(new ValueChangeListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java index ede5510c72..a2998464f7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldPopup.java @@ -3,9 +3,9 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; -import com.vaadin.ui.PopupDateField; public class PopupDateFieldPopup extends TestBase { @@ -20,11 +20,11 @@ public class PopupDateFieldPopup extends TestBase { cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); - PopupDateField pdf = new PopupDateField(); + LegacyPopupDateField pdf = new LegacyPopupDateField(); pdf.setLocale(Locale.US); pdf.setValue(cal.getTime()); pdf.setImmediate(true); - pdf.setResolution(DateField.RESOLUTION_SEC); + pdf.setResolution(LegacyDateField.RESOLUTION_SEC); addComponent(pdf); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java index aae4a213c6..22717d781e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldStates.java @@ -4,10 +4,10 @@ import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.PopupDateField; @SuppressWarnings("serial") public class PopupDateFieldStates extends AbstractTestUI { @@ -35,9 +35,9 @@ public class PopupDateFieldStates extends AbstractTestUI { return 14565; } - private static PopupDateField createPopupDateField(final boolean enabled, + private static LegacyPopupDateField createPopupDateField(final boolean enabled, final boolean textFieldEnabled) { - final PopupDateField popupDatefield = new PopupDateField(); + final LegacyPopupDateField popupDatefield = new LegacyPopupDateField(); Calendar cal = GregorianCalendar.getInstance(); cal.set(Calendar.DATE, 3); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTest.java index 6e3250a825..45a1e0a325 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTest.java @@ -2,13 +2,13 @@ package com.vaadin.tests.components.datefield; import java.util.LinkedHashMap; -import com.vaadin.ui.PopupDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; -public class PopupDateFieldTest extends DateFieldTest<PopupDateField> { +public class PopupDateFieldTest extends DateFieldTest<LegacyPopupDateField> { @Override - protected Class<PopupDateField> getTestClass() { - return PopupDateField.class; + protected Class<LegacyPopupDateField> getTestClass() { + return LegacyPopupDateField.class; } @Override @@ -26,10 +26,10 @@ public class PopupDateFieldTest extends DateFieldTest<PopupDateField> { options.put("åäöÅÄÖ", "åäöÅÄÖ"); createSelectAction("Input prompt", category, options, "<none>", - new Command<PopupDateField, String>() { + new Command<LegacyPopupDateField, String>() { @Override - public void execute(PopupDateField c, String value, + public void execute(LegacyPopupDateField c, String value, Object data) { c.setInputPrompt(value); @@ -39,10 +39,10 @@ public class PopupDateFieldTest extends DateFieldTest<PopupDateField> { private void createTextEnabledAction(String category) { this.createBooleanAction("Text field enabled", category, true, - new Command<PopupDateField, Boolean>() { + new Command<LegacyPopupDateField, Boolean>() { @Override - public void execute(PopupDateField c, Boolean value, + public void execute(LegacyPopupDateField c, Boolean value, Object data) { c.setTextFieldEnabled(value); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java index e1470797bc..45374c8122 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CheckBox; -import com.vaadin.ui.PopupDateField; public class PopupDateFieldTextEnabled extends TestBase { @@ -11,7 +11,7 @@ public class PopupDateFieldTextEnabled extends TestBase { @Override public void setup() { - final PopupDateField field = new PopupDateField(); + final LegacyPopupDateField field = new LegacyPopupDateField(); final CheckBox box = new CheckBox(ENABLED, true); box.addValueChangeListener(event -> { field.setTextFieldEnabled(event.getValue()); 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 62a788f4c2..7d32733d56 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 @@ -25,10 +25,10 @@ import java.util.Calendar; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyDateField; 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; @@ -56,7 +56,7 @@ public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog { Calendar calendar = Calendar.getInstance(); calendar.set(2010, 1, 1, 18, 19, 20); - final DateField df = new DateField(null, calendar.getTime()); + final LegacyDateField df = new LegacyDateField(null, calendar.getTime()); df.setResolution(Resolution.SECOND); df.setImmediate(true); hl.addComponent(df); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java index 9daf89d950..5df8f0e4b3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFields.java @@ -5,27 +5,27 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Component; -import com.vaadin.ui.PopupDateField; @SuppressWarnings("serial") -public class PopupDateFields extends ComponentTestCase<PopupDateField> { +public class PopupDateFields extends ComponentTestCase<LegacyPopupDateField> { private static final Locale[] LOCALES = new Locale[] { Locale.US, Locale.TAIWAN, new Locale("fi", "FI") }; @Override - protected Class<PopupDateField> getTestClass() { - return PopupDateField.class; + protected Class<LegacyPopupDateField> getTestClass() { + return LegacyPopupDateField.class; } @Override protected void initializeComponents() { for (Locale locale : LOCALES) { - PopupDateField pd = createPopupDateField("Undefined width", "-1", + LegacyPopupDateField pd = createPopupDateField("Undefined width", "-1", locale); pd.setId("Locale-" + locale.toString() + "-undefined-wide"); addTestComponent(pd); @@ -40,9 +40,9 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> { } - private PopupDateField createPopupDateField(String caption, String width, + private LegacyPopupDateField createPopupDateField(String caption, String width, Locale locale) { - PopupDateField pd = new PopupDateField(caption + "(" + LegacyPopupDateField pd = new LegacyPopupDateField(caption + "(" + locale.toString() + ")"); pd.setWidth(width); pd.setValue(new Date(12312312313L)); @@ -74,10 +74,10 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> { options.put("Min", Resolution.MINUTE); options.put("Sec", Resolution.SECOND); return createSelectAction("Resolution", options, "Year", - new Command<PopupDateField, Resolution>() { + new Command<LegacyPopupDateField, Resolution>() { @Override - public void execute(PopupDateField c, Resolution value, + public void execute(LegacyPopupDateField c, Resolution value, Object data) { c.setResolution(value); @@ -92,10 +92,10 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> { options.put("åäöÅÄÖ", "åäöÅÄÖ"); return createSelectAction("Input prompt", options, "<none>", - new Command<PopupDateField, String>() { + new Command<LegacyPopupDateField, String>() { @Override - public void execute(PopupDateField c, String value, + public void execute(LegacyPopupDateField c, String value, Object data) { c.setInputPrompt(value); 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 e7a8b9a20c..c8d05bc5e5 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 @@ -7,8 +7,8 @@ import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; import com.vaadin.legacy.data.Validator; import com.vaadin.legacy.data.validator.LegacyAbstractValidator; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; public class RequiredInvalidDateField extends TestBase { @@ -55,9 +55,10 @@ public class RequiredInvalidDateField extends TestBase { // not required Property<Date> dateProperty1 = new ObjectProperty<Date>(date); - DateField dateField1 = new DateField("Not required", dateProperty1); + LegacyDateField dateField1 = new LegacyDateField("Not required", + dateProperty1); dateField1.setLocale(new Locale("fi", "FI")); - dateField1.setResolution(DateField.RESOLUTION_DAY); + dateField1.setResolution(LegacyDateField.RESOLUTION_DAY); dateField1.setId("_DF1"); dateField1.setImmediate(true); dateField1.addValidator(dateValidator); @@ -65,9 +66,10 @@ public class RequiredInvalidDateField extends TestBase { // required Property<Date> dateProperty2 = new ObjectProperty<Date>(date); - DateField dateField2 = new DateField("Required", dateProperty2); + LegacyDateField dateField2 = new LegacyDateField("Required", + dateProperty2); dateField2.setLocale(new Locale("fi", "FI")); - dateField2.setResolution(DateField.RESOLUTION_DAY); + dateField2.setResolution(LegacyDateField.RESOLUTION_DAY); dateField2.setId("_DF2"); dateField2.setRequired(true); dateField2.setImmediate(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java index da8f45690c..3fad7767f5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java @@ -1,14 +1,14 @@ package com.vaadin.tests.components.datefield; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Form; import com.vaadin.ui.Label; -import com.vaadin.ui.PopupDateField; /** * First entering an invalid date, forcing a server roundtrip and then selecting - * a valid date from the popup in a non-immediate {@link PopupDateField} caused + * a valid date from the popup in a non-immediate {@link LegacyPopupDateField} caused * the invalid date string to continue to show. */ public class ShowSelectedDateAfterInvalid extends TestBase { @@ -19,8 +19,8 @@ public class ShowSelectedDateAfterInvalid extends TestBase { final Form form = new Form(); - PopupDateField datefield = new PopupDateField(); - datefield.setResolution(PopupDateField.RESOLUTION_DAY); + LegacyPopupDateField datefield = new LegacyPopupDateField(); + datefield.setResolution(LegacyPopupDateField.RESOLUTION_DAY); datefield.setDateFormat("dd/MM/yyyy"); form.addField("datefield", datefield); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java index 4fa7a6811a..abacf246b8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/TestDatefieldYear.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.datefield; import java.util.Date; import java.util.Locale; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; public class TestDatefieldYear extends TestBase { @@ -21,10 +21,10 @@ public class TestDatefieldYear extends TestBase { @Override protected void setup() { @SuppressWarnings("deprecation") - DateField df = new DateField("Year", new Date(2009 - 1900, 4 - 1, 1)); + LegacyDateField df = new LegacyDateField("Year", new Date(2009 - 1900, 4 - 1, 1)); df.setLocale(new Locale("en", "US")); - df.setResolution(DateField.RESOLUTION_YEAR); - df.setResolution(DateField.RESOLUTION_MONTH); + df.setResolution(LegacyDateField.RESOLUTION_YEAR); + df.setResolution(LegacyDateField.RESOLUTION_MONTH); addComponent(df); } 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 a45d3b8ad0..fd515e5883 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 @@ -6,14 +6,14 @@ import java.util.Locale; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; 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.DateField; import com.vaadin.ui.Label; -import com.vaadin.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 PopupDateField df = new PopupDateField(dateProperty); + final LegacyPopupDateField df = new LegacyPopupDateField(dateProperty); df.setLocale(new Locale("en", "US")); df.setImmediate(true); - df.setResolution(DateField.RESOLUTION_DAY); + df.setResolution(LegacyDateField.RESOLUTION_DAY); addComponent(df); Label valueLabel = new Label(df.getPropertyDataSource()); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java index b7b0f50947..08004e4190 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java @@ -2,19 +2,19 @@ package com.vaadin.tests.components.datefield; import java.util.Date; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.DateField; public class WidthRecalculationOnEnableStateChange extends TestBase { @Override public void setup() { setTheme("reindeer-tests"); - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); df.setValue(new Date(1203910239L)); - df.setResolution(DateField.RESOLUTION_SEC); + df.setResolution(LegacyDateField.RESOLUTION_SEC); df.setWidth("200px"); df.addStyleName("enabled-readonly-styled"); addComponent(df); diff --git a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java index d3932c1df0..c6e911a6e5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java +++ b/uitest/src/main/java/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java @@ -15,17 +15,17 @@ */ package com.vaadin.tests.components.formlayout; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.FormLayout; -import com.vaadin.ui.PopupDateField; public class FormLayoutErrorHover extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { FormLayout formLayout = new FormLayout(); - PopupDateField fromDate = new PopupDateField("Date"); + LegacyPopupDateField fromDate = new LegacyPopupDateField("Date"); fromDate.setImmediate(true); formLayout.addComponent(fromDate); diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java index d2ca7700ad..63fabceba3 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/GridLayoutCellSizesUI.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.gridlayout; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; @SuppressWarnings("serial") @@ -31,7 +31,7 @@ public class GridLayoutCellSizesUI extends AbstractTestUI { // Add some components of various shapes. grid.addComponent(new Button("3x1 button"), 1, 1, 3, 1); grid.addComponent(new Label("1x2 cell"), 1, 2, 1, 3); - final InlineDateField date = new InlineDateField("A 2x2 date field"); + final LegacyInlineDateField date = new LegacyInlineDateField("A 2x2 date field"); date.setResolution(Resolution.DAY); grid.addComponent(date, 2, 2, 3, 3); diff --git a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java index 0ec8cd5030..e4956025ed 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java +++ b/uitest/src/main/java/com/vaadin/tests/components/gridlayout/LayoutAfterHidingError.java @@ -16,13 +16,13 @@ package com.vaadin.tests.components.gridlayout; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.UserError; 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.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Panel; @@ -38,7 +38,7 @@ public class LayoutAfterHidingError extends AbstractTestUI { gl.setWidth("100%"); panel.setContent(gl); - final DateField df = new DateField(); + final LegacyDateField df = new LegacyDateField(); df.setWidth("100%"); gl.addComponent(df); 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 dd5d162e17..36556c2807 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 @@ -1,5 +1,6 @@ package com.vaadin.tests.components.table; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractOrderedLayout; @@ -7,7 +8,6 @@ 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; @@ -151,7 +151,7 @@ public class TableChildMeasurementHint extends AbstractTestUI { table.addGeneratedColumn("First_Name" + 4, new Table.ColumnGenerator() { @Override public Object generateCell(Table components, Object o, Object o2) { - DateField b = new DateField("DateField"); + LegacyDateField b = new LegacyDateField("DateField"); b.setWidthUndefined(); return b; } 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 12da99b7f4..0f6cbcccfd 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 @@ -1,7 +1,7 @@ package com.vaadin.tests.components.tabsheet; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.DateField; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.TabSheet; @@ -32,14 +32,14 @@ public class ScrollbarsInNestedTabsheets extends TestBase { private Layout getDummyLayout1() { final VerticalLayout l = new VerticalLayout(); - l.addComponent(new DateField("Date")); + l.addComponent(new LegacyDateField("Date")); return l; } private Layout getDummyLayout2() { final VerticalLayout l = new VerticalLayout(); - l.addComponent(new DateField("Date")); + l.addComponent(new LegacyDateField("Date")); l.addComponent(new TextField("TextField")); return l; diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java index cb97e8ee84..b4189fb2c5 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/DatesCssTest.java @@ -3,12 +3,12 @@ package com.vaadin.tests.components.uitest.components; import java.util.Calendar; import java.util.GregorianCalendar; +import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.tests.components.uitest.TestSampler; import com.vaadin.ui.Component; -import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; -import com.vaadin.ui.InlineDateField; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.themes.ChameleonTheme; public class DatesCssTest extends GridLayout { @@ -28,12 +28,12 @@ public class DatesCssTest extends GridLayout { createDateFieldWith("Small", ChameleonTheme.DATEFIELD_SMALL, null); createDateFieldWith("Big", ChameleonTheme.DATEFIELD_BIG, null); - DateField df = new PopupDateField("Popup date field"); + LegacyDateField df = new LegacyPopupDateField("Popup date field"); df.setId("datefield" + debugIdCounter++); df.setValue(cal.getTime()); addComponent(df); - df = new InlineDateField("Inline date field"); + df = new LegacyInlineDateField("Inline date field"); df.setId("datefield" + debugIdCounter++); df.setValue(cal.getTime()); addComponent(df); @@ -47,7 +47,7 @@ public class DatesCssTest extends GridLayout { private void createDateFieldWith(String caption, String primaryStyleName, String width) { - DateField df = new DateField("Date field"); + LegacyDateField df = new LegacyDateField("Date field"); df.setId("datefield" + debugIdCounter++); df.setValue(cal.getTime()); 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 506a25f663..af1ad5111e 100644 --- a/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java +++ b/uitest/src/main/java/com/vaadin/tests/declarative/PotusForm.java @@ -17,9 +17,9 @@ package com.vaadin.tests.declarative; import com.vaadin.annotations.DesignRoot; import com.vaadin.data.fieldgroup.PropertyId; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.declarative.Design; @@ -34,9 +34,9 @@ public class PotusForm extends VerticalLayout { @PropertyId("party") public ComboBox party; @PropertyId("tookOffice") - public PopupDateField tookOffice; + public LegacyPopupDateField tookOffice; @PropertyId("leftOffice") - public PopupDateField leftOffice; + public LegacyPopupDateField leftOffice; public Button save; public Button revert; 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 6080f18391..71c4c967c8 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java @@ -8,25 +8,25 @@ 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.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; 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.DateField; -import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Notification; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.TextField; public class DateForm extends AbstractTestUIWithLog { @PropertyId("date1") - private DateField dateField; + private LegacyDateField dateField; @PropertyId("date2") - private PopupDateField popupDateField; + private LegacyPopupDateField popupDateField; @PropertyId("date3") - private InlineDateField inlineDateField; + private LegacyInlineDateField inlineDateField; @PropertyId("date4") private TextField textField; 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 cae5e16e06..2c0fa042dc 100644 --- a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java +++ b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java @@ -3,6 +3,8 @@ package com.vaadin.tests.fields; import java.util.ArrayList; import java.util.List; +import com.vaadin.legacy.ui.LegacyInlineDateField; +import com.vaadin.legacy.ui.LegacyPopupDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Button; @@ -13,12 +15,10 @@ 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.PasswordField; -import com.vaadin.ui.PopupDateField; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.Slider; import com.vaadin.ui.Table; @@ -98,8 +98,8 @@ public class TabIndexes extends AbstractTestUIWithLog { fields.add(new NativeSelect()); fields.add(new ListSelect()); fields.add(new TextField()); - fields.add(new PopupDateField()); - fields.add(new InlineDateField()); + fields.add(new LegacyPopupDateField()); + fields.add(new LegacyInlineDateField()); OptionGroup og = new OptionGroup(); og.addItem("Item 1"); og.addItem("Item 2"); 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 e9d2b91e95..2d19b328df 100644 --- a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java @@ -17,6 +17,7 @@ package com.vaadin.tests.fonticon; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.FontAwesome; import com.vaadin.server.FontIcon; import com.vaadin.server.Page; @@ -33,7 +34,6 @@ 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; @@ -110,7 +110,7 @@ public class FontIcons extends AbstractTestUI { // Basic components, caption icon only Class<?>[] components = { Button.class, CheckBox.class, - DateField.class, NativeButton.class, Link.class, Label.class, + LegacyDateField.class, NativeButton.class, Link.class, Label.class, Panel.class, Slider.class, TextArea.class, TextField.class, Upload.class }; for (Class<?> clazz : components) { 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 89e2d9b1fa..41c655e4f9 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java @@ -7,6 +7,7 @@ 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.legacy.ui.LegacyDateField; import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.tests.components.TestBase; @@ -18,7 +19,6 @@ 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; import com.vaadin.ui.FormLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -200,7 +200,7 @@ public class CaptionsInLayoutsWaiAria extends TestBase { components.add(new TextArea("Default TextArea.")); // components.add(new RichTextArea("Default RichtTextArea")); components.add(new PasswordField("Default Password")); - components.add(new DateField("Default DateField")); + components.add(new LegacyDateField("Default DateField")); // PopupDateField popupDateField = new // PopupDateField("Default DateField"); @@ -310,8 +310,8 @@ public class CaptionsInLayoutsWaiAria extends TestBase { for (String width : new String[] { "auto" }) { Object id = layoutSelect.addItem(); Item i = layoutSelect.getItem(id); - i.getItemProperty(CAPTION).setValue( - cls.getSimpleName() + ", " + width); + i.getItemProperty(CAPTION) + .setValue(cls.getSimpleName() + ", " + width); i.getItemProperty(CLASS).setValue(cls); i.getItemProperty(WIDTH).setValue(width); } @@ -325,10 +325,11 @@ public class CaptionsInLayoutsWaiAria extends TestBase { public void valueChange(ValueChangeEvent event) { Item i = layoutSelect.getItem(event.getProperty().getValue()); - setLayout(getLayout((String) i.getItemProperty(CAPTION) - .getValue(), (Class<? extends Layout>) i - .getItemProperty(CLASS).getValue(), (String) i - .getItemProperty(WIDTH).getValue())); + setLayout(getLayout( + (String) i.getItemProperty(CAPTION).getValue(), + (Class<? extends Layout>) i.getItemProperty(CLASS) + .getValue(), + (String) i.getItemProperty(WIDTH).getValue())); } }); 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 df4053b533..9f8366f4a6 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 @@ -15,12 +15,12 @@ */ package com.vaadin.tests.layouts.layouttester; +import com.vaadin.legacy.ui.LegacyDateField; 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; @@ -52,7 +52,7 @@ public class BaseRegError extends BaseLayoutTestUI { l1.addComponent(createLabelsFields(TextField.class, true, "")); l2.addComponent(createLabelsFields(ComboBox.class, true, "")); - l2.addComponent(createLabelsFields(DateField.class, true, "")); + l2.addComponent(createLabelsFields(LegacyDateField.class, true, "")); l2.addComponent(createLabelsFields(NativeSelect.class, true, "")); l2.addComponent(createLabelsFields(CheckBox.class, true, "")); 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 5b4dd2a947..4f44fb40d8 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 @@ -15,11 +15,11 @@ */ package com.vaadin.tests.layouts.layouttester.GridLayout; +import com.vaadin.legacy.ui.LegacyDateField; 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; @@ -46,7 +46,7 @@ public class GridLayoutRegError extends GridBaseLayoutTestUI { layout.addComponent(createLabelsFields(TextField.class, true, "")); layout.addComponent(createLabelsFields(ComboBox.class, true, "")); - layout.addComponent(createLabelsFields(DateField.class, true, "")); + layout.addComponent(createLabelsFields(LegacyDateField.class, true, "")); layout.addComponent(createLabelsFields(NativeSelect.class, true, "")); layout.addComponent(createLabelsFields(CheckBox.class, true, "")); 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 be8ea9e533..d7ef31cf56 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 @@ -5,14 +5,14 @@ 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.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.navigator.Navigator; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.DateField; -import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Layout; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; @@ -25,7 +25,7 @@ public class SettingsView extends Panel implements View { public static String NAME = "settings"; Navigator navigator; - DateField date; + LegacyDateField 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 InlineDateField("Birth date"); + date = new LegacyInlineDateField("Birth date"); date.setImmediate(true); layout.addComponent(date); // pretend we have a datasource: 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 c6f3ba2909..1db15d1b81 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 @@ -14,6 +14,7 @@ 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.legacy.ui.LegacyDateField; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.shared.ui.combobox.FilteringMode; @@ -28,7 +29,6 @@ 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.DateField; import com.vaadin.ui.FormLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -143,8 +143,8 @@ public class CalendarTest extends GridLayout implements View { private boolean useSecondResolution; - private DateField startDateField; - private DateField endDateField; + private LegacyDateField startDateField; + private LegacyDateField endDateField; public CalendarTest() { setSizeFull(); @@ -517,8 +517,8 @@ public class CalendarTest extends GridLayout implements View { return f; } - private DateField createDateField(String caption) { - DateField f = new DateField(caption); + private LegacyDateField createDateField(String caption) { + LegacyDateField f = new LegacyDateField(caption); if (useSecondResolution) { f.setResolution(Resolution.SECOND); } else { 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 9c95b7400c..04e2d77881 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 @@ -21,6 +21,8 @@ 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.legacy.ui.LegacyDateField; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.UserError; @@ -29,10 +31,8 @@ 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.ui.DateField; import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.ValoTheme; @@ -50,16 +50,16 @@ public class DateFields extends VerticalLayout implements View { row.setSpacing(true); addComponent(row); - DateField date = new DateField("Default resolution"); + LegacyDateField date = new LegacyDateField("Default resolution"); setDate(date); row.addComponent(date); - date = new DateField("Error"); + date = new LegacyDateField("Error"); setDate(date); date.setComponentError(new UserError("Fix it, now!")); row.addComponent(date); - date = new DateField("Error, borderless"); + date = new LegacyDateField("Error, borderless"); setDate(date); date.setComponentError(new UserError("Fix it, now!")); date.addStyleName(ValoTheme.DATEFIELD_BORDERLESS); @@ -70,7 +70,7 @@ public class DateFields extends VerticalLayout implements View { group.addStyleName(ValoTheme.LAYOUT_COMPONENT_GROUP); row.addComponent(group); - final DateField date2 = new DateField(); + final LegacyDateField date2 = new LegacyDateField(); group.addComponent(date2); Button today = new Button("Today", new ClickListener() { @@ -81,120 +81,120 @@ public class DateFields extends VerticalLayout implements View { }); group.addComponent(today); - date = new DateField("Default resolution, explicit size"); + date = new LegacyDateField("Default resolution, explicit size"); setDate(date); row.addComponent(date); date.setWidth("260px"); date.setHeight("60px"); - date = new DateField("Second resolution"); + date = new LegacyDateField("Second resolution"); setDate(date); date.setResolution(Resolution.SECOND); row.addComponent(date); - date = new DateField("Minute resolution"); + date = new LegacyDateField("Minute resolution"); setDate(date); date.setResolution(Resolution.MINUTE); row.addComponent(date); - date = new DateField("Hour resolution"); + date = new LegacyDateField("Hour resolution"); setDate(date); date.setResolution(Resolution.HOUR); row.addComponent(date); - date = new DateField("Disabled"); + date = new LegacyDateField("Disabled"); setDate(date); date.setResolution(Resolution.HOUR); date.setEnabled(false); row.addComponent(date); - date = new DateField("Day resolution"); + date = new LegacyDateField("Day resolution"); setDate(date); date.setResolution(Resolution.DAY); row.addComponent(date); - date = new DateField("Month resolution"); + date = new LegacyDateField("Month resolution"); setDate(date); date.setResolution(Resolution.MONTH); row.addComponent(date); - date = new DateField("Year resolution"); + date = new LegacyDateField("Year resolution"); setDate(date); date.setResolution(Resolution.YEAR); row.addComponent(date); - date = new DateField("Custom color"); + date = new LegacyDateField("Custom color"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName("color1"); row.addComponent(date); - date = new DateField("Custom color"); + date = new LegacyDateField("Custom color"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName("color2"); row.addComponent(date); - date = new DateField("Custom color"); + date = new LegacyDateField("Custom color"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName("color3"); row.addComponent(date); - date = new DateField("Small"); + date = new LegacyDateField("Small"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_SMALL); row.addComponent(date); - date = new DateField("Large"); + date = new LegacyDateField("Large"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_LARGE); row.addComponent(date); - date = new DateField("Borderless"); + date = new LegacyDateField("Borderless"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_BORDERLESS); row.addComponent(date); - date = new DateField("Week numbers"); + date = new LegacyDateField("Week numbers"); setDate(date); date.setResolution(Resolution.DAY); date.setLocale(new Locale("fi", "fi")); date.setShowISOWeekNumbers(true); row.addComponent(date); - date = new DateField("US locale"); + date = new LegacyDateField("US locale"); setDate(date); date.setResolution(Resolution.SECOND); date.setLocale(new Locale("en", "US")); row.addComponent(date); - date = new DateField("Custom format"); + date = new LegacyDateField("Custom format"); setDate(date); date.setDateFormat("E dd/MM/yyyy"); row.addComponent(date); - date = new DateField("Tiny"); + date = new LegacyDateField("Tiny"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_TINY); row.addComponent(date); - date = new DateField("Huge"); + date = new LegacyDateField("Huge"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_HUGE); row.addComponent(date); - date = new InlineDateField("Date picker"); + date = new LegacyInlineDateField("Date picker"); setDate(date); setDateRange(date); row.addComponent(date); - date = new InlineDateField("Date picker with week numbers"); + date = new LegacyInlineDateField("Date picker with week numbers"); setDate(date); date.setLocale(new Locale("fi", "fi")); date.setShowISOWeekNumbers(true); @@ -214,7 +214,7 @@ public class DateFields extends VerticalLayout implements View { row.addComponent(form); } - private void setDateRange(DateField date) { + private void setDateRange(LegacyDateField date) { date.setRangeStart(getDefaultDate()); Date endDate = getDefaultDate(); @@ -222,7 +222,7 @@ public class DateFields extends VerticalLayout implements View { date.setRangeEnd(endDate); } - private void setDate(DateField date) { + private void setDate(LegacyDateField date) { date.setValue(getDefaultDate()); } 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 32aef68520..e39cdbd376 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 @@ -17,6 +17,7 @@ package com.vaadin.tests.themes.valo; import java.util.Date; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.server.UserError; @@ -27,7 +28,6 @@ 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; @@ -69,7 +69,7 @@ public class Forms extends VerticalLayout implements View { name.setWidth("50%"); form.addComponent(name); - DateField birthday = new DateField("Birthday"); + LegacyDateField birthday = new LegacyDateField("Birthday"); birthday.setValue(new Date(80, 0, 31)); form.addComponent(birthday); 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 9938d53238..d23f701cae 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 @@ -21,12 +21,12 @@ 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.legacy.ui.LegacyDateField; 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; @@ -199,7 +199,7 @@ public class Tables extends VerticalLayout implements View { @Override public Object generateCell(Table source, Object itemId, Object columnId) { - DateField tf = new DateField(); + LegacyDateField tf = new LegacyDateField(); tf.addStyleName(ValoTheme.TABLE_COMPACT); if ((Integer) itemId % 2 == 0) { tf.addStyleName(ValoTheme.DATEFIELD_BORDERLESS); 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 b59c500d28..9abac0c6de 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 @@ -15,12 +15,12 @@ */ package com.vaadin.tests.themes.valo; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.server.VaadinRequest; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; 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; @@ -49,7 +49,7 @@ public class ValoMiscTests extends UI { button.setWidth("100%"); Button button2 = new Button("Abc"); button2.setWidth("100%"); - row.addComponents(button, new InlineDateField(), new CheckBox("Far")); + row.addComponents(button, new LegacyInlineDateField(), new CheckBox("Far")); p.setContent(row); @@ -63,7 +63,7 @@ public class ValoMiscTests extends UI { // row.setMargin(true); col.setDefaultComponentAlignment(Alignment.BOTTOM_CENTER); - col.addComponents(new Button("Boo"), new InlineDateField(), + col.addComponents(new Button("Boo"), new LegacyInlineDateField(), new CheckBox("Far"), new Button("Abc")); p.setContent(col); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java index 40ffd78740..0ad03f4cb2 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1397.java @@ -3,10 +3,10 @@ package com.vaadin.tests.tickets; import java.util.Date; import com.vaadin.data.util.ObjectProperty; +import com.vaadin.legacy.ui.LegacyInlineDateField; import com.vaadin.server.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Component; -import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; @@ -126,7 +126,7 @@ public class Ticket1397 extends LegacyApplication { table.setPageLength(20); for (int i = 0; i < 1000; i++) { - final InlineDateField df = new InlineDateField("", new Date()); + final LegacyInlineDateField df = new LegacyInlineDateField("", new Date()); PopupView pp = new PopupView(new PopupView.Content() { @Override public String getMinimizedValueAsHTML() { diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java index 8526cf9a76..58771413c4 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java @@ -6,6 +6,7 @@ import com.vaadin.data.HasValue; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.MethodProperty; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.SystemError; import com.vaadin.server.ThemeResource; import com.vaadin.shared.ui.AlignmentInfo.Bits; @@ -16,7 +17,6 @@ import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; -import com.vaadin.ui.DateField; import com.vaadin.ui.Form; import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; @@ -228,14 +228,14 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { t7.setIcon(new ThemeResource("../runo/icons/16/ok.png")); lo.addComponent(t7); - DateField d1 = new DateField( + LegacyDateField d1 = new LegacyDateField( "Datefield with caption and icon, next one without caption"); d1.setComponentError(new SystemError("Error")); d1.setRequired(true); d1.setIcon(new ThemeResource("../runo/icons/16/ok.png")); lo.addComponent(d1); - DateField d2 = new DateField(); + LegacyDateField d2 = new LegacyDateField(); d2.setComponentError(new SystemError("Error")); d2.setRequired(true); lo.addComponent(d2); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java index f58a54ec9a..686b0f8434 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1986.java @@ -1,9 +1,9 @@ package com.vaadin.tests.tickets; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; -import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.ListSelect; @@ -27,7 +27,7 @@ public class Ticket1986 extends LegacyApplication { TextField f2 = new TextField("2"); f2.setTabIndex(index++); - DateField f3 = new DateField("3"); + LegacyDateField f3 = new LegacyDateField("3"); f3.setTabIndex(index++); ComboBox cb = new ComboBox("4"); cb.setTabIndex(index++); diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java index 172ced73cc..df5ba0cc48 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2051.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets; import com.vaadin.data.Item; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.LegacyApplication; import com.vaadin.ui.Button; import com.vaadin.ui.Component; -import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; @@ -37,7 +37,7 @@ public class Ticket2051 extends LegacyApplication { i.getItemProperty(P2).setValue(new Label("label")); Item i2 = t.addItem("2"); i2.getItemProperty(P1).setValue(new Button("def")); - i2.getItemProperty(P2).setValue(new DateField()); + i2.getItemProperty(P2).setValue(new LegacyDateField()); layout.addComponent(t); } diff --git a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java index 609e32a5f0..8f6f98e1c4 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket2998.java @@ -11,11 +11,11 @@ import java.util.Set; import com.vaadin.data.Container; import com.vaadin.data.util.BeanItemContainer; import com.vaadin.legacy.data.Validator; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.LegacyApplication; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Component; -import com.vaadin.ui.DateField; import com.vaadin.ui.DefaultFieldFactory; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Layout; @@ -103,7 +103,7 @@ public class Ticket2998 extends LegacyApplication { public class WorkoutEditor extends Window { - private DateField date = new DateField("Date"); + private LegacyDateField date = new LegacyDateField("Date"); private TextField kilomiters = new TextField("Kilometers"); private TextField title = new TextField("Title/note"); @@ -119,7 +119,7 @@ public class Ticket2998 extends LegacyApplication { FormLayout form = new FormLayout(); form.setSizeUndefined(); - date.setResolution(DateField.RESOLUTION_MIN); + date.setResolution(LegacyDateField.RESOLUTION_MIN); form.addComponent(date); form.addComponent(kilomiters); form.addComponent(title); @@ -191,7 +191,7 @@ public class Ticket2998 extends LegacyApplication { }); } if (propertyId.equals("date")) { - ((DateField) f).setResolution(DateField.RESOLUTION_MIN); + ((LegacyDateField) f).setResolution(LegacyDateField.RESOLUTION_MIN); } } return f; diff --git a/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java index fe4f7e22c7..356d670526 100644 --- a/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java +++ b/uitest/src/main/java/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java @@ -3,13 +3,13 @@ package com.vaadin.tests.validation; import java.util.Date; import com.vaadin.legacy.data.Validator.InvalidValueException; +import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.legacy.ui.LegacyField; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.AlwaysFailValidator; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.DateField; import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.NativeSelect; @@ -91,7 +91,7 @@ public class EmptyFieldErrorIndicators extends TestBase { }; form.addField("Field", new TextField("Text")); - form.addField("Date", new DateField("Date")); + form.addField("Date", new LegacyDateField("Date")); // not good for automated testing with screenshots when null // form.addField("Inline Date", new InlineDateField("Date")); // same as basic DateField diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java index 4ee9597f68..2f0d0318c4 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldDayResolutionOffsetTest.java @@ -1,15 +1,15 @@ package com.vaadin.tests.components.datefield; -import com.vaadin.testbench.elements.DateFieldElement; -import com.vaadin.testbench.elements.LabelElement; -import com.vaadin.tests.tb3.AbstractTB3Test; -import com.vaadin.tests.tb3.MultiBrowserTest; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.Is.is; +import com.vaadin.testbench.elements.LabelElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFieldDayResolutionOffsetTest extends MultiBrowserTest { @@ -25,8 +25,8 @@ public class DateFieldDayResolutionOffsetTest extends MultiBrowserTest { } private void select2ndOfSeptember() { - for (WebElement e : findElements(By - .className("v-datefield-calendarpanel-day"))) { + for (WebElement e : findElements( + By.className("v-datefield-calendarpanel-day"))) { if (e.getText().equals("2")) { e.click(); break; @@ -35,7 +35,8 @@ public class DateFieldDayResolutionOffsetTest extends MultiBrowserTest { } private void openDatePicker() { - DateFieldElement dateField = $(DateFieldElement.class).first(); + LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class) + .first(); dateField.findElement(By.tagName("button")).click(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java index 3ba63d0f12..122e55d8f0 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldIsValidTest.java @@ -22,7 +22,7 @@ import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -36,8 +36,8 @@ public class DateFieldIsValidTest extends MultiBrowserTest { waitForElementVisible(By.id("Log")); waitForElementVisible(By.className("v-datefield")); - WebElement dateTextbox = $(DateFieldElement.class).first().findElement( - By.className("v-textfield")); + WebElement dateTextbox = $(LegacyDateFieldElement.class).first() + .findElement(By.className("v-textfield")); ButtonElement button = $(ButtonElement.class).first(); dateTextbox.sendKeys("01/01/01", Keys.TAB); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java index 15f196a26b..9e6183bb8d 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldKeyboardInputTest.java @@ -22,8 +22,8 @@ import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.testbench.elements.LabelElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFieldKeyboardInputTest extends MultiBrowserTest { @@ -31,7 +31,7 @@ public class DateFieldKeyboardInputTest extends MultiBrowserTest { @Test public void testValueChangeEvent() { openTestURL(); - WebElement dateFieldText = $(DateFieldElement.class).first() + WebElement dateFieldText = $(LegacyDateFieldElement.class).first() .findElement(By.tagName("input")); dateFieldText.clear(); int numLabelsBeforeUpdate = $(LabelElement.class).all().size(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java index ca3d3a8748..813a2a825f 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingOnDetachTest.java @@ -20,7 +20,7 @@ import java.io.IOException; import org.junit.Test; import org.openqa.selenium.By; -import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFieldPopupClosingOnDetachTest extends MultiBrowserTest { @@ -31,7 +31,7 @@ public class DateFieldPopupClosingOnDetachTest extends MultiBrowserTest { openTestURL(); // Open the DateField popup. - DateFieldElement df = $(DateFieldElement.class).first(); + LegacyDateFieldElement df = $(LegacyDateFieldElement.class).first(); df.findElement(By.tagName("button")).click(); // Test UI will remove the DateField after 1 second. diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java index 9fd6fe82e2..a49efd661c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupClosingTest.java @@ -10,7 +10,7 @@ import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; -import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFieldPopupClosingTest extends MultiBrowserTest { @@ -30,8 +30,8 @@ public class DateFieldPopupClosingTest extends MultiBrowserTest { } private void assertThatPopupIsVisible() { - waitUntil(ExpectedConditions.visibilityOfElementLocated(By - .className("v-datefield-popup"))); + waitUntil(ExpectedConditions + .visibilityOfElementLocated(By.className("v-datefield-popup"))); } private void assertThatPopupIsInvisible() { @@ -69,7 +69,8 @@ public class DateFieldPopupClosingTest extends MultiBrowserTest { } private WebElement getToggleButton() { - DateFieldElement dateField = $(DateFieldElement.class).first(); + LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class) + .first(); return dateField.findElement(By.tagName("button")); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java index f896519aae..7859734b77 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldPopupPositionTest.java @@ -20,7 +20,7 @@ import org.openqa.selenium.By; import org.openqa.selenium.Dimension; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -55,7 +55,8 @@ public abstract class DateFieldPopupPositionTest extends MultiBrowserTest { } private int getFieldBottom() { - DateFieldElement dateField = $(DateFieldElement.class).first(); + LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class) + .first(); return dateField.getLocation().getY() + dateField.getSize().getHeight(); } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java index cfab13e205..ea189a93a9 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldReadOnlyTest.java @@ -1,20 +1,20 @@ package com.vaadin.tests.components.datefield; -import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.DateFieldElement; -import com.vaadin.tests.tb3.AbstractTB3Test; -import com.vaadin.tests.tb3.MultiBrowserTest; +import java.io.IOException; + import org.junit.Test; import org.openqa.selenium.Keys; -import java.io.IOException; +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFieldReadOnlyTest extends MultiBrowserTest { @Test - public void readOnlyDateFieldPopupShouldNotOpen() throws IOException, - InterruptedException { + public void readOnlyDateFieldPopupShouldNotOpen() + throws IOException, InterruptedException { openTestURL(); compareScreen("initial"); @@ -29,15 +29,15 @@ public class DateFieldReadOnlyTest extends MultiBrowserTest { } private void closePopup() { - findElement(By.className("v-datefield-calendarpanel")).sendKeys( - Keys.RETURN); + findElement(By.className("v-datefield-calendarpanel")) + .sendKeys(Keys.RETURN); } private void openPopup() { // waiting for openPopup() in TB4 beta1: // http://dev.vaadin.com/ticket/13766 - $(DateFieldElement.class).first().findElement(By.tagName("button")) - .click(); + $(LegacyDateFieldElement.class).first() + .findElement(By.tagName("button")).click(); } private void toggleReadOnly() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java index 23f6d6f5a6..661ca1c94c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DateFieldWhenChangingValueAndEnablingParentTest.java @@ -21,36 +21,33 @@ import org.openqa.selenium.By; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.DateFieldElement; -import com.vaadin.testbench.elements.PopupDateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.tests.legacyelements.LegacyPopupDateFieldElement; import com.vaadin.tests.tb3.SingleBrowserTest; -public class DateFieldWhenChangingValueAndEnablingParentTest extends - SingleBrowserTest { +public class DateFieldWhenChangingValueAndEnablingParentTest + extends SingleBrowserTest { @Test public void ensureCorrectStateAfterEnabling() { openTestURL(); $(CheckBoxElement.class).first().click(); - assertState($(DateFieldElement.class).id("DATEFIELD_ENABLED"), true, - true); - assertState($(DateFieldElement.class).id("DATEFIELD_DISABLED"), false, - false); - - assertState( - $(PopupDateFieldElement.class).id("DATEFIELD_ENABLED_ENABLED"), + assertState($(LegacyDateFieldElement.class).id("DATEFIELD_ENABLED"), true, true); - assertState( - $(PopupDateFieldElement.class).id("DATEFIELD_ENABLED_DISABLED"), - true, false); + assertState($(LegacyDateFieldElement.class).id("DATEFIELD_DISABLED"), + false, false); + + assertState($(LegacyPopupDateFieldElement.class) + .id("DATEFIELD_ENABLED_ENABLED"), true, true); + assertState($(LegacyPopupDateFieldElement.class) + .id("DATEFIELD_ENABLED_DISABLED"), true, false); // disabling widget should always disable input - assertState( - $(PopupDateFieldElement.class).id("DATEFIELD_DISABLED_ENABLED"), - false, false); - assertState( - $(PopupDateFieldElement.class) - .id("DATEFIELD_DISABLED_DISABLED"), false, false); + assertState($(LegacyPopupDateFieldElement.class) + .id("DATEFIELD_DISABLED_ENABLED"), false, false); + assertState($(LegacyPopupDateFieldElement.class) + .id("DATEFIELD_DISABLED_DISABLED"), false, false); } @@ -72,26 +69,32 @@ public class DateFieldWhenChangingValueAndEnablingParentTest extends boolean hasClass = hasCssClass(id, "v-disabled"); boolean fieldEnabled = !hasClass; if (assertEnabled) { - Assert.assertTrue("Field " + id.getAttribute("id") - + " should be enabled", fieldEnabled); + Assert.assertTrue( + "Field " + id.getAttribute("id") + " should be enabled", + fieldEnabled); } else { - Assert.assertFalse("Field " + id.getAttribute("id") - + " should be disabled", fieldEnabled); + Assert.assertFalse( + "Field " + id.getAttribute("id") + " should be disabled", + fieldEnabled); } } private void assertTextInputEnabled(DateFieldElement id, boolean enabled) { - String disabledAttr = id.findElement(By.xpath("./input")).getAttribute( - "disabled"); + String disabledAttr = id.findElement(By.xpath("./input")) + .getAttribute("disabled"); boolean textinputEnabled = (disabledAttr == null); if (enabled) { - Assert.assertTrue("Field " + id.getAttribute("id") - + " text field should be enabled", textinputEnabled); + Assert.assertTrue( + "Field " + id.getAttribute("id") + + " text field should be enabled", + textinputEnabled); } else { - Assert.assertFalse("Field " + id.getAttribute("id") - + " text field should be disabled", textinputEnabled); + Assert.assertFalse( + "Field " + id.getAttribute("id") + + " text field should be disabled", + textinputEnabled); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java index 61cc876a3f..7c16995882 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/DefaultDateFieldPopupPositionTest.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.datefield; import org.junit.Assert; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; /** * Test for date field popup calendar position in default theme. @@ -27,17 +27,19 @@ import com.vaadin.testbench.elements.DateFieldElement; * * @author Vaadin Ltd */ -public class DefaultDateFieldPopupPositionTest extends - DateFieldPopupPositionTest { +public class DefaultDateFieldPopupPositionTest + extends DateFieldPopupPositionTest { @Override protected void checkPopupPosition() { - DateFieldElement field = $(DateFieldElement.class).first(); + LegacyDateFieldElement field = $(LegacyDateFieldElement.class).first(); int right = field.getLocation().getX() + field.getSize().getWidth(); WebElement popup = getPopup(); - Assert.assertTrue("Calendar popup has wrong X coordinate=" - + popup.getLocation().getX() + " , right side of the field is " - + right, popup.getLocation().getX() >= right); + Assert.assertTrue( + "Calendar popup has wrong X coordinate=" + + popup.getLocation().getX() + + " , right side of the field is " + right, + popup.getLocation().getX() >= right); } } diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java index 5334327a83..f08fc02ccc 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldConnectorTest.java @@ -5,8 +5,8 @@ import static org.hamcrest.core.Is.is; import org.junit.Test; -import com.vaadin.testbench.elements.DateFieldElement; -import com.vaadin.testbench.elements.PopupDateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.tests.legacyelements.LegacyPopupDateFieldElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class PopupDateFieldConnectorTest extends SingleBrowserTest { @@ -15,7 +15,7 @@ public class PopupDateFieldConnectorTest extends SingleBrowserTest { public void popupDateFieldElementIsLocated() { openTestURL(); - assertThat($(PopupDateFieldElement.class).all().size(), is(1)); - assertThat($(DateFieldElement.class).all().size(), is(2)); + assertThat($(LegacyPopupDateFieldElement.class).all().size(), is(1)); + assertThat($(LegacyDateFieldElement.class).all().size(), is(2)); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java index 410b0edac6..08d4317145 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java @@ -30,8 +30,8 @@ import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.testbench.parallel.BrowserUtil; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -50,10 +50,11 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { @Test public void testFirstDateField() { - List<DateFieldElement> dateFields = $(DateFieldElement.class).all(); + List<LegacyDateFieldElement> dateFields = $( + LegacyDateFieldElement.class).all(); assertEquals("unexpected amount of datefields", 3, dateFields.size()); - DateFieldElement dateField = dateFields.get(0); + LegacyDateFieldElement dateField = dateFields.get(0); // open the popup dateField.findElement(By.tagName("button")).click(); @@ -63,14 +64,12 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { // verify contents WebElement popup = findElement(By.className("v-datefield-popup")); - assertEquals( - "unexpected month", - "tammikuu 2011", + assertEquals("unexpected month", "tammikuu 2011", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - List<WebElement> headerElements = popup.findElement( - By.className("v-datefield-calendarpanel-weekdays")) + List<WebElement> headerElements = popup + .findElement(By.className("v-datefield-calendarpanel-weekdays")) .findElements(By.tagName("td")); List<WebElement> weekdays = new ArrayList<WebElement>(); for (WebElement headerElement : headerElements) { @@ -79,28 +78,22 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { } } assertEquals("unexpected weekday count", 7, weekdays.size()); - assertEquals("unexpected first day of week", "MA", weekdays.get(0) - .getText()); - assertEquals( - "unexpected weeknumber count", - 0, + assertEquals("unexpected first day of week", "MA", + weekdays.get(0).getText()); + assertEquals("unexpected weeknumber count", 0, popup.findElements( By.className("v-datefield-calendarpanel-weeknumber")) .size()); - assertEquals( - "unexpected selection", - "1", + assertEquals("unexpected selection", "1", popup.findElement( By.className("v-datefield-calendarpanel-day-selected")) .getText()); - assertEquals( - "unexpected focus", - "1", + assertEquals("unexpected focus", "1", popup.findElement( By.className("v-datefield-calendarpanel-day-focused")) .getText()); - List<WebElement> days = popup.findElements(By - .className("v-datefield-calendarpanel-day")); + List<WebElement> days = popup + .findElements(By.className("v-datefield-calendarpanel-day")); assertEquals("unexpected day count", 42, days.size()); assertEquals("unexpected day content", "27", days.get(0).getText()); assertEquals("unexpected day content", "4", days.get(8).getText()); @@ -112,21 +105,15 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { .findElement(By.tagName("button")).click(); // verify contents - assertEquals( - "unexpected month", - "joulukuu 2010", + assertEquals("unexpected month", "joulukuu 2010", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - assertEquals( - "unexpected selection", - "1", + assertEquals("unexpected selection", "1", popup.findElement( By.className("v-datefield-calendarpanel-day-selected")) .getText()); - assertEquals( - "unexpected focus", - 0, + assertEquals("unexpected focus", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-focused")) .size()); @@ -143,21 +130,15 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { .findElement(By.tagName("button")).click(); // verify contents - assertEquals( - "unexpected month", - "joulukuu 2009", + assertEquals("unexpected month", "joulukuu 2009", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - assertEquals( - "unexpected selection", - 0, + assertEquals("unexpected selection", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-selected")) .size()); - assertEquals( - "unexpected focus", - 0, + assertEquals("unexpected focus", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-focused")) .size()); @@ -178,7 +159,8 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { @Test public void testSecondDateField() throws InterruptedException { - DateFieldElement dateField = $(DateFieldElement.class).all().get(1); + LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class).all() + .get(1); ButtonElement button = $(ButtonElement.class).first(); // change the date @@ -193,14 +175,12 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { // verify contents WebElement popup = findElement(By.className("v-datefield-popup")); - assertEquals( - "unexpected month", - "February 2010", + assertEquals("unexpected month", "February 2010", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - List<WebElement> headerElements = popup.findElement( - By.className("v-datefield-calendarpanel-weekdays")) + List<WebElement> headerElements = popup + .findElement(By.className("v-datefield-calendarpanel-weekdays")) .findElements(By.tagName("td")); List<WebElement> weekdays = new ArrayList<WebElement>(); for (WebElement headerElement : headerElements) { @@ -209,28 +189,22 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { } } assertEquals("unexpected weekday count", 7, weekdays.size()); - assertEquals("unexpected first day of week", "SUN", weekdays.get(0) - .getText()); - assertEquals( - "unexpected weeknumber count", - 0, + assertEquals("unexpected first day of week", "SUN", + weekdays.get(0).getText()); + assertEquals("unexpected weeknumber count", 0, popup.findElements( By.className("v-datefield-calendarpanel-weeknumber")) .size()); - assertEquals( - "unexpected selection", - "16", + assertEquals("unexpected selection", "16", popup.findElement( By.className("v-datefield-calendarpanel-day-selected")) .getText()); - assertEquals( - "unexpected focus", - "16", + assertEquals("unexpected focus", "16", popup.findElement( By.className("v-datefield-calendarpanel-day-focused")) .getText()); - List<WebElement> days = popup.findElements(By - .className("v-datefield-calendarpanel-day")); + List<WebElement> days = popup + .findElements(By.className("v-datefield-calendarpanel-day")); assertEquals("unexpected day count", 42, days.size()); assertEquals("unexpected day content", "31", days.get(0).getText()); assertEquals("unexpected day content", "8", days.get(8).getText()); @@ -238,14 +212,12 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { assertEquals("unexpected day content", "13", days.get(41).getText()); // navigate down - WebElement popupBody = popup.findElement(By - .className("v-datefield-calendarpanel")); + WebElement popupBody = popup + .findElement(By.className("v-datefield-calendarpanel")); popupBody.sendKeys(Keys.ARROW_DOWN); // ensure the focus changed - assertEquals( - "unexpected focus", - "23", + assertEquals("unexpected focus", "23", popup.findElement( By.className("v-datefield-calendarpanel-day-focused")) .getText()); @@ -254,21 +226,15 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { popupBody.sendKeys(Keys.ARROW_DOWN); // verify contents - assertEquals( - "unexpected month", - "March 2010", + assertEquals("unexpected month", "March 2010", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - assertEquals( - "unexpected selection", - 0, + assertEquals("unexpected selection", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-selected")) .size()); - assertEquals( - "unexpected focus", - "2", + assertEquals("unexpected focus", "2", popup.findElement( By.className("v-datefield-calendarpanel-day-focused")) .getText()); @@ -286,9 +252,7 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { popupBody.sendKeys(Keys.ARROW_LEFT); // ensure the focus changed - assertEquals( - "unexpected focus", - "1", + assertEquals("unexpected focus", "1", popup.findElement( By.className("v-datefield-calendarpanel-day-focused")) .getText()); @@ -297,21 +261,15 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { popupBody.sendKeys(Keys.ARROW_LEFT); // verify contents - assertEquals( - "unexpected month", - "February 2010", + assertEquals("unexpected month", "February 2010", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - assertEquals( - "unexpected selection", - "16", + assertEquals("unexpected selection", "16", popup.findElement( By.className("v-datefield-calendarpanel-day-selected")) .getText()); - assertEquals( - "unexpected focus", - "28", + assertEquals("unexpected focus", "28", popup.findElement( By.className("v-datefield-calendarpanel-day-focused")) .getText()); @@ -332,7 +290,8 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { @Test public void testThirdDateField() throws InterruptedException { - DateFieldElement dateField = $(DateFieldElement.class).all().get(2); + LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class).all() + .get(2); ButtonElement button = $(ButtonElement.class).first(); // change the date @@ -347,14 +306,12 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { // verify contents WebElement popup = findElement(By.className("v-datefield-popup")); - assertEquals( - "unexpected month", - "helmikuu 2010", + assertEquals("unexpected month", "helmikuu 2010", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - List<WebElement> headerElements = popup.findElement( - By.className("v-datefield-calendarpanel-weekdays")) + List<WebElement> headerElements = popup + .findElement(By.className("v-datefield-calendarpanel-weekdays")) .findElements(By.tagName("td")); List<WebElement> weekdays = new ArrayList<WebElement>(); for (WebElement headerElement : headerElements) { @@ -363,29 +320,25 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { } } assertEquals("unexpected weekday count", 7, weekdays.size()); - assertEquals("unexpected first day of week", "MA", weekdays.get(0) - .getText()); - List<WebElement> weeknumbers = popup.findElements(By - .className("v-datefield-calendarpanel-weeknumber")); + assertEquals("unexpected first day of week", "MA", + weekdays.get(0).getText()); + List<WebElement> weeknumbers = popup.findElements( + By.className("v-datefield-calendarpanel-weeknumber")); assertEquals("unexpected weeknumber count", 6, weeknumbers.size()); - assertEquals("unexpected weeknumber content", "5", weeknumbers.get(0) - .getText()); - assertEquals("unexpected weeknumber content", "10", weeknumbers.get(5) - .getText()); - assertEquals( - "unexpected selection", - "16", + assertEquals("unexpected weeknumber content", "5", + weeknumbers.get(0).getText()); + assertEquals("unexpected weeknumber content", "10", + weeknumbers.get(5).getText()); + assertEquals("unexpected selection", "16", popup.findElement( By.className("v-datefield-calendarpanel-day-selected")) .getText()); - assertEquals( - "unexpected focus", - "16", + assertEquals("unexpected focus", "16", popup.findElement( By.className("v-datefield-calendarpanel-day-focused")) .getText()); - List<WebElement> days = popup.findElements(By - .className("v-datefield-calendarpanel-day")); + List<WebElement> days = popup + .findElements(By.className("v-datefield-calendarpanel-day")); assertEquals("unexpected day count", 42, days.size()); assertEquals("unexpected day content", "1", days.get(0).getText()); assertEquals("unexpected day content", "9", days.get(8).getText()); @@ -393,8 +346,8 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { assertEquals("unexpected day content", "14", days.get(41).getText()); // navigate to previous month - WebElement popupBody = popup.findElement(By - .className("v-datefield-calendarpanel")); + WebElement popupBody = popup + .findElement(By.className("v-datefield-calendarpanel")); new Actions(driver).keyDown(Keys.SHIFT).perform(); popupBody.sendKeys(Keys.ARROW_LEFT); new Actions(driver).keyUp(Keys.SHIFT).perform(); @@ -408,22 +361,18 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { } // verify contents - assertEquals( - "unexpected month", - "tammikuu 2010", + assertEquals("unexpected month", "tammikuu 2010", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - weeknumbers = popup.findElements(By - .className("v-datefield-calendarpanel-weeknumber")); + weeknumbers = popup.findElements( + By.className("v-datefield-calendarpanel-weeknumber")); assertEquals("unexpected weeknumber count", 6, weeknumbers.size()); - assertEquals("unexpected weeknumber content", "53", weeknumbers.get(0) - .getText()); - assertEquals("unexpected weeknumber content", "5", weeknumbers.get(5) - .getText()); - assertEquals( - "unexpected selection", - 0, + assertEquals("unexpected weeknumber content", "53", + weeknumbers.get(0).getText()); + assertEquals("unexpected weeknumber content", "5", + weeknumbers.get(5).getText()); + assertEquals("unexpected selection", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-selected")) .size()); @@ -431,11 +380,9 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { // button instead of navigating with arrow keys steals the focus if (!BrowserUtil.isIE(getDesiredCapabilities()) || BrowserUtil.isIE8(getDesiredCapabilities())) { - assertEquals( - "unexpected focus", - "16", - popup.findElement( - By.className("v-datefield-calendarpanel-day-focused")) + assertEquals("unexpected focus", "16", + popup.findElement(By + .className("v-datefield-calendarpanel-day-focused")) .getText()); } days = popup @@ -456,33 +403,27 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { .findElement(By.tagName("button")).click(); // verify contents - assertEquals( - "unexpected month", - "tammikuu 2009", + assertEquals("unexpected month", "tammikuu 2009", popup.findElements( By.className("v-datefield-calendarpanel-month")).get(1) .getText()); - weeknumbers = popup.findElements(By - .className("v-datefield-calendarpanel-weeknumber")); + weeknumbers = popup.findElements( + By.className("v-datefield-calendarpanel-weeknumber")); assertEquals("unexpected weeknumber count", 6, weeknumbers.size()); - assertEquals("unexpected weeknumber content", "1", weeknumbers.get(0) - .getText()); - assertEquals("unexpected weeknumber content", "6", weeknumbers.get(5) - .getText()); - assertEquals( - "unexpected selection", - 0, + assertEquals("unexpected weeknumber content", "1", + weeknumbers.get(0).getText()); + assertEquals("unexpected weeknumber content", "6", + weeknumbers.get(5).getText()); + assertEquals("unexpected selection", 0, popup.findElements( By.className("v-datefield-calendarpanel-day-selected")) .size()); // TODO: remove this check once #14406 has been fixed -- clicking the // button instead of navigating with arrow keys steals the focus if (false) { - assertEquals( - "unexpected focus", - "16", - popup.findElement( - By.className("v-datefield-calendarpanel-day-focused")) + assertEquals("unexpected focus", "16", + popup.findElement(By + .className("v-datefield-calendarpanel-day-focused")) .getText()); } days = popup diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java index 4e5fa744c7..246176e39c 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldInputPromptTest.java @@ -25,8 +25,8 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedCondition; -import com.vaadin.testbench.elements.PopupDateFieldElement; import com.vaadin.testbench.elements.TextFieldElement; +import com.vaadin.tests.legacyelements.LegacyPopupDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -41,8 +41,8 @@ public class PopupDateFieldInputPromptTest extends MultiBrowserTest { public void testInputPrompt() { openTestURL(); TextFieldElement textField = $(TextFieldElement.class).first(); - final PopupDateFieldElement dateField = $(PopupDateFieldElement.class) - .first(); + final LegacyPopupDateFieldElement dateField = $( + LegacyPopupDateFieldElement.class).first(); // ensure initial state Assert.assertFalse("DateField required when it shouldn't be.", @@ -63,7 +63,7 @@ public class PopupDateFieldInputPromptTest extends MultiBrowserTest { } private void waitForElementRequiredAndFocused( - final PopupDateFieldElement dateField, final By locator) { + final LegacyPopupDateFieldElement dateField, final By locator) { waitUntil(new ExpectedCondition<Boolean>() { @Override @@ -84,7 +84,7 @@ public class PopupDateFieldInputPromptTest extends MultiBrowserTest { }); } - private boolean isRequired(PopupDateFieldElement dateField) { + private boolean isRequired(LegacyPopupDateFieldElement dateField) { return dateField.getAttribute("class").contains("v-required"); } } 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 95b8437b17..5c5e4e8710 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 @@ -23,9 +23,9 @@ import org.openqa.selenium.interactions.Actions; 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.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest { @@ -53,7 +53,8 @@ public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest { } public WebElement getPopUpButton() { - DateFieldElement datefield = $(DateFieldElement.class).first(); + LegacyDateFieldElement datefield = $(LegacyDateFieldElement.class) + .first(); return datefield.findElement((By.className("v-datefield-button"))); } @@ -64,18 +65,18 @@ public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest { } public WebElement getHoursSelect() { - return findElement(By - .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select")); + return findElement(By.xpath( + "//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select")); } public WebElement getMinutesSelect() { - return findElement(By - .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[2]")); + return findElement(By.xpath( + "//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[2]")); } public WebElement getSecondsSelect() { - return findElement(By - .xpath("//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[3]")); + return findElement(By.xpath( + "//table[@id='PID_VAADIN_POPUPCAL']/tbody/tr[3]/td/div/select[3]")); } public NativeSelectElement getResolutionSelect() { diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java index 4009b9d991..2f55bfe18a 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/ValoDateFieldPopupPositionTest.java @@ -18,7 +18,7 @@ package com.vaadin.tests.components.datefield; import org.junit.Assert; import org.openqa.selenium.WebElement; -import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; /** * Test for date field popup calendar position in Valo theme. @@ -31,13 +31,15 @@ public class ValoDateFieldPopupPositionTest extends DateFieldPopupPositionTest { @Override protected void checkPopupPosition() { - DateFieldElement field = $(DateFieldElement.class).first(); + LegacyDateFieldElement field = $(LegacyDateFieldElement.class).first(); WebElement popup = getPopup(); int left = field.getLocation().getX(); int popupRight = popup.getLocation().getX() + popup.getSize().getWidth(); - Assert.assertTrue("Calendar popup has wrong X coordinate=" + popupRight - + " , left side of the field is " + left, popupRight <= left); + Assert.assertTrue( + "Calendar popup has wrong X coordinate=" + popupRight + + " , left side of the field is " + left, + popupRight <= left); } } 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 140e8a90d8..170197e3aa 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,13 +22,13 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.DateFieldElement; 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.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserThemeTest; @TestCategory("grid") @@ -68,7 +68,8 @@ public class GridThemeUITest extends MultiBrowserThemeTest { GridEditorElement editor = grid.getEditor(); - DateFieldElement dateField = editor.$(DateFieldElement.class).first(); + LegacyDateFieldElement dateField = editor + .$(LegacyDateFieldElement.class).first(); WebElement input = dateField.findElement(By.xpath("input")); input.sendKeys("Invalid", Keys.TAB); editor.save(); 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 86847fc28e..e8f9687e61 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 @@ -13,23 +13,23 @@ import com.vaadin.testbench.elements.ComboBoxElement; import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elementsbase.ServerClass; import com.vaadin.testbench.parallel.BrowserUtil; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; 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 DateFieldElement extends - com.vaadin.testbench.elements.DateFieldElement { + @ServerClass("com.vaadin.legacy.ui.LegacyDateField") + public static class DateFieldElement extends LegacyDateFieldElement { public void openPopup() { findElement(By.tagName("button")).click(); } } @ServerClass("com.vaadin.ui.TabSheet") - public static class TabSheetElement extends - com.vaadin.testbench.elements.TabSheetElement { + public static class TabSheetElement + extends com.vaadin.testbench.elements.TabSheetElement { @Override public void openTab(String tabCaption) { super.openTab(tabCaption); @@ -137,7 +137,8 @@ public abstract class ThemeTest extends MultiBrowserTest { testNotification(3, "notification-tray"); } - private void testNotification(int id, String identifier) throws IOException { + private void testNotification(int id, String identifier) + throws IOException { $(ButtonElement.class).id("notifButt" + id).click(); compareScreen(identifier); $(FixedNotificationElement.class).first().close(); @@ -184,8 +185,8 @@ public abstract class ThemeTest extends MultiBrowserTest { if (searchComboBox.findElement(By.tagName("div")).isDisplayed()) { searchComboBox.openPopup(); } else { - WebElement textBox = searchComboBox.findElement(By - .vaadin("#textbox")); + WebElement textBox = searchComboBox + .findElement(By.vaadin("#textbox")); textBox.click(); textBox.sendKeys(Keys.ARROW_DOWN); } 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 df250357d8..ace39b0595 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/BasicCrudGridEditorRowTest.java @@ -26,11 +26,11 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.elements.CheckBoxElement; -import com.vaadin.testbench.elements.DateFieldElement; 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.legacyelements.LegacyDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; @TestCategory("grid") @@ -61,7 +61,8 @@ public class BasicCrudGridEditorRowTest extends MultiBrowserTest { new Actions(getDriver()).doubleClick(ritaBirthdate).perform(); GridEditorElement editor = grid.getEditor(); - DateFieldElement dateField = editor.$(DateFieldElement.class).first(); + LegacyDateFieldElement dateField = editor + .$(LegacyDateFieldElement.class).first(); WebElement input = dateField.findElement(By.xpath("input")); // input.click(); input.sendKeys("Invalid", Keys.TAB); @@ -107,7 +108,8 @@ public class BasicCrudGridEditorRowTest extends MultiBrowserTest { new Actions(getDriver()).doubleClick(cell).perform(); String attribute = grid.getEditor().getAttribute("style").toLowerCase(); - assertFalse("Style should not contain top.", attribute.contains("top:")); + assertFalse("Style should not contain top.", + attribute.contains("top:")); } } 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 32d8bcb603..509997b3d0 100644 --- a/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fieldgroup/DateFormTest.java @@ -5,10 +5,10 @@ import org.junit.Test; import org.openqa.selenium.WebElement; import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.DateFieldElement; -import com.vaadin.testbench.elements.InlineDateFieldElement; -import com.vaadin.testbench.elements.PopupDateFieldElement; import com.vaadin.testbench.elements.TextFieldElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.tests.legacyelements.LegacyInlineDateFieldElement; +import com.vaadin.tests.legacyelements.LegacyPopupDateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFormTest extends MultiBrowserTest { @@ -20,28 +20,28 @@ public class DateFormTest extends MultiBrowserTest { getDateFieldValue()); Assert.assertEquals("Unexpected PopupDateField value,", "1/20/84", getPopupDateFieldValue()); - WebElement day20 = getInlineDateFieldCalendarPanel().findElement( - By.vaadin("#day20")); + WebElement day20 = getInlineDateFieldCalendarPanel() + .findElement(By.vaadin("#day20")); Assert.assertTrue( "Unexpected InlineDateField state, 20th not selected.", hasCssClass(day20, "v-inline-datefield-calendarpanel-day-selected")); Assert.assertEquals("Unexpected TextField contents,", - "Jan 20, 1984 4:34:49 PM", $(TextFieldElement.class).first() - .getValue()); + "Jan 20, 1984 4:34:49 PM", + $(TextFieldElement.class).first().getValue()); } protected String getDateFieldValue() { - return $(DateFieldElement.class).first().getValue(); + return $(LegacyDateFieldElement.class).first().getValue(); } protected String getPopupDateFieldValue() { - return $(PopupDateFieldElement.class).first().getValue(); + return $(LegacyPopupDateFieldElement.class).first().getValue(); } protected WebElement getInlineDateFieldCalendarPanel() { - return $(InlineDateFieldElement.class).first().findElement( - By.className("v-inline-datefield-calendarpanel")); + return $(LegacyInlineDateFieldElement.class).first() + .findElement(By.className("v-inline-datefield-calendarpanel")); } } 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 4cfcd8fa59..b1e764a559 100644 --- a/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/fonticon/FontIconsTest.java @@ -30,7 +30,7 @@ public class FontIconsTest extends MultiBrowserTest { @Test public void checkScreenshot() throws IOException { openTestURL(); - compareScreen("all"); + compareScreen("all-legacy"); } @Test @@ -53,4 +53,5 @@ public class FontIconsTest extends MultiBrowserTest { comboBox.sendKeys(Keys.ARROW_DOWN); assertEquals("Two", comboBox.getText()); } + } diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyDateFieldElement.java b/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyDateFieldElement.java new file mode 100644 index 0000000000..c2321d24d4 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyDateFieldElement.java @@ -0,0 +1,28 @@ +/* + * 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.legacyelements; + +import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.testbench.elementsbase.ServerClass; + +/** + * @author Vaadin Ltd + * + */ +@ServerClass("com.vaadin.legacy.ui.LegacyDateField") +public class LegacyDateFieldElement extends DateFieldElement { + +} diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyInlineDateFieldElement.java b/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyInlineDateFieldElement.java new file mode 100644 index 0000000000..fc06376b94 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyInlineDateFieldElement.java @@ -0,0 +1,28 @@ +/* + * 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.legacyelements; + +import com.vaadin.testbench.elements.InlineDateFieldElement; +import com.vaadin.testbench.elementsbase.ServerClass; + +/** + * @author Vaadin Ltd + * + */ +@ServerClass("com.vaadin.legacy.ui.LegacyInlineDateField") +public class LegacyInlineDateFieldElement extends InlineDateFieldElement { + +} diff --git a/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPopupDateFieldElement.java b/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPopupDateFieldElement.java new file mode 100644 index 0000000000..28d4ff35a0 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/legacyelements/LegacyPopupDateFieldElement.java @@ -0,0 +1,28 @@ +/* + * 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.legacyelements; + +import com.vaadin.testbench.elements.PopupDateFieldElement; +import com.vaadin.testbench.elementsbase.ServerClass; + +/** + * @author Vaadin Ltd + * + */ +@ServerClass("com.vaadin.legacy.ui.LegacyPopupDateField") +public class LegacyPopupDateFieldElement extends PopupDateFieldElement { + +} |