diff options
| author | Denis Anisimov <denis@vaadin.com> | 2016-08-11 15:28:08 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-08-15 08:25:12 +0000 |
| commit | 87118c4b943e3ec22394e61aa56f5caaea677398 (patch) | |
| tree | 9659b8824e20d8bb81ea194c3c23e006a8a4d570 /uitest | |
| parent | 4348979a9d429668a34282322f7c0b6a479835c9 (diff) | |
| download | vaadin-framework-87118c4b943e3ec22394e61aa56f5caaea677398.tar.gz vaadin-framework-87118c4b943e3ec22394e61aa56f5caaea677398.zip | |
Derive DateField from new AbstractField (#57).
Change-Id: I5efe17253ecd28dad5a2250076246a9eb30eec62
Diffstat (limited to 'uitest')
107 files changed, 1335 insertions, 688 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java b/uitest/src/main/java/com/vaadin/tests/FocusingComponents.java index 76f500d13b..f63989fafb 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 LegacyDateField()); + addFocusableTest(new DateField()); 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 30b61d99f8..c58c73753f 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 LegacyDateField("DateField" + i)); + testContainer.addComponent(new DateField("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 5b1e368574..fd8b0a1382 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; @@ -99,7 +99,8 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication { // Create TabSheet final TabSheet tabsheet = new TabSheet(); - tabsheet.setCaption("Tabsheet, above layouts are added to this component"); + tabsheet.setCaption( + "Tabsheet, above layouts are added to this component"); layoutA = new HorizontalLayout(); // Add 4 random components fillLayout(layoutA, componentCountA); @@ -161,7 +162,8 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication { break; case 4: // Link - result = new Link("", new ExternalResource("http://www.vaadin.com")); + result = new Link("", + new ExternalResource("http://www.vaadin.com")); result.setCaption("Link component " + caption); break; case 5: @@ -170,25 +172,24 @@ public class RandomLayoutStress extends com.vaadin.server.LegacyApplication { panelLayout.setMargin(true); result = new Panel(panelLayout); result.setCaption("Panel component " + caption); - panelLayout - .addComponent(new Label( - "Panel is a container for other components, by default it draws a frame around it's " - + "extremities and may have a caption to clarify the nature of the contained components' purpose." - + " Panel contains an layout where the actual contained components are added, " - + "this layout may be switched on the fly.")); + panelLayout.addComponent(new Label( + "Panel is a container for other components, by default it draws a frame around it's " + + "extremities and may have a caption to clarify the nature of the contained components' purpose." + + " Panel contains an layout where the actual contained components are added, " + + "this layout may be switched on the fly.")); ((Panel) result).setWidth("250px"); break; case 6: // Datefield - result = new LegacyDateField(); - ((LegacyDateField) result).setStyleName("calendar"); - ((LegacyDateField) result).setValue(new java.util.Date()); + result = new DateField(); + ((DateField) result).setStyleName("calendar"); + ((DateField) result).setValue(new java.util.Date()); result.setCaption("Calendar component " + caption); break; case 7: // Datefield - result = new LegacyDateField(); - ((LegacyDateField) result).setValue(new java.util.Date()); + result = new DateField(); + ((DateField) 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 5d314d6bb3..108dad677f 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java @@ -16,7 +16,6 @@ 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; @@ -27,6 +26,7 @@ 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; @@ -53,8 +53,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { VerticalLayout main = new VerticalLayout(); final String eventListenerString = "Component.Listener feedback: "; - Label eventListenerFeedback = new Label(eventListenerString - + " <no events occured>"); + Label eventListenerFeedback = new Label( + eventListenerString + " <no events occured>"); int count = 0; public TestCaptionWrapper() { @@ -70,8 +70,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { public void createNewView() { main.removeAllComponents(); - main.addComponent(new Label( - "Each Layout and their contained components should " + main.addComponent( + new Label("Each Layout and their contained components should " + "have icon, caption, description, user error defined. " + "Eeach layout should contain similar components.")); @@ -119,7 +119,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { test(layout, button); button.addListener(this); - final LegacyDateField df = new LegacyDateField("DateField " + count++); + final DateField df = new DateField("DateField " + count++); test(layout, df); final CheckBox cb = new CheckBox("Checkbox " + count++); @@ -136,16 +136,16 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { final Label label = new Label("Label " + count++); test(layout, label); - final Link link = new Link("Link " + count++, new ExternalResource( - "www.vaadin.com")); + final Link link = new Link("Link " + count++, + new ExternalResource("www.vaadin.com")); test(layout, link); - final NativeSelect nativeSelect = new NativeSelect("NativeSelect " - + count++); + final NativeSelect nativeSelect = new NativeSelect( + "NativeSelect " + count++); test(layout, nativeSelect); - final OptionGroup optionGroup = new OptionGroup("OptionGroup " - + count++); + final OptionGroup optionGroup = new OptionGroup( + "OptionGroup " + count++); test(layout, optionGroup); final ProgressIndicator pi = new ProgressIndicator(); @@ -169,8 +169,8 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { final Tree tree = new Tree("Tree " + count++); test(layout, tree); - final TwinColSelect twinColSelect = new TwinColSelect("TwinColSelect " - + count++); + final TwinColSelect twinColSelect = new TwinColSelect( + "TwinColSelect " + count++); test(layout, twinColSelect); final Upload upload = new Upload("Upload (non-functional)", null); diff --git a/uitest/src/main/java/com/vaadin/tests/TestDateField.java b/uitest/src/main/java/com/vaadin/tests/TestDateField.java index 572075ead3..b5611b8246 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(); - LegacyDateField df; + DateField df; public TestDateField() { setCompositionRoot(main); @@ -45,7 +45,7 @@ public class TestDateField extends CustomComponent { main.removeAllComponents(); main.addComponent(new Label("DateField")); - df = new LegacyDateField(); + df = new DateField(); 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 LegacyDateField df1 = new LegacyDateField("US locale"); + final DateField df1 = new DateField("US locale"); main.addComponent(df1); df1.setLocale(new Locale("en", "US")); - final LegacyDateField df2 = new LegacyDateField("DE locale"); + final DateField df2 = new DateField("DE locale"); main.addComponent(df2); df2.setLocale(new Locale("de", "DE")); - final LegacyDateField df3 = new LegacyDateField("RU locale"); + final DateField df3 = new DateField("RU locale"); main.addComponent(df3); df3.setLocale(new Locale("ru", "RU")); - final LegacyDateField df4 = new LegacyDateField("FI locale"); + final DateField df4 = new DateField("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 9b68f48c93..7927b7f0ee 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 LegacyDateField d1 = new LegacyDateField("Center aligned"); - final LegacyDateField d2 = new LegacyDateField("Center aligned"); + final DateField d1 = new DateField("Center aligned"); + final DateField d2 = new DateField("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 e6bc87d2c5..42bff50a06 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -18,12 +18,13 @@ package com.vaadin.tests; import java.util.Locale; -import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.Sizeable; +import com.vaadin.shared.ui.datefield.Resolution; 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 +81,8 @@ public class TestForBasicApplicationLayout extends CustomComponent { controls.addComponent(click); controls.addComponent(click2); reportLayout.addComponent(controls); - final LegacyDateField cal = new LegacyDateField(); - cal.setResolution(LegacyDateField.RESOLUTION_DAY); + final DateField cal = new DateField(); + cal.setResolution(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 f1d1cfd4ca..84ea616e3f 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 LegacyDateField(getCaption("datefield")); + return new DateField(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 3c74589c87..fc4ac2a7e0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractComponentContainerTest.java @@ -4,8 +4,6 @@ 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; @@ -14,7 +12,9 @@ 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; @@ -23,8 +23,8 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalSplitPanel; public abstract class AbstractComponentContainerTest<T extends AbstractComponentContainer> - extends AbstractComponentTest<T> implements ComponentAttachListener, - ComponentDetachListener { + extends AbstractComponentTest<T> + implements ComponentAttachListener, ComponentDetachListener { private String CATEGORY_COMPONENT_CONTAINER_FEATURES = "Component container features"; private Command<T, ComponentSize> addButtonCommand = new Command<T, ComponentSize>() { @@ -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) { - LegacyInlineDateField tf = new LegacyInlineDateField(); + InlineDateField tf = new InlineDateField(); 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) { - LegacyPopupDateField tf = new LegacyPopupDateField(); + PopupDateField tf = new PopupDateField(); c.addComponent(tf); size.apply(tf); } @@ -147,9 +147,11 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent @Override public void execute(T c, Boolean value, Object data) { if (value) { - c.addListener((ComponentAttachListener) AbstractComponentContainerTest.this); + c.addListener( + (ComponentAttachListener) AbstractComponentContainerTest.this); } else { - c.removeListener((ComponentAttachListener) AbstractComponentContainerTest.this); + c.removeListener( + (ComponentAttachListener) AbstractComponentContainerTest.this); } } }; @@ -159,9 +161,11 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent @Override public void execute(T c, Boolean value, Object data) { if (value) { - c.addListener((ComponentDetachListener) AbstractComponentContainerTest.this); + c.addListener( + (ComponentDetachListener) AbstractComponentContainerTest.this); } else { - c.removeListener((ComponentDetachListener) AbstractComponentContainerTest.this); + c.removeListener( + (ComponentDetachListener) AbstractComponentContainerTest.this); } } }; @@ -312,8 +316,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent // addCommands.put("VerticalLayout", addVerticalLayoutCommand); ComponentSize[] sizes = new ComponentSize[] { - new ComponentSize(null, null), - new ComponentSize("200px", null), + new ComponentSize(null, null), new ComponentSize("200px", null), new ComponentSize("100%", null), new ComponentSize(null, "200px"), new ComponentSize(null, "100%"), @@ -352,8 +355,8 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent createClickAction("auto", componentHeightCategory, setComponentHeight, Integer.valueOf(i), null); - createClickAction("auto", componentWidthCategory, - setComponentWidth, Integer.valueOf(i), null); + createClickAction("auto", componentWidthCategory, setComponentWidth, + Integer.valueOf(i), null); for (String option : options) { createClickAction(option, componentHeightCategory, setComponentHeight, Integer.valueOf(i), option); 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 dfd279feb7..692e31526a 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); - LegacyDateField df = new LegacyDateField("DateField"); + DateField df = new DateField("DateField"); l.addComponent(df); ComboBox cb = new ComboBox("ComboBox"); 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 39abf7791f..7251790530 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 @@ -306,7 +306,8 @@ public class CalendarTest extends UI { event = getNewEvent("Appointment", start, end); event.setWhere("Office"); event.setStyleName("color1"); - event.setDescription("A longer description, which should display correctly."); + event.setDescription( + "A longer description, which should display correctly."); dataSource.addEvent(event); calendar.add(GregorianCalendar.DATE, 1); @@ -408,9 +409,9 @@ public class CalendarTest extends UI { // simulate week click WeekClickHandler handler = (WeekClickHandler) calendarComponent .getHandler(WeekClick.EVENT_ID); - handler.weekClick(new WeekClick(calendarComponent, calendar - .get(GregorianCalendar.WEEK_OF_YEAR), calendar - .get(GregorianCalendar.YEAR))); + handler.weekClick(new WeekClick(calendarComponent, + calendar.get(GregorianCalendar.WEEK_OF_YEAR), + calendar.get(GregorianCalendar.YEAR))); } }); @@ -442,8 +443,8 @@ public class CalendarTest extends UI { private void setWeekendsHidden(boolean weekendsHidden) { if (weekendsHidden) { - int firstToShow = (GregorianCalendar.MONDAY - calendar - .getFirstDayOfWeek()) % 7; + int firstToShow = (GregorianCalendar.MONDAY + - calendar.getFirstDayOfWeek()) % 7; calendarComponent.setFirstVisibleDayOfWeek(firstToShow + 1); calendarComponent.setLastVisibleDayOfWeek(firstToShow + 5); } else { @@ -686,8 +687,8 @@ public class CalendarTest extends UI { s.setFilteringMode(FilteringMode.CONTAINS); Item i = s.addItem(DEFAULT_ITEMID); - i.getItemProperty("caption").setValue( - "Default (" + TimeZone.getDefault().getID() + ")"); + i.getItemProperty("caption") + .setValue("Default (" + TimeZone.getDefault().getID() + ")"); for (String id : TimeZone.getAvailableIDs()) { if (!s.containsId(id)) { i = s.addItem(id); @@ -1146,12 +1147,14 @@ public class CalendarTest extends UI { private void updateCaptionLabel() { DateFormatSymbols s = new DateFormatSymbols(getLocale()); - String month = s.getShortMonths()[calendar.get(GregorianCalendar.MONTH)]; - captionLabel.setValue(month + " " - + calendar.get(GregorianCalendar.YEAR)); + String month = s.getShortMonths()[calendar + .get(GregorianCalendar.MONTH)]; + captionLabel + .setValue(month + " " + calendar.get(GregorianCalendar.YEAR)); } - private CalendarTestEvent getNewEvent(String caption, Date start, Date end) { + private CalendarTestEvent getNewEvent(String caption, Date start, + Date end) { CalendarTestEvent event = new CalendarTestEvent(); event.setCaption(caption); event.setStart(start); 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 6f65d50c7d..0832f5afeb 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 LegacyDateField disabledDateField = new LegacyDateField("Disabled DateField"); + final DateField disabledDateField = new DateField("Disabled DateField"); disabledDateField.setEnabled(false); setContent(content); content.addComponent(disabledDateField); - content.addComponent(new LegacyDateField("Enabled DateField")); + content.addComponent(new DateField("Enabled DateField")); } @Override 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 7a02bdbd5d..579df7f1a8 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,9 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; import java.util.Locale; -import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.DateField; public class CustomDateFormat extends TestBase { @@ -15,8 +16,8 @@ public class CustomDateFormat extends TestBase { Calendar cal = Calendar.getInstance(); cal.set(2010, 0, 1); - LegacyDateField df = new LegacyDateField(); - df.setResolution(LegacyDateField.RESOLUTION_DAY); + DateField df = new DateField(); + df.setResolution(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 828a17d5c3..fc3c8c97e8 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 - LegacyDateField df = new LegacyDateField("Should display 14/03/2014 Fri"); + DateField df = new DateField("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 7098d1e5fd..8eee0f03c3 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,10 @@ 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.shared.ui.datefield.Resolution; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; +import com.vaadin.ui.DateField; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.NativeSelect; @@ -140,8 +141,8 @@ public class CustomDateFormats extends TestBase { Label serversideValueLabel = new Label(); - LegacyDateField df = new LegacyDateField(); - df.setResolution(LegacyDateField.RESOLUTION_DAY); + DateField df = new DateField(); + df.setResolution(Resolution.DAY); df.setLocale(locale); df.setWidth("300px"); df.setDateFormat(pattern); @@ -157,13 +158,8 @@ public class CustomDateFormats extends TestBase { df.setData(new Data(serversideValueLabel, pattern)); df.setValue(cal.getTime()); - df.addListener(new Property.ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - updateServerSideLabel((LegacyDateField) event.getProperty()); - } - }); + df.addValueChangeListener(event -> updateServerSideLabel( + (DateField) event.getConnector())); Label patternLabel = new Label(pattern); patternLabel.setWidth(null); @@ -172,8 +168,8 @@ public class CustomDateFormats extends TestBase { Label expectedLabel = new Label(expDateFormat.format(cal.getTime())); if (!pattern.equals(expectedDateFormat)) { - expectedLabel.setValue(expectedLabel.getValue() - + " (differs from JDK)"); + expectedLabel + .setValue(expectedLabel.getValue() + " (differs from JDK)"); } expectedLabel.setWidth(null); @@ -185,7 +181,7 @@ public class CustomDateFormats extends TestBase { updateServerSideLabel(df); } - private void updateServerSideLabel(LegacyDateField df) { + private void updateServerSideLabel(DateField 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 8ddc4526d1..9dbd8fa6dc 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 LegacyDateField dateField = new LegacyPopupDateField("Enter date"); + final DateField dateField = new PopupDateField("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 eaf060e020..9ce190a293 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 LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); 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 588f1ddf54..4a68e648e6 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,18 +1,16 @@ 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.Label; - import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import java.util.TimeZone; +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; + public class DateFieldDayResolutionOffset extends AbstractTestUI { private final String initialDateString = "09/01/2014 00:00:00"; @@ -24,22 +22,18 @@ public class DateFieldDayResolutionOffset extends AbstractTestUI { final TimeZone timezone = TimeZone.getTimeZone("GMT"); final SimpleDateFormat dateformat = getDateFormat(timezone); - final LegacyDateField dateField = getDateField(timezone, dateformat); + final DateField dateField = getDateField(timezone, dateformat); addComponent(dateValue); addComponent(dateField); - dateField.addValueChangeListener(new Property.ValueChangeListener() { - @Override - public void valueChange(Property.ValueChangeEvent event) { - dateValue.setValue(dateformat.format(dateField.getValue())); - } - }); + dateField.addValueChangeListener(event -> dateValue + .setValue(dateformat.format(dateField.getValue()))); } - private LegacyDateField getDateField(TimeZone timezone, + private DateField getDateField(TimeZone timezone, SimpleDateFormat dateformat) { - final LegacyDateField dateField = new LegacyDateField(); + final DateField dateField = new DateField(); 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 d456acf1c6..1bb2625807 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,8 +7,8 @@ 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.datefield.Resolution; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; @@ -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(LegacyDateField.RESOLUTION_DAY); + df.setResolution(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 472d601e4e..620b9cf12a 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,15 @@ 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.shared.ui.datefield.Resolution; 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 +26,7 @@ public class DateFieldExtendedRange extends TestBase { layout.setWidth("600px"); layout.setSpacing(true); - final LegacyDateField[] fields = new LegacyDateField[6]; + final DateField[] fields = new DateField[6]; Locale fi = new Locale("fi", "FI"); Locale us = new Locale("en", "US"); @@ -38,10 +39,11 @@ public class DateFieldExtendedRange extends TestBase { fields[4] = makeDateField(true, fi, "Finnish locale with week numbers"); fields[4].setShowISOWeekNumbers(true); - fields[5] = makeDateField(false, fi, "Finnish locale with week numbers"); + fields[5] = makeDateField(false, fi, + "Finnish locale with week numbers"); fields[5].setShowISOWeekNumbers(true); - for (LegacyDateField f : fields) { + for (DateField f : fields) { layout.addComponent(f); } @@ -51,7 +53,7 @@ public class DateFieldExtendedRange extends TestBase { @Override public void buttonClick(ClickEvent event) { date.set(2010, 1, 16); - for (LegacyDateField f : fields) { + for (DateField f : fields) { f.setValue(date.getTime()); } } @@ -68,10 +70,10 @@ public class DateFieldExtendedRange extends TestBase { return 6718; } - private LegacyDateField makeDateField(boolean isPopup, Locale locale, + private DateField makeDateField(boolean isPopup, Locale locale, String caption) { - LegacyDateField df = isPopup ? new LegacyPopupDateField() : new LegacyInlineDateField(); - df.setResolution(LegacyDateField.RESOLUTION_DAY); + DateField df = isPopup ? new PopupDateField() : new InlineDateField(); + df.setResolution(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 e365dc50af..b38f58e5cc 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 LegacyInlineDateField()); + addComponent(new InlineDateField()); } @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 363cc46fcc..f993b4558b 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,13 @@ 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.shared.ui.datefield.Resolution; 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; @@ -62,11 +63,12 @@ public class DateFieldInSubWindow extends AbstractTestCase { @Override public LegacyField<?> createField(Item item, Object propertyId, Component uiContext) { - LegacyField<?> f = super.createField(item, propertyId, uiContext); + LegacyField<?> f = super.createField(item, propertyId, + uiContext); if ("myDate".equals(propertyId)) { - ((LegacyDateField) f).setResolution(LegacyDateField.RESOLUTION_MIN); - ((LegacyDateField) f).setCaption("This is my date"); + ((DateField) f).setResolution(Resolution.MINUTE); + ((DateField) f).setCaption("This is my date"); } @@ -96,8 +98,8 @@ public class DateFieldInSubWindow extends AbstractTestCase { BeanItem<MyBean> myBeanItem = new BeanItem<MyBean>(myBean); generalForm.setItemDataSource(myBeanItem); - generalForm.setVisibleItemProperties(new String[] { "myDate", - "myString" }); + generalForm.setVisibleItemProperties( + new String[] { "myDate", "myString" }); generalForm.setValidationVisible(true); layout.addComponent(generalForm); } 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 55af9cc2d7..f99c628400 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 @@ -3,13 +3,9 @@ package com.vaadin.tests.components.datefield; import java.text.SimpleDateFormat; import java.util.Date; -import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.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,26 +25,18 @@ public class DateFieldIsValid extends AbstractTestUIWithLog { @Override protected void setup(VaadinRequest request) { - final LegacyDateField dateField = new LegacyDateField("Insert Date: "); + final DateField dateField = new DateField("Insert Date: "); dateField.setImmediate(true); dateField.setDateFormat(pattern); - dateField.addValueChangeListener(new ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - log("valueChange: value: " + format(dateField.getValue()) - + ", is valid: " + dateField.isValid()); - } - }); + dateField.addValueChangeListener(event -> log("valueChange: value: " + + format(dateField.getValue()) + ", is valid: " + + (dateField.getErrorMessage() == null))); addComponent(dateField); - addButton("check dateField", new ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - log("buttonClick: value: " + format(dateField.getValue()) - + ", is valid: " + dateField.isValid()); - } - }); + addButton("check dateField", + event -> log("buttonClick: value: " + + format(dateField.getValue()) + ", is valid: " + + (dateField.getErrorMessage() == null))); } /** 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 76b4677d91..feefd5db3e 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 @@ -19,12 +19,10 @@ import java.util.Calendar; import java.util.GregorianCalendar; 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,17 +30,12 @@ public class DateFieldKeyboardInput extends AbstractTestUI { protected void setup(VaadinRequest request) { Calendar c = new GregorianCalendar(Locale.ENGLISH); c.set(2014, 0, 15); - final LegacyPopupDateField dateField = new LegacyPopupDateField("Select date", + final PopupDateField dateField = new PopupDateField("Select date", c.getTime()); dateField.setDateFormat("dd.MM.yyyy"); addComponent(dateField); - dateField.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - addComponent(new Label("Date has been changed.")); - } - }); + dateField.addValueChangeListener( + event -> addComponent(new Label("Date has been changed."))); } @Override 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 40290ea41d..38bb02bc71 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,22 @@ 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.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 LegacyDateField dateField = new LegacyDateField("DateField"); + final DateField dateField = new DateField("DateField"); dateField.setLocale(new Locale("fi", "FI")); dateField.setCaption(dateField.getLocale().toString()); dateField.setValue(new Date(2013 - 1900, 7 - 1, 27)); - dateField.setResolution(LegacyDateField.RESOLUTION_DAY); + dateField.setResolution(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 ff1f0ee98f..d153dff443 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 @@ -3,11 +3,10 @@ package com.vaadin.tests.components.datefield; import java.text.SimpleDateFormat; 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.shared.ui.datefield.Resolution; 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 +20,8 @@ public class DateFieldMinResolution extends TestBase { Calendar cal = Calendar.getInstance(); cal.set(2019, 1, 1, 1, 1); - LegacyDateField df = new LegacyDateField("foo"); - df.setResolution(LegacyDateField.RESOLUTION_MIN); + DateField df = new DateField("foo"); + df.setResolution(Resolution.MINUTE); df.setDateFormat(dformat.toPattern()); df.setValue(cal.getTime()); df.setImmediate(true); @@ -32,18 +31,14 @@ public class DateFieldMinResolution extends TestBase { final Label lbl = new Label(dformat.format(cal.getTime())); lbl.setCaption("Selected date"); - LegacyInlineDateField idf = new LegacyInlineDateField("bar"); - idf.setResolution(LegacyDateField.RESOLUTION_MIN); + InlineDateField idf = new InlineDateField("bar"); + idf.setResolution(Resolution.MINUTE); idf.setDateFormat(dformat.toPattern()); idf.setValue(cal.getTime()); idf.setImmediate(true); - idf.addListener(new Property.ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - lbl.setValue(dformat.format(event.getProperty().getValue())); - } - }); + idf.addValueChangeListener( + event -> lbl.setValue(dformat.format(event.getValue()))); addComponent(idf); addComponent(lbl); 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 9f36d56800..60508a30d4 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 LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); 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 8df1efd232..247d1a079c 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 LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); 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 5139cf0357..1f5eb4b394 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(); - LegacyDateField df; + DateField df; df = createDateField(); mainLayout.addComponent(df, 2, 0); @@ -55,11 +55,12 @@ public class DateFieldPopupOffScreen extends AbstractTestCase { setMainWindow(mainWindow); } - private LegacyDateField createDateField() { - LegacyDateField df = new LegacyDateField(); + private DateField createDateField() { + DateField df = new DateField(); 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."); + df.setDescription( + "This is a long, multiline tooltip.<br/>It should always be on screen so it can be read."); df.setValue(new Date(1000000L)); return df; } 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 916099aeed..4469ad3b1a 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); - LegacyPopupDateField field = new LegacyPopupDateField(); + PopupDateField field = new PopupDateField(); 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 c8c23bbc24..f81e12151b 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,25 +1,25 @@ 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 LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); df.setPrimaryStyleName("my-datefield"); addComponent(df); - final LegacyInlineDateField idf = new LegacyInlineDateField(); + final InlineDateField idf = new InlineDateField(); idf.setPrimaryStyleName("my-inline-datefield"); addComponent(idf); - addComponent(new Button("Set primary stylename", - new Button.ClickListener() { + addComponent( + new Button("Set primary stylename", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { df.setPrimaryStyleName("my-second-datefield"); 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 df2b533234..61e0cf2597 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,8 +6,6 @@ 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; @@ -15,8 +13,10 @@ 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 LegacyDateField fromRange = new LegacyDateField("Range start"); - private LegacyDateField toRange = new LegacyDateField("Range end"); - private LegacyDateField valueDF = new LegacyDateField("Value"); + private DateField fromRange = new DateField("Range start"); + private DateField toRange = new DateField("Range end"); + private DateField valueDF = new DateField("Value"); private CheckBox immediateCB = new CheckBox("Immediate"); private Button recreate = new Button("Recreate static datefields"); private Button clearRangeButton = new Button("Clear range"); private GridLayout currentStaticContainer; - private LegacyDateField inlineDynamicDateField; - private LegacyDateField dynamicDateField; + private DateField inlineDynamicDateField; + private DateField dynamicDateField; private Calendar createCalendar() { Calendar c = Calendar.getInstance(); @@ -75,41 +75,23 @@ public class DateFieldRanges extends AbstractTestUI { fromRange.setValue(null); fromRange.setImmediate(true); - fromRange.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - - inlineDynamicDateField.setRangeStart(fromRange.getValue()); - dynamicDateField.setRangeStart(fromRange.getValue()); - - } + fromRange.addValueChangeListener(event -> { + inlineDynamicDateField.setRangeStart(fromRange.getValue()); + dynamicDateField.setRangeStart(fromRange.getValue()); }); toRange.setValue(null); toRange.setImmediate(true); - toRange.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - - inlineDynamicDateField.setRangeEnd(toRange.getValue()); - dynamicDateField.setRangeEnd(toRange.getValue()); - - } + toRange.addValueChangeListener(event -> { + inlineDynamicDateField.setRangeEnd(toRange.getValue()); + dynamicDateField.setRangeEnd(toRange.getValue()); }); valueDF.setValue(null); valueDF.setImmediate(true); - valueDF.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - - inlineDynamicDateField.setValue(valueDF.getValue()); - dynamicDateField.setValue(valueDF.getValue()); - - } + valueDF.addValueChangeListener(event -> { + inlineDynamicDateField.setValue(valueDF.getValue()); + dynamicDateField.setValue(valueDF.getValue()); }); immediateCB.setValue(true); @@ -142,8 +124,8 @@ public class DateFieldRanges extends AbstractTestUI { Calendar endCal = createCalendar(); endCal.add(Calendar.DATE, 30); - dynamicDateField = createDateField(startCal.getTime(), - endCal.getTime(), null, Resolution.DAY, false); + dynamicDateField = createDateField(startCal.getTime(), endCal.getTime(), + null, Resolution.DAY, false); inlineDynamicDateField = createDateField(startCal.getTime(), endCal.getTime(), null, Resolution.DAY, true); @@ -201,11 +183,11 @@ public class DateFieldRanges extends AbstractTestUI { endCal.add(Calendar.DATE, 30); GridLayout gl = new GridLayout(2, 2); gl.setSpacing(true); - LegacyDateField df = createDateField(startCal.getTime(), endCal.getTime(), + DateField df = createDateField(startCal.getTime(), endCal.getTime(), null, Resolution.DAY, false); gl.addComponent(df); - LegacyDateField inline = createDateField(startCal.getTime(), - endCal.getTime(), null, Resolution.DAY, true); + DateField inline = createDateField(startCal.getTime(), endCal.getTime(), + null, Resolution.DAY, true); gl.addComponent(inline); inline.setId("staticInline"); VerticalLayout vl = new VerticalLayout(); @@ -213,29 +195,24 @@ public class DateFieldRanges extends AbstractTestUI { return gl; } - private LegacyDateField createDateField(Date rangeStart, Date rangeEnd, + private DateField createDateField(Date rangeStart, Date rangeEnd, Date value, Resolution resolution, boolean inline) { - LegacyDateField df = null; + DateField df = null; if (inline) { - df = new LegacyInlineDateField(); + df = new InlineDateField(); } else { - df = new LegacyDateField(); + df = new DateField(); } - final LegacyDateField gg = df; + final DateField gg = df; updateValuesForDateField(df); - df.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - label.setValue((gg.getValue() == null ? "Nothing" : gg - .getValue().toString()) - + " selected. isValid: " - + gg.isValid()); - } + df.addValueChangeListener(event -> { + label.setValue((gg.getValue() == null ? "Nothing" + : gg.getValue().toString()) + " selected. isValid: " + + (gg.getErrorMessage() != null)); }); return df; } @@ -246,7 +223,7 @@ public class DateFieldRanges extends AbstractTestUI { } - private void updateValuesForDateField(LegacyDateField df) { + private void updateValuesForDateField(DateField df) { Date fromVal = fromRange.getValue(); Date toVal = toRange.getValue(); Date value = valueDF.getValue(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldReadOnly.java index de847aa35f..9addeca5cf 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.shared.ui.datefield.Resolution; 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 LegacyDateField timeField = new LegacyDateField("A read-only datefield"); - timeField.setResolution(LegacyDateField.RESOLUTION_SEC); + final DateField timeField = new DateField("A read-only datefield"); + timeField.setResolution(Resolution.SECOND); 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 aabf4c7ebb..d8a165fa23 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,17 @@ 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.tests.components.abstractfield.AbstractFieldTest; +import com.vaadin.ui.DateField; -public class DateFieldTest<T extends LegacyDateField> extends LegacyAbstractFieldTest<T> { +public class DateFieldTest<T extends DateField> + extends AbstractFieldTest<T, Date> { @SuppressWarnings("unchecked") @Override protected Class<T> getTestClass() { - return (Class<T>) LegacyDateField.class; + return (Class<T>) DateField.class; } private Command<T, Date> setValue = new Command<T, Date>() { @@ -31,7 +32,8 @@ public class DateFieldTest<T extends LegacyDateField> extends LegacyAbstractFiel protected void createActions() { super.createActions(); createResolutionSelectAction(CATEGORY_FEATURES); - createBooleanAction("Lenient", CATEGORY_FEATURES, false, lenientCommand); + createBooleanAction("Lenient", CATEGORY_FEATURES, false, + lenientCommand); createBooleanAction("Show week numbers", CATEGORY_FEATURES, false, weekNumberCommand); createDateFormatSelectAction(CATEGORY_FEATURES); 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 dea53a7067..28e67849e9 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 LegacyDateField dateField = new LegacyDateField(); + private final DateField dateField = new DateField(); private static final String nullValue = ""; @Override @@ -76,15 +76,12 @@ public class DateFieldTimezone extends TestBase { dateField.setImmediate(true); dateField.setTimeZone(cal.getTimeZone()); dateField.setLocale(EN); - dateField.addListener(new Property.ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - Date date = dateField.getValue(); - DateFormat format = DateFormat.getDateTimeInstance( - DateFormat.SHORT, DateFormat.LONG, EN); - format.setTimeZone(UTC); - log.log("Date changed to " + format.format(date)); - } + dateField.addValueChangeListener(event -> { + Date date = dateField.getValue(); + DateFormat format = DateFormat.getDateTimeInstance(DateFormat.SHORT, + DateFormat.LONG, EN); + format.setTimeZone(UTC); + log.log("Date changed to " + format.format(date)); }); addComponent(timezoneSelector); 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 cf8db98a9f..491348cbcb 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 @@ -2,72 +2,64 @@ package com.vaadin.tests.components.datefield; import java.util.Date; -import com.vaadin.data.Property; +import com.vaadin.data.Result; 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 LegacyDateField { + public class MyDateField extends DateField { Date oldDate = null; public MyDateField(String caption) { super(caption); - addListener(new Property.ValueChangeListener() { - @Override - public void valueChange( - com.vaadin.data.Property.ValueChangeEvent event) { - oldDate = getValue(); - } - }); + addValueChangeListener(event -> oldDate = getValue()); } @Override - protected Date handleUnparsableDateString(String dateString) + protected Result<Date> handleUnparsableDateString(String dateString) throws LegacyConverter.ConversionException { - return oldDate; + return Result.ok(oldDate); } } - public class MyDateField2 extends LegacyDateField { + public class MyDateField2 extends DateField { public MyDateField2(String caption) { super(caption); } @Override - protected Date handleUnparsableDateString(String dateString) + protected Result<Date> handleUnparsableDateString(String dateString) throws LegacyConverter.ConversionException { - return null; + return Result.ok(null); } } - public class MyDateField3 extends LegacyDateField { + public class MyDateField3 extends DateField { public MyDateField3(String caption) { super(caption); } @Override - protected Date handleUnparsableDateString(String dateString) + protected Result<Date> handleUnparsableDateString(String dateString) throws LegacyConverter.ConversionException { - throw new LegacyConverter.ConversionException( - "You should not enter invalid dates!"); + return Result.error("You should not enter invalid dates!"); } } - public class MyDateField4 extends LegacyDateField { + public class MyDateField4 extends DateField { public MyDateField4(String caption) { super(caption); } @Override - protected Date handleUnparsableDateString(String dateString) + protected Result<Date> handleUnparsableDateString(String dateString) throws LegacyConverter.ConversionException { if (dateString != null && dateString.equals("today")) { - return new Date(); + return Result.ok(new Date()); } - throw new LegacyConverter.ConversionException( - "You should not enter invalid dates!"); + return Result.error("You should not enter invalid dates!"); } } 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 f2ab5e139f..8943d058ae 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,11 +2,11 @@ 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 @@ -21,12 +21,12 @@ public class DateFieldWhenChangingValueAndEnablingParent main.setMargin(true); setContent(main); - 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); + 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); sub.addComponent(df1); sub.addComponent(df2); @@ -49,17 +49,17 @@ public class DateFieldWhenChangingValueAndEnablingParent }); } - private LegacyDateField createDateField(boolean enabled) { - LegacyDateField df = new LegacyDateField( + private DateField createDateField(boolean enabled) { + DateField df = new DateField( "DateField, " + (enabled ? "enabled" : "disabled")); df.setEnabled(enabled); df.setId("DATEFIELD_" + (enabled ? "ENABLED" : "DISABLED")); return df; } - private LegacyPopupDateField createPopupDateField(boolean enabled, + private PopupDateField createPopupDateField(boolean enabled, boolean textInputEnabled) { - LegacyPopupDateField df = new LegacyPopupDateField("PopupDateField, " + PopupDateField df = new PopupDateField("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 8d23b12655..64f8695308 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,19 @@ package com.vaadin.tests.components.datefield; import java.util.Date; -import com.vaadin.legacy.ui.LegacyDateField; import com.vaadin.server.UserError; +import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.DateField; public class DatePopupStyleName extends TestBase { @Override public void setup() { setTheme("reindeer-tests"); - final LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); df.setValue(new Date(1203910239L)); - df.setResolution(LegacyDateField.RESOLUTION_SEC); + df.setResolution(Resolution.SECOND); 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 1358fb430a..a951655ba7 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,12 +15,12 @@ */ package com.vaadin.tests.components.datefield; -import com.vaadin.legacy.ui.LegacyDateField; -import com.vaadin.legacy.ui.LegacyInlineDateField; +import java.util.Locale; + import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; - -import java.util.Locale; +import com.vaadin.ui.DateField; +import com.vaadin.ui.InlineDateField; public class DateRangeWithSqlDate extends AbstractTestUI { @@ -34,7 +34,7 @@ public class DateRangeWithSqlDate extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - LegacyDateField df = new LegacyInlineDateField(); + DateField df = new InlineDateField(); df.setLocale(Locale.US); df.setRangeStart(startDate); df.setRangeEnd(endDate); 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 ab01916bf2..49590a3cee 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) { - LegacyDateField field = new LegacyDateField(); + DateField field = new DateField(); 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 4af93da45d..cd7026483a 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,18 @@ package com.vaadin.tests.components.datefield; -import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.shared.ui.datefield.Resolution; 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 LegacyDateField dateField1 = new LegacyDateField("DateField"); - dateField1.setResolution(LegacyDateField.RESOLUTION_YEAR); + final DateField dateField1 = new DateField("DateField"); + dateField1.setResolution(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 9013b19f0e..affc5d322c 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) { - LegacyDateField df = new LegacyInlineDateField("Disabled"); + DateField df = new InlineDateField("Disabled"); df.setValue(testDate); df.setEnabled(false); addComponent(df); - df = new LegacyInlineDateField("Read-only"); + df = new InlineDateField("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 5562229758..5ba158aef8 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,14 +35,13 @@ public class DisabledParentLayout extends AbstractTestUI { content.setMargin(true); final VerticalLayout pane = new VerticalLayout(); - LegacyDateField dateField = new LegacyDateField(); + DateField dateField = new DateField(); // 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 3a4e9a37df..7d9a0da8a4 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 LegacyPopupDateField df = new LegacyPopupDateField(); + final PopupDateField df = new PopupDateField(); df.setValue(new Date(2012 - 1900, 5 - 1, 12)); setRange(df, 5); layout.addComponent(df); - final LegacyInlineDateField df2 = new LegacyInlineDateField(); + final InlineDateField df2 = new InlineDateField(); df2.setValue(new Date(2012 - 1900, 11 - 1, 16)); setRange(df2, 5); @@ -62,11 +62,11 @@ public class DynamicallyChangeDateRange extends AbstractTestUI { * @param df * @param i */ - 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 - * 1000)); + private void setRange(DateField 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 * 1000)); } 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 160c57fdd6..1c8d8cfae6 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.legacy.ui.LegacyInlineDateField; +import com.vaadin.ui.InlineDateField; -public class InlineDateFieldTest extends DateFieldTest<LegacyInlineDateField> { +public class InlineDateFieldTest extends DateFieldTest<InlineDateField> { @Override - protected Class<LegacyInlineDateField> getTestClass() { - return LegacyInlineDateField.class; + protected Class<InlineDateField> getTestClass() { + return InlineDateField.class; } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/InlineDateFields.java index 186c77d458..669d691634 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<LegacyInlineDateField> { +public class InlineDateFields extends ComponentTestCase<InlineDateField> { private static final Locale[] LOCALES = new Locale[] { Locale.US, Locale.TAIWAN, new Locale("fi", "FI") }; @Override - protected Class<LegacyInlineDateField> getTestClass() { - return LegacyInlineDateField.class; + protected Class<InlineDateField> getTestClass() { + return InlineDateField.class; } @Override protected void initializeComponents() { - LegacyInlineDateField hidden = new LegacyInlineDateField(); + InlineDateField hidden = new InlineDateField(); hidden.setVisible(false); // Used to break rest of layout #8693 addComponent(hidden); Locale locale = LOCALES[0]; - LegacyInlineDateField pd = createInlineDateField("Undefined width", "-1", + InlineDateField pd = createInlineDateField("Undefined width", "-1", locale); pd.setId("Locale-" + locale.toString() + "-undefined-wide"); addTestComponent(pd); @@ -44,10 +44,10 @@ public class InlineDateFields extends ComponentTestCase<LegacyInlineDateField> { } - private LegacyInlineDateField createInlineDateField(String caption, String width, + private InlineDateField createInlineDateField(String caption, String width, Locale locale) { - LegacyInlineDateField pd = new LegacyInlineDateField(caption + "(" - + locale.toString() + ")"); + InlineDateField pd = new InlineDateField( + caption + "(" + locale.toString() + ")"); pd.setWidth(width); pd.setValue(new Date(12312312313L)); pd.setLocale(locale); @@ -78,10 +78,10 @@ public class InlineDateFields extends ComponentTestCase<LegacyInlineDateField> { options.put("Min", Resolution.MINUTE); options.put("Sec", Resolution.SECOND); return createSelectAction("Resolution", options, "Year", - new Command<LegacyInlineDateField, Resolution>() { + new Command<InlineDateField, Resolution>() { @Override - public void execute(LegacyInlineDateField c, Resolution value, + public void execute(InlineDateField c, Resolution value, Object data) { c.setResolution(value); @@ -95,10 +95,10 @@ public class InlineDateFields extends ComponentTestCase<LegacyInlineDateField> { options.put(locale.toString(), locale); } return createSelectAction("Locale", options, LOCALES[0].toString(), - new Command<LegacyInlineDateField, Locale>() { + new Command<InlineDateField, Locale>() { @Override - public void execute(LegacyInlineDateField c, Locale value, + public void execute(InlineDateField 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/LegacyDateFieldIsValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java new file mode 100644 index 0000000000..3a1311cd6e --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValid.java @@ -0,0 +1,66 @@ +package com.vaadin.tests.components.datefield; + +import java.text.SimpleDateFormat; +import java.util.Date; + +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.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; + +public class LegacyDateFieldIsValid extends AbstractTestUIWithLog { + + @Override + protected String getTestDescription() { + return "A dateField with invalid text should return false in isValid both when " + + "handling ValueChange event and after value is changed."; + } + + @Override + protected Integer getTicketNumber() { + return 14487; + } + + private String pattern = "dd/MM/yy"; + private SimpleDateFormat format = new SimpleDateFormat(pattern); + + @Override + protected void setup(VaadinRequest request) { + final LegacyDateField dateField = new LegacyDateField("Insert Date: "); + dateField.setImmediate(true); + dateField.setDateFormat(pattern); + + dateField.addValueChangeListener(new ValueChangeListener() { + @Override + public void valueChange(ValueChangeEvent event) { + log("valueChange: value: " + format(dateField.getValue()) + + ", is valid: " + dateField.isValid()); + } + }); + addComponent(dateField); + addButton("check dateField", new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + log("buttonClick: value: " + format(dateField.getValue()) + + ", is valid: " + dateField.isValid()); + } + }); + } + + /** + * @since + * @param value + * @return + */ + protected String format(Date value) { + if (value != null) { + return format.format(value); + } else { + return null; + } + } +} diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java new file mode 100644 index 0000000000..37cb46edea --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldRanges.java @@ -0,0 +1,263 @@ +package com.vaadin.tests.components.datefield; + +import java.util.Calendar; +import java.util.Date; +import java.util.Locale; + +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.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; +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.GridLayout; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.NativeSelect; +import com.vaadin.ui.VerticalLayout; + +public class LegacyDateFieldRanges extends AbstractTestUI { + + @Override + protected Integer getTicketNumber() { + return 6241; + } + + private Label label = new Label(); + private NativeSelect resoSelect = new NativeSelect("Resolution"); + private LegacyDateField fromRange = new LegacyDateField("Range start"); + private LegacyDateField toRange = new LegacyDateField("Range end"); + private LegacyDateField valueDF = new LegacyDateField("Value"); + private CheckBox immediateCB = new CheckBox("Immediate"); + private Button recreate = new Button("Recreate static datefields"); + private Button clearRangeButton = new Button("Clear range"); + + private GridLayout currentStaticContainer; + + private LegacyDateField inlineDynamicDateField; + private LegacyDateField dynamicDateField; + + private Calendar createCalendar() { + Calendar c = Calendar.getInstance(); + c.set(2013, 3, 26, 6, 1, 12); + return c; + } + + private Date newDate() { + return createCalendar().getTime(); + } + + private void initializeControlFields() { + resoSelect.addItem(Resolution.MINUTE); + resoSelect.addItem(Resolution.SECOND); + resoSelect.addItem(Resolution.HOUR); + resoSelect.addItem(Resolution.DAY); + resoSelect.addItem(Resolution.MONTH); + resoSelect.addItem(Resolution.YEAR); + resoSelect.setImmediate(true); + resoSelect.setValue(Resolution.DAY); + resoSelect.addValueChangeListener(new ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + + Resolution r = (Resolution) resoSelect.getValue(); + inlineDynamicDateField.setResolution(r); + dynamicDateField.setResolution(r); + + } + }); + + fromRange.setValue(null); + fromRange.setImmediate(true); + fromRange.addValueChangeListener(new ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + + inlineDynamicDateField.setRangeStart(fromRange.getValue()); + dynamicDateField.setRangeStart(fromRange.getValue()); + + } + }); + + toRange.setValue(null); + toRange.setImmediate(true); + toRange.addValueChangeListener(new ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + + inlineDynamicDateField.setRangeEnd(toRange.getValue()); + dynamicDateField.setRangeEnd(toRange.getValue()); + + } + }); + + valueDF.setValue(null); + valueDF.setImmediate(true); + valueDF.addValueChangeListener(new ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + + inlineDynamicDateField.setValue(valueDF.getValue()); + dynamicDateField.setValue(valueDF.getValue()); + + } + }); + + immediateCB.setValue(true); + immediateCB.setImmediate(true); + immediateCB.addValueChangeListener(event -> { + inlineDynamicDateField.setImmediate(immediateCB.getValue()); + dynamicDateField.setImmediate(immediateCB.getValue()); + }); + + recreate.addClickListener(new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + GridLayout newContainer = createStaticFields(); + replaceComponent(currentStaticContainer, newContainer); + currentStaticContainer = newContainer; + } + }); + + clearRangeButton.addClickListener(new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + fromRange.setValue(null); + toRange.setValue(null); + } + }); + + Calendar startCal = createCalendar(); + Calendar endCal = createCalendar(); + endCal.add(Calendar.DATE, 30); + + dynamicDateField = createDateField(startCal.getTime(), endCal.getTime(), + null, Resolution.DAY, false); + inlineDynamicDateField = createDateField(startCal.getTime(), + endCal.getTime(), null, Resolution.DAY, true); + + resoSelect.setId("resoSelect"); + fromRange.setId("fromRange"); + toRange.setId("toRange"); + valueDF.setId("valueDF"); + immediateCB.setId("immediateCB"); + recreate.setId("recreate"); + clearRangeButton.setId("clearRangeButton"); + dynamicDateField.setId("dynamicDateField"); + inlineDynamicDateField.setId("inlineDynamicDateField"); + + } + + @Override + protected void setup(VaadinRequest request) { + setLocale(new Locale("en", "US")); + getLayout().setWidth(100, Unit.PERCENTAGE); + getLayout().setHeight(null); + getLayout().setMargin(new MarginInfo(true, false, false, false)); + getLayout().setSpacing(true); + + initializeControlFields(); + + GridLayout gl = new GridLayout(2, 2); + gl.setSpacing(true); + + gl.addComponent(dynamicDateField); + gl.addComponent(inlineDynamicDateField); + + HorizontalLayout hl = new HorizontalLayout(); + hl.setSpacing(true); + hl.addComponent(resoSelect); + hl.addComponent(fromRange); + hl.addComponent(toRange); + hl.addComponent(valueDF); + hl.addComponent(immediateCB); + hl.addComponent(recreate); + hl.addComponent(clearRangeButton); + addComponent(hl); + addComponent(new Label("Dynamic DateFields")); + addComponent(gl); + currentStaticContainer = createStaticFields(); + addComponent(new Label("Static DateFields")); + addComponent(currentStaticContainer); + + addComponent(label); + + } + + private GridLayout createStaticFields() { + Calendar startCal = createCalendar(); + Calendar endCal = createCalendar(); + endCal.add(Calendar.DATE, 30); + GridLayout gl = new GridLayout(2, 2); + gl.setSpacing(true); + LegacyDateField df = createDateField(startCal.getTime(), + endCal.getTime(), null, Resolution.DAY, false); + gl.addComponent(df); + LegacyDateField inline = createDateField(startCal.getTime(), + endCal.getTime(), null, Resolution.DAY, true); + gl.addComponent(inline); + inline.setId("staticInline"); + VerticalLayout vl = new VerticalLayout(); + + return gl; + } + + private LegacyDateField createDateField(Date rangeStart, Date rangeEnd, + Date value, Resolution resolution, boolean inline) { + + LegacyDateField df = null; + + if (inline) { + df = new LegacyInlineDateField(); + } else { + df = new LegacyDateField(); + } + + final LegacyDateField gg = df; + updateValuesForDateField(df); + + df.addValueChangeListener(new ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + label.setValue((gg.getValue() == null ? "Nothing" + : gg.getValue().toString()) + " selected. isValid: " + + gg.isValid()); + } + }); + return df; + } + + @Override + protected String getTestDescription() { + return "Not defined yet"; + + } + + private void updateValuesForDateField(LegacyDateField df) { + Date fromVal = fromRange.getValue(); + Date toVal = toRange.getValue(); + Date value = valueDF.getValue(); + Resolution r = (Resolution) resoSelect.getValue(); + boolean immediate = immediateCB.getValue(); + + df.setValue(value); + df.setResolution(r); + df.setRangeStart(fromVal); + df.setRangeEnd(toVal); + df.setImmediate(immediate); + + } + +} diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java new file mode 100644 index 0000000000..ad8d70ccc5 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyDateFieldTest.java @@ -0,0 +1,143 @@ +package com.vaadin.tests.components.datefield; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Calendar; +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; + +public class LegacyDateFieldTest<T extends LegacyDateField> extends LegacyAbstractFieldTest<T> { + + @SuppressWarnings("unchecked") + @Override + protected Class<T> getTestClass() { + return (Class<T>) LegacyDateField.class; + } + + private Command<T, Date> setValue = new Command<T, Date>() { + + @Override + public void execute(T c, Date value, Object data) { + c.setValue(value); + } + }; + + @Override + protected void createActions() { + super.createActions(); + createResolutionSelectAction(CATEGORY_FEATURES); + createBooleanAction("Lenient", CATEGORY_FEATURES, false, lenientCommand); + createBooleanAction("Show week numbers", CATEGORY_FEATURES, false, + weekNumberCommand); + createDateFormatSelectAction(CATEGORY_FEATURES); + createSetValueAction(CATEGORY_FEATURES); + + } + + private void createSetValueAction(String category) { + LinkedHashMap<String, Date> options = new LinkedHashMap<String, Date>(); + options.put("(null)", null); + options.put("(current time)", new Date()); + Calendar c = Calendar.getInstance(new Locale("fi", "FI")); + c.clear(); + c.set(2010, 12 - 1, 12, 12, 0, 0); + c.set(Calendar.MILLISECOND, 0); + options.put("2010-12-12 12:00:00.000", c.getTime()); + c.clear(); + c.set(2000, 1 - 1, 2, 3, 4, 5); + c.set(Calendar.MILLISECOND, 6); + options.put("2000-01-02 03:04:05.006", c.getTime()); + createMultiClickAction("Set value", category, options, setValue, null); + } + + private void createDateFormatSelectAction(String category) { + LinkedHashMap<String, String> options = new LinkedHashMap<String, String>(); + + options.put("-", null); + options.put("d M yyyy", "d M yyyy"); + options.put("d MM yyyy", "d MM yyyy"); + options.put("d MMM yyyy", "d MMM yyyy"); + options.put("d MMMM yyyy", "d MMMM yyyy"); + options.put("dd M yyyy", "dd M yyyy"); + options.put("ddd M yyyy", "ddd M yyyy"); + options.put("d M y", "d M y"); + options.put("d M yy", "d M yy"); + options.put("d M yyy", "d M yyy"); + options.put("d M yyyy", "d M yyyy"); + options.put("d M 'custom text' yyyy", "d M 'custom text' yyyy"); + options.put("'day:'d', month:'M', year: 'yyyy", + "'day:'d', month:'M', year: 'yyyy"); + options.put(getDatePattern(new Locale("fi", "FI"), DateFormat.LONG), + getDatePattern(new Locale("fi", "FI"), DateFormat.LONG)); + options.put(getDatePattern(new Locale("fi", "FI"), DateFormat.MEDIUM), + getDatePattern(new Locale("fi", "FI"), DateFormat.MEDIUM)); + options.put(getDatePattern(new Locale("fi", "FI"), DateFormat.SHORT), + getDatePattern(new Locale("fi", "FI"), DateFormat.SHORT)); + + createSelectAction("Date format", category, options, "-", + dateFormatCommand); + + } + + private String getDatePattern(Locale locale, int dateStyle) { + DateFormat dateFormat = DateFormat.getDateInstance(dateStyle, locale); + + if (dateFormat instanceof SimpleDateFormat) { + String pattern = ((SimpleDateFormat) dateFormat).toPattern(); + return pattern; + } + return null; + + } + + private void createResolutionSelectAction(String category) { + LinkedHashMap<String, Resolution> options = new LinkedHashMap<String, Resolution>(); + options.put("Year", Resolution.YEAR); + options.put("Month", Resolution.MONTH); + options.put("Day", Resolution.DAY); + options.put("Hour", Resolution.HOUR); + options.put("Min", Resolution.MINUTE); + options.put("Sec", Resolution.SECOND); + + createSelectAction("Resolution", category, options, "Year", + resolutionCommand); + } + + private Command<T, Resolution> resolutionCommand = new Command<T, Resolution>() { + + @Override + public void execute(T c, Resolution value, Object data) { + c.setResolution(value); + + } + }; + private Command<T, Boolean> lenientCommand = new Command<T, Boolean>() { + + @Override + public void execute(T c, Boolean value, Object data) { + c.setLenient(false); + + } + }; + private Command<T, Boolean> weekNumberCommand = new Command<T, Boolean>() { + + @Override + public void execute(T c, Boolean value, Object data) { + c.setShowISOWeekNumbers(value); + + } + }; + private Command<T, String> dateFormatCommand = new Command<T, String>() { + + @Override + public void execute(T c, String value, Object data) { + c.setDateFormat(value); + } + }; + +} diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java new file mode 100644 index 0000000000..9d3ef0e76b --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyInlineDateFieldTest.java @@ -0,0 +1,13 @@ +package com.vaadin.tests.components.datefield; + +import com.vaadin.legacy.ui.LegacyInlineDateField; + +public class LegacyInlineDateFieldTest + extends LegacyDateFieldTest<LegacyInlineDateField> { + + @Override + protected Class<LegacyInlineDateField> getTestClass() { + return LegacyInlineDateField.class; + } + +} diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java new file mode 100644 index 0000000000..1f0dd76eef --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/LegacyPopupDateFieldTest.java @@ -0,0 +1,53 @@ +package com.vaadin.tests.components.datefield; + +import java.util.LinkedHashMap; + +import com.vaadin.legacy.ui.LegacyPopupDateField; + +public class LegacyPopupDateFieldTest + extends LegacyDateFieldTest<LegacyPopupDateField> { + + @Override + protected Class<LegacyPopupDateField> getTestClass() { + return LegacyPopupDateField.class; + } + + @Override + protected void createActions() { + super.createActions(); + + createInputPromptSelectAction(CATEGORY_FEATURES); + createTextEnabledAction(CATEGORY_FEATURES); + } + + private void createInputPromptSelectAction(String category) { + LinkedHashMap<String, String> options = new LinkedHashMap<String, String>(); + options.put("<none>", null); + options.put("Please enter date", "Please enter date"); + options.put("åäöÅÄÖ", "åäöÅÄÖ"); + + createSelectAction("Input prompt", category, options, "<none>", + new Command<LegacyPopupDateField, String>() { + + @Override + public void execute(LegacyPopupDateField c, String value, + Object data) { + c.setInputPrompt(value); + + } + }); + } + + private void createTextEnabledAction(String category) { + this.createBooleanAction("Text field enabled", category, true, + new Command<LegacyPopupDateField, Boolean>() { + + @Override + public void execute(LegacyPopupDateField c, Boolean value, + Object data) { + c.setTextFieldEnabled(value); + } + + }); + } +} 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 96c188148f..72fed3605e 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 @@ -3,13 +3,14 @@ package com.vaadin.tests.components.datefield; import java.util.Date; 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.data.HasValue.ValueChange; +import com.vaadin.data.HasValue.ValueChangeListener; +import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.DateField; -public class LenientMode extends TestBase implements ValueChangeListener { +public class LenientMode extends TestBase implements ValueChangeListener<Date> { private static final long serialVersionUID = -9064553409580072387L; @@ -29,16 +30,16 @@ public class LenientMode extends TestBase implements ValueChangeListener { @SuppressWarnings("deprecation") Date d = new Date(2009 - 1900, 12 - 1, 31, 23, 59, 59); - LegacyDateField df = new LegacyDateField("Lenient "); + DateField df = new DateField("Lenient "); df.setLocale(new Locale("fi")); - df.setResolution(LegacyDateField.RESOLUTION_DAY); + df.setResolution(Resolution.DAY); df.setLenient(true); df.setImmediate(true); df.setValue(d); - LegacyDateField df2 = new LegacyDateField("Normal "); + DateField df2 = new DateField("Normal "); df2.setLocale(new Locale("fi")); - df2.setResolution(LegacyDateField.RESOLUTION_DAY); + df2.setResolution(Resolution.DAY); // df2.setLenient(false); df2.setValue(null); df2.setImmediate(true); @@ -47,16 +48,16 @@ public class LenientMode extends TestBase implements ValueChangeListener { addComponent(df); addComponent(df2); - df.addListener(this); - df2.addListener(this); + df.addValueChangeListener(this); + df2.addValueChangeListener(this); - df = new LegacyDateField("Lenient with time"); + df = new DateField("Lenient with time"); df.setLocale(new Locale("fi")); df.setLenient(true); df.setImmediate(true); df.setValue(d); - df2 = new LegacyDateField("Normal with time"); + df2 = new DateField("Normal with time"); df2.setLocale(new Locale("fi")); // df2.setLenient(false); df2.setValue(null); @@ -66,17 +67,16 @@ public class LenientMode extends TestBase implements ValueChangeListener { addComponent(df); addComponent(df2); - df.addListener(this); - df2.addListener(this); + df.addValueChangeListener(this); + df2.addValueChangeListener(this); addComponent(new Button("Visit server")); } @Override - public void valueChange(ValueChangeEvent event) { - getMainWindow().showNotification( - "New value" + event.getProperty().getValue()); - + public void accept(ValueChange<Date> event) { + getMainWindow().showNotification("New value" + event.getValue()); } + } 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 5aa8a0ade3..f69c93419b 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 LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); 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 cfa1384582..16673fefe7 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,53 +1,38 @@ 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.shared.ui.datefield.Resolution; 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 LegacyPopupDateField dateField = new LegacyPopupDateField(); + final PopupDateField dateField = new PopupDateField(); dateField.setValue(new java.util.Date()); - dateField.setResolution(LegacyPopupDateField.RESOLUTION_MONTH); - dateField.addListener(new LegacyPopupDateField.ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - getMainWindow().showNotification( - "Date now" + event.getProperty()); - } - }); + dateField.setResolution(Resolution.MONTH); + dateField.addValueChangeListener(event -> getMainWindow() + .showNotification("Date now" + event.getValue())); dateField.setImmediate(true); getLayout().addComponent(dateField); - final LegacyPopupDateField dateField3 = new LegacyPopupDateField(); + final PopupDateField dateField3 = new PopupDateField(); // dateField.setValue(new java.util.Date()); - dateField3.setResolution(LegacyPopupDateField.RESOLUTION_YEAR); - dateField3.addListener(new LegacyPopupDateField.ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - getMainWindow().showNotification( - "Date now" + event.getProperty()); - } - }); + dateField3.setResolution(Resolution.YEAR); + dateField3.addValueChangeListener(event -> getMainWindow() + .showNotification("Date now" + event.getValue())); dateField3.setImmediate(true); getLayout().addComponent(dateField3); - final LegacyInlineDateField dateField2 = new LegacyInlineDateField(); + final InlineDateField dateField2 = new InlineDateField(); dateField2.setValue(new java.util.Date()); - dateField2.setResolution(LegacyPopupDateField.RESOLUTION_MONTH); - dateField2.addListener(new LegacyPopupDateField.ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - getMainWindow().showNotification( - "Date now" + event.getProperty()); - } - }); + dateField2.setResolution(Resolution.MONTH); + dateField2.addValueChangeListener(event -> getMainWindow() + .showNotification("Date now" + event.getValue())); dateField2.setImmediate(true); getLayout().addComponent(dateField2); 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 c8dcbf100f..b77b782d2a 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() { - LegacyPopupDateField df = new LegacyPopupDateField(); + PopupDateField df = new PopupDateField(); 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 724ddcb9c4..0b8ffa52fa 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) { - LegacyDateField df0 = new LegacyDateField("Minute"); + DateField df0 = new DateField("Minute"); df0.setId("minute"); df0.setResolution(Resolution.MINUTE); - LegacyDateField df1 = new LegacyDateField("Day"); + DateField df1 = new DateField("Day"); df1.setId("day"); df1.setResolution(Resolution.DAY); - LegacyDateField df2 = new LegacyDateField("Month"); + DateField df2 = new DateField("Month"); df2.setId("month"); df2.setResolution(Resolution.MONTH); - LegacyDateField df3 = new LegacyDateField("Year"); + DateField df3 = new DateField("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 436bff4922..5cdc8f1396 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 LegacyPopupDateField()); - addComponent(new LegacyDateField()); + addComponent(new PopupDateField()); + addComponent(new DateField()); } @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 2499c5854c..2608e6e081 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 LegacyPopupDateField[] fields = new LegacyPopupDateField[3]; + final PopupDateField[] fields = new PopupDateField[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 (LegacyPopupDateField f : fields) { + for (PopupDateField 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 (LegacyPopupDateField f : fields) { + for (PopupDateField f : fields) { f.setValue(date.getTime()); } } @@ -62,8 +62,8 @@ public class PopupDateFieldExtendedRange extends AbstractTestUI { return 6718; } - private LegacyPopupDateField makeDateField() { - LegacyPopupDateField pdf = new LegacyPopupDateField(); + private PopupDateField makeDateField() { + PopupDateField pdf = new PopupDateField(); 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 0c7d35a666..a267d72b7f 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 LegacyPopupDateField dateField = new LegacyPopupDateField(); + private PopupDateField dateField = new PopupDateField(); @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 c1fbf06ff0..5933581a30 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 @@ -3,12 +3,10 @@ package com.vaadin.tests.components.datefield; import java.util.Calendar; 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.shared.ui.datefield.Resolution; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.PopupDateField; public class PopupDateFieldLocaleTest extends AbstractTestUI { @@ -23,19 +21,14 @@ public class PopupDateFieldLocaleTest extends AbstractTestUI { cal.set(Calendar.SECOND, 1); cal.set(Calendar.MILLISECOND, 1); - final LegacyPopupDateField pdf = new LegacyPopupDateField(); + final PopupDateField pdf = new PopupDateField(); pdf.setLocale(Locale.ENGLISH); pdf.setValue(cal.getTime()); pdf.setImmediate(true); - pdf.setResolution(LegacyDateField.RESOLUTION_SEC); + pdf.setResolution(Resolution.SECOND); addComponent(pdf); - pdf.addValueChangeListener(new ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - pdf.setLocale(Locale.FRENCH); - } - }); + pdf.addValueChangeListener(event -> pdf.setLocale(Locale.FRENCH)); } @Override 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 a2998464f7..8bb816181c 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.shared.ui.datefield.Resolution; import com.vaadin.tests.components.TestBase; +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); - LegacyPopupDateField pdf = new LegacyPopupDateField(); + PopupDateField pdf = new PopupDateField(); pdf.setLocale(Locale.US); pdf.setValue(cal.getTime()); pdf.setImmediate(true); - pdf.setResolution(LegacyDateField.RESOLUTION_SEC); + pdf.setResolution(Resolution.SECOND); 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 22717d781e..aae4a213c6 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 LegacyPopupDateField createPopupDateField(final boolean enabled, + private static PopupDateField createPopupDateField(final boolean enabled, final boolean textFieldEnabled) { - final LegacyPopupDateField popupDatefield = new LegacyPopupDateField(); + final PopupDateField popupDatefield = new PopupDateField(); 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 45a1e0a325..6e3250a825 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.legacy.ui.LegacyPopupDateField; +import com.vaadin.ui.PopupDateField; -public class PopupDateFieldTest extends DateFieldTest<LegacyPopupDateField> { +public class PopupDateFieldTest extends DateFieldTest<PopupDateField> { @Override - protected Class<LegacyPopupDateField> getTestClass() { - return LegacyPopupDateField.class; + protected Class<PopupDateField> getTestClass() { + return PopupDateField.class; } @Override @@ -26,10 +26,10 @@ public class PopupDateFieldTest extends DateFieldTest<LegacyPopupDateField> { options.put("åäöÅÄÖ", "åäöÅÄÖ"); createSelectAction("Input prompt", category, options, "<none>", - new Command<LegacyPopupDateField, String>() { + new Command<PopupDateField, String>() { @Override - public void execute(LegacyPopupDateField c, String value, + public void execute(PopupDateField c, String value, Object data) { c.setInputPrompt(value); @@ -39,10 +39,10 @@ public class PopupDateFieldTest extends DateFieldTest<LegacyPopupDateField> { private void createTextEnabledAction(String category) { this.createBooleanAction("Text field enabled", category, true, - new Command<LegacyPopupDateField, Boolean>() { + new Command<PopupDateField, Boolean>() { @Override - public void execute(LegacyPopupDateField c, Boolean value, + public void execute(PopupDateField c, Boolean value, Object data) { c.setTextFieldEnabled(value); } diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldTextEnabled.java index 45374c8122..e1470797bc 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 LegacyPopupDateField field = new LegacyPopupDateField(); + final PopupDateField field = new PopupDateField(); 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 7d32733d56..51c4e580f4 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/PopupDateFieldValueChangeEvents.java @@ -22,13 +22,12 @@ package com.vaadin.tests.components.datefield; import java.util.Arrays; 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 +55,7 @@ public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog { Calendar calendar = Calendar.getInstance(); calendar.set(2010, 1, 1, 18, 19, 20); - final LegacyDateField df = new LegacyDateField(null, calendar.getTime()); + final DateField df = new DateField(null, calendar.getTime()); df.setResolution(Resolution.SECOND); df.setImmediate(true); hl.addComponent(df); @@ -74,14 +73,7 @@ public class PopupDateFieldValueChangeEvents extends AbstractTestUIWithLog { } }); - df.addValueChangeListener(new Property.ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - log("Value changes: " + (++count)); - - } - }); + df.addValueChangeListener(event -> log("Value changes: " + (++count))); } /* 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 5df8f0e4b3..9bc567c0fc 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<LegacyPopupDateField> { +public class PopupDateFields extends ComponentTestCase<PopupDateField> { private static final Locale[] LOCALES = new Locale[] { Locale.US, Locale.TAIWAN, new Locale("fi", "FI") }; @Override - protected Class<LegacyPopupDateField> getTestClass() { - return LegacyPopupDateField.class; + protected Class<PopupDateField> getTestClass() { + return PopupDateField.class; } @Override protected void initializeComponents() { for (Locale locale : LOCALES) { - LegacyPopupDateField pd = createPopupDateField("Undefined width", "-1", + PopupDateField pd = createPopupDateField("Undefined width", "-1", locale); pd.setId("Locale-" + locale.toString() + "-undefined-wide"); addTestComponent(pd); @@ -40,10 +40,10 @@ public class PopupDateFields extends ComponentTestCase<LegacyPopupDateField> { } - private LegacyPopupDateField createPopupDateField(String caption, String width, + private PopupDateField createPopupDateField(String caption, String width, Locale locale) { - LegacyPopupDateField pd = new LegacyPopupDateField(caption + "(" - + locale.toString() + ")"); + PopupDateField pd = new PopupDateField( + caption + "(" + locale.toString() + ")"); pd.setWidth(width); pd.setValue(new Date(12312312313L)); pd.setLocale(locale); @@ -74,10 +74,10 @@ public class PopupDateFields extends ComponentTestCase<LegacyPopupDateField> { options.put("Min", Resolution.MINUTE); options.put("Sec", Resolution.SECOND); return createSelectAction("Resolution", options, "Year", - new Command<LegacyPopupDateField, Resolution>() { + new Command<PopupDateField, Resolution>() { @Override - public void execute(LegacyPopupDateField c, Resolution value, + public void execute(PopupDateField c, Resolution value, Object data) { c.setResolution(value); @@ -92,10 +92,10 @@ public class PopupDateFields extends ComponentTestCase<LegacyPopupDateField> { options.put("åäöÅÄÖ", "åäöÅÄÖ"); return createSelectAction("Input prompt", options, "<none>", - new Command<LegacyPopupDateField, String>() { + new Command<PopupDateField, String>() { @Override - public void execute(LegacyPopupDateField c, String value, + public void execute(PopupDateField c, String value, Object data) { c.setInputPrompt(value); 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 abacf246b8..eb7545812e 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,9 @@ 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.TestBase; +import com.vaadin.ui.DateField; public class TestDatefieldYear extends TestBase { @@ -21,10 +22,10 @@ public class TestDatefieldYear extends TestBase { @Override protected void setup() { @SuppressWarnings("deprecation") - LegacyDateField df = new LegacyDateField("Year", new Date(2009 - 1900, 4 - 1, 1)); + DateField df = new DateField("Year", new Date(2009 - 1900, 4 - 1, 1)); df.setLocale(new Locale("en", "US")); - df.setResolution(LegacyDateField.RESOLUTION_YEAR); - df.setResolution(LegacyDateField.RESOLUTION_MONTH); + df.setResolution(Resolution.YEAR); + df.setResolution(Resolution.MONTH); addComponent(df); } 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 08004e4190..cf42fcad75 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,20 @@ package com.vaadin.tests.components.datefield; import java.util.Date; -import com.vaadin.legacy.ui.LegacyDateField; +import com.vaadin.shared.ui.datefield.Resolution; 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 LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); df.setValue(new Date(1203910239L)); - df.setResolution(LegacyDateField.RESOLUTION_SEC); + df.setResolution(Resolution.SECOND); 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 c6e911a6e5..d3932c1df0 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(); - LegacyPopupDateField fromDate = new LegacyPopupDateField("Date"); + PopupDateField fromDate = new PopupDateField("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 63fabceba3..d2ca7700ad 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 LegacyInlineDateField date = new LegacyInlineDateField("A 2x2 date field"); + final InlineDateField date = new InlineDateField("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 e4956025ed..0ec8cd5030 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 LegacyDateField df = new LegacyDateField(); + final DateField df = new DateField(); 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 36556c2807..a7d81427da 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,6 +1,5 @@ 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; @@ -8,6 +7,7 @@ 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; @@ -47,16 +47,16 @@ public class TableChildMeasurementHint extends AbstractTestUI { table3.setSizeFull(); table3.setChildMeasurementHint(ChildMeasurementHint.MEASURE_NEVER); - buttonLayout.addComponent(new Button("Show table1", - new ClickListener() { + buttonLayout + .addComponent(new Button("Show table1", new ClickListener() { @Override public void buttonClick(ClickEvent event) { layout.addComponent(table1); table1.focus(); } })); - buttonLayout.addComponent(new Button("Show table2", - new ClickListener() { + buttonLayout + .addComponent(new Button("Show table2", new ClickListener() { @Override public void buttonClick(ClickEvent event) { layout.removeComponent(table1); @@ -64,8 +64,8 @@ public class TableChildMeasurementHint extends AbstractTestUI { table2.focus(); } })); - buttonLayout.addComponent(new Button("Show table3", - new ClickListener() { + buttonLayout + .addComponent(new Button("Show table3", new ClickListener() { @Override public void buttonClick(ClickEvent event) { layout.removeComponent(table2); @@ -92,7 +92,8 @@ public class TableChildMeasurementHint extends AbstractTestUI { for (int i = 0; i < 2; i++) { table.addItem( makeRow(new Object[] { "Nicolaus" + i, "Copernicus", 1473 }, - 5), j++); + 5), + j++); table.addItem( makeRow(new Object[] { "Tycho" + i, "Brahe", 1546 }, 5), j++); @@ -123,8 +124,8 @@ public class TableChildMeasurementHint extends AbstractTestUI { @Override public Object generateCell(Table components, Object o, Object o2) { GridLayout b = new GridLayout(); - b.addComponents(new Label("l1"), new Button("b"), new Label( - "l2")); + b.addComponents(new Label("l1"), new Button("b"), + new Label("l2")); b.setWidthUndefined(); return b; } @@ -151,7 +152,7 @@ public class TableChildMeasurementHint extends AbstractTestUI { table.addGeneratedColumn("First_Name" + 4, new Table.ColumnGenerator() { @Override public Object generateCell(Table components, Object o, Object o2) { - LegacyDateField b = new LegacyDateField("DateField"); + DateField b = new DateField("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 0f6cbcccfd..12da99b7f4 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 LegacyDateField("Date")); + l.addComponent(new DateField("Date")); return l; } private Layout getDummyLayout2() { final VerticalLayout l = new VerticalLayout(); - l.addComponent(new LegacyDateField("Date")); + l.addComponent(new DateField("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 b4189fb2c5..cb97e8ee84 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); - LegacyDateField df = new LegacyPopupDateField("Popup date field"); + DateField df = new PopupDateField("Popup date field"); df.setId("datefield" + debugIdCounter++); df.setValue(cal.getTime()); addComponent(df); - df = new LegacyInlineDateField("Inline date field"); + df = new InlineDateField("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) { - LegacyDateField df = new LegacyDateField("Date field"); + DateField df = new DateField("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 af1ad5111e..506a25f663 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 LegacyPopupDateField tookOffice; + public PopupDateField tookOffice; @PropertyId("leftOffice") - public LegacyPopupDateField leftOffice; + public PopupDateField 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 71c4c967c8..17cc1b3ecf 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/DateForm.java @@ -127,8 +127,8 @@ public class DateForm extends AbstractTestUIWithLog { addComponent(discardButton); addComponent(showBean); - DateObject d = new DateObject(new Date(443457289789L), new Date( - 443457289789L), new Date(443457289789L), + DateObject d = new DateObject(new Date(443457289789L), + new Date(443457289789L), new Date(443457289789L), new Date(443457289789L)); fieldGroup.setItemDataSource(new BeanItem<DateObject>(d)); } 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 2c0fa042dc..cae5e16e06 100644 --- a/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java +++ b/uitest/src/main/java/com/vaadin/tests/fields/TabIndexes.java @@ -3,8 +3,6 @@ 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; @@ -15,10 +13,12 @@ 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 LegacyPopupDateField()); - fields.add(new LegacyInlineDateField()); + fields.add(new PopupDateField()); + fields.add(new InlineDateField()); 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 2d19b328df..ca3fb32f73 100644 --- a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java @@ -17,7 +17,6 @@ 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; @@ -34,6 +33,7 @@ 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; @@ -71,13 +71,13 @@ public class FontIcons extends AbstractTestUI { layout.setIcon(icon); - layout.addComponent(new Button("Switch icon type", - new Button.ClickListener() { + layout.addComponent( + new Button("Switch icon type", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - buildUI(icon instanceof FontIcon ? new ThemeResource( - "../runo/icons/16/user.png") + buildUI(icon instanceof FontIcon + ? new ThemeResource("../runo/icons/16/user.png") : FontAwesome.ANDROID); } })); @@ -86,7 +86,8 @@ public class FontIcons extends AbstractTestUI { Action[] actions = { new Action("Do it!", icon) }; @Override - public void handleAction(Action action, Object sender, Object target) { + public void handleAction(Action action, Object sender, + Object target) { } @@ -109,10 +110,9 @@ public class FontIcons extends AbstractTestUI { layout.addComponent(gl); // Basic components, caption icon only - Class<?>[] components = { Button.class, CheckBox.class, - LegacyDateField.class, NativeButton.class, Link.class, Label.class, - Panel.class, Slider.class, TextArea.class, TextField.class, - Upload.class }; + Class<?>[] components = { Button.class, CheckBox.class, DateField.class, + NativeButton.class, Link.class, Label.class, Panel.class, + Slider.class, TextArea.class, TextField.class, Upload.class }; for (Class<?> clazz : components) { Component c; try { 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 41c655e4f9..80ccd72f41 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/CaptionsInLayoutsWaiAria.java @@ -7,7 +7,6 @@ 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; @@ -19,6 +18,7 @@ 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 LegacyDateField("Default DateField")); + components.add(new DateField("Default DateField")); // PopupDateField popupDateField = new // PopupDateField("Default DateField"); 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 9f8366f4a6..df4053b533 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(LegacyDateField.class, true, "")); + l2.addComponent(createLabelsFields(DateField.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 4f44fb40d8..5b4dd2a947 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(LegacyDateField.class, true, "")); + layout.addComponent(createLabelsFields(DateField.class, true, "")); layout.addComponent(createLabelsFields(NativeSelect.class, true, "")); layout.addComponent(createLabelsFields(CheckBox.class, true, "")); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/DateFields.java index 04e2d77881..e786a2e803 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,8 +21,6 @@ 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; @@ -31,8 +29,10 @@ 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); - LegacyDateField date = new LegacyDateField("Default resolution"); + DateField date = new DateField("Default resolution"); setDate(date); row.addComponent(date); - date = new LegacyDateField("Error"); + date = new DateField("Error"); setDate(date); date.setComponentError(new UserError("Fix it, now!")); row.addComponent(date); - date = new LegacyDateField("Error, borderless"); + date = new DateField("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 LegacyDateField date2 = new LegacyDateField(); + final DateField date2 = new DateField(); group.addComponent(date2); Button today = new Button("Today", new ClickListener() { @@ -81,140 +81,141 @@ public class DateFields extends VerticalLayout implements View { }); group.addComponent(today); - date = new LegacyDateField("Default resolution, explicit size"); + date = new DateField("Default resolution, explicit size"); setDate(date); row.addComponent(date); date.setWidth("260px"); date.setHeight("60px"); - date = new LegacyDateField("Second resolution"); + date = new DateField("Second resolution"); setDate(date); date.setResolution(Resolution.SECOND); row.addComponent(date); - date = new LegacyDateField("Minute resolution"); + date = new DateField("Minute resolution"); setDate(date); date.setResolution(Resolution.MINUTE); row.addComponent(date); - date = new LegacyDateField("Hour resolution"); + date = new DateField("Hour resolution"); setDate(date); date.setResolution(Resolution.HOUR); row.addComponent(date); - date = new LegacyDateField("Disabled"); + date = new DateField("Disabled"); setDate(date); date.setResolution(Resolution.HOUR); date.setEnabled(false); row.addComponent(date); - date = new LegacyDateField("Day resolution"); + date = new DateField("Day resolution"); setDate(date); date.setResolution(Resolution.DAY); row.addComponent(date); - date = new LegacyDateField("Month resolution"); + date = new DateField("Month resolution"); setDate(date); date.setResolution(Resolution.MONTH); row.addComponent(date); - date = new LegacyDateField("Year resolution"); + date = new DateField("Year resolution"); setDate(date); date.setResolution(Resolution.YEAR); row.addComponent(date); - date = new LegacyDateField("Custom color"); + date = new DateField("Custom color"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName("color1"); row.addComponent(date); - date = new LegacyDateField("Custom color"); + date = new DateField("Custom color"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName("color2"); row.addComponent(date); - date = new LegacyDateField("Custom color"); + date = new DateField("Custom color"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName("color3"); row.addComponent(date); - date = new LegacyDateField("Small"); + date = new DateField("Small"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_SMALL); row.addComponent(date); - date = new LegacyDateField("Large"); + date = new DateField("Large"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_LARGE); row.addComponent(date); - date = new LegacyDateField("Borderless"); + date = new DateField("Borderless"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_BORDERLESS); row.addComponent(date); - date = new LegacyDateField("Week numbers"); + date = new DateField("Week numbers"); setDate(date); date.setResolution(Resolution.DAY); date.setLocale(new Locale("fi", "fi")); date.setShowISOWeekNumbers(true); row.addComponent(date); - date = new LegacyDateField("US locale"); + date = new DateField("US locale"); setDate(date); date.setResolution(Resolution.SECOND); date.setLocale(new Locale("en", "US")); row.addComponent(date); - date = new LegacyDateField("Custom format"); + date = new DateField("Custom format"); setDate(date); date.setDateFormat("E dd/MM/yyyy"); row.addComponent(date); - date = new LegacyDateField("Tiny"); + date = new DateField("Tiny"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_TINY); row.addComponent(date); - date = new LegacyDateField("Huge"); + date = new DateField("Huge"); setDate(date); date.setResolution(Resolution.DAY); date.addStyleName(ValoTheme.DATEFIELD_HUGE); row.addComponent(date); - date = new LegacyInlineDateField("Date picker"); + date = new InlineDateField("Date picker"); setDate(date); setDateRange(date); row.addComponent(date); - date = new LegacyInlineDateField("Date picker with week numbers"); + date = new InlineDateField("Date picker with week numbers"); setDate(date); date.setLocale(new Locale("fi", "fi")); date.setShowISOWeekNumbers(true); row.addComponent(date); PropertysetItem item = new PropertysetItem(); - item.addItemProperty("date", new ObjectProperty<Date>(getDefaultDate())); + item.addItemProperty("date", + new ObjectProperty<Date>(getDefaultDate())); FormLayout form = new FormLayout(); form.setMargin(false); FieldGroup binder = new FieldGroup(item); - form.addComponent(binder.buildAndBind( - "Picker in read-only field group", "date")); + form.addComponent( + binder.buildAndBind("Picker in read-only field group", "date")); binder.setReadOnly(true); row.addComponent(form); } - private void setDateRange(LegacyDateField date) { + private void setDateRange(DateField date) { date.setRangeStart(getDefaultDate()); Date endDate = getDefaultDate(); @@ -222,7 +223,7 @@ public class DateFields extends VerticalLayout implements View { date.setRangeEnd(endDate); } - private void setDate(LegacyDateField date) { + private void setDate(DateField 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 e39cdbd376..51f19dd55c 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,7 +17,6 @@ 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; @@ -28,6 +27,7 @@ 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); - LegacyDateField birthday = new LegacyDateField("Birthday"); + DateField birthday = new DateField("Birthday"); birthday.setValue(new Date(80, 0, 31)); form.addComponent(birthday); @@ -91,8 +91,8 @@ public class Forms extends VerticalLayout implements View { form.addComponent(section); TextField email = new TextField("Email"); - email.setValue(sg.nextString(false) + "@" + sg.nextString(false) - + ".com"); + email.setValue( + sg.nextString(false) + "@" + sg.nextString(false) + ".com"); email.setWidth("50%"); email.setRequired(true); form.addComponent(email); @@ -137,14 +137,16 @@ public class Forms extends VerticalLayout implements View { form.addComponent(website); TextArea shortbio = new TextArea("Short Bio"); - shortbio.setValue("Quis aute iure reprehenderit in voluptate velit esse. Cras mattis iudicium purus sit amet fermentum."); + shortbio.setValue( + "Quis aute iure reprehenderit in voluptate velit esse. Cras mattis iudicium purus sit amet fermentum."); shortbio.setWidth("100%"); shortbio.setRows(2); form.addComponent(shortbio); final RichTextArea bio = new RichTextArea("Bio"); bio.setWidth("100%"); - bio.setValue("<div><p><span>Integer legentibus erat a ante historiarum dapibus.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>A communi observantia non est recedendum.</span> <span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Ab illo tempore, ab est sed immemorabili.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span></p><p><span>Morbi odio eros, volutpat ut pharetra vitae, lobortis sed nibh.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Cum sociis natoque penatibus et magnis dis parturient.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Tityre, tu patulae recubans sub tegmine fagi dolor.</span></p><p><span>Curabitur blandit tempus ardua ridiculus sed magna.</span> <span>Phasellus laoreet lorem vel dolor tempus vehicula.</span> <span>Etiam habebis sem dicantur magna mollis euismod.</span> <span>Hi omnes lingua, institutis, legibus inter se differunt.</span></p></div>"); + bio.setValue( + "<div><p><span>Integer legentibus erat a ante historiarum dapibus.</span> <span>Vivamus sagittis lacus vel augue laoreet rutrum faucibus.</span> <span>A communi observantia non est recedendum.</span> <span>Morbi fringilla convallis sapien, id pulvinar odio volutpat.</span> <span>Ab illo tempore, ab est sed immemorabili.</span> <span>Quam temere in vitiis, legem sancimus haerentia.</span></p><p><span>Morbi odio eros, volutpat ut pharetra vitae, lobortis sed nibh.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Cum sociis natoque penatibus et magnis dis parturient.</span> <span>Quam diu etiam furor iste tuus nos eludet?</span> <span>Tityre, tu patulae recubans sub tegmine fagi dolor.</span></p><p><span>Curabitur blandit tempus ardua ridiculus sed magna.</span> <span>Phasellus laoreet lorem vel dolor tempus vehicula.</span> <span>Etiam habebis sem dicantur magna mollis euismod.</span> <span>Hi omnes lingua, institutis, legibus inter se differunt.</span></p></div>"); form.addComponent(bio); form.setReadOnly(true); 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 d23f701cae..7837a9d34b 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; @@ -95,8 +95,7 @@ public class Tables extends VerticalLayout implements View { table = new TreeTable(); table.setContainerDataSource(hierarchicalContainer); addComponent(table); - } else if (!hierarchical.getValue() - && table instanceof TreeTable) { + } else if (!hierarchical.getValue() && table instanceof TreeTable) { removeComponent(table); table = new Table(); table.setContainerDataSource(normalContainer); @@ -107,9 +106,9 @@ public class Tables extends VerticalLayout implements View { expandRatios.getValue(), stripes.getValue(), verticalLines.getValue(), horizontalLines.getValue(), borderless.getValue(), headers.getValue(), - compact.getValue(), small.getValue(), - rowIndex.getValue(), rowCaption.getValue(), - rowIcon.getValue(), componentsInCells.getValue()); + compact.getValue(), small.getValue(), rowIndex.getValue(), + rowCaption.getValue(), rowIcon.getValue(), + componentsInCells.getValue()); }; hierarchical.addValueChangeListener(update); @@ -199,7 +198,7 @@ public class Tables extends VerticalLayout implements View { @Override public Object generateCell(Table source, Object itemId, Object columnId) { - LegacyDateField tf = new LegacyDateField(); + DateField tf = new DateField(); 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 9abac0c6de..b59c500d28 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 LegacyInlineDateField(), new CheckBox("Far")); + row.addComponents(button, new InlineDateField(), 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 LegacyInlineDateField(), + col.addComponents(new Button("Boo"), new InlineDateField(), 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 0ad03f4cb2..0e59ecea68 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 LegacyInlineDateField df = new LegacyInlineDateField("", new Date()); + final InlineDateField df = new InlineDateField("", new Date()); PopupView pp = new PopupView(new PopupView.Content() { @Override public String getMinimizedValueAsHTML() { @@ -143,9 +143,9 @@ public class Ticket1397 extends LegacyApplication { TextField tf = new TextField("Editor for line " + lineNum, - "Try to edit the contents for this textfield on line " - + lineNum - + " and see how the overview-version changes."); + "Try to edit the contents for this textfield on line " + + lineNum + + " and see how the overview-version changes."); @Override public String getMinimizedValueAsHTML() { @@ -159,8 +159,8 @@ public class Ticket1397 extends LegacyApplication { } }); - table.addItem(new Object[] { "1 " + i, "2 " + i, "3 " + i, - "4 " + i, "5 " + i, pp, pp2 }, new Integer(i)); + table.addItem(new Object[] { "1 " + i, "2 " + i, "3 " + i, "4 " + i, + "5 " + i, pp, pp2 }, new Integer(i)); } main.addComponent(table); 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 58771413c4..2b1af43934 100644 --- a/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java +++ b/uitest/src/main/java/com/vaadin/tests/tickets/Ticket1710.java @@ -6,7 +6,6 @@ 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; @@ -17,6 +16,7 @@ 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; @@ -137,7 +137,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { hidingControls.addComponent(cb); formPanel.setVisible(false); cb.setValue(formPanel.isVisible()); - cb.addValueChangeListener(event -> formPanel.setVisible(event.getValue())); + cb.addValueChangeListener( + event -> formPanel.setVisible(event.getValue())); formPanelLayout.addComponent(getFormPanelExample()); lo.addComponent(formPanel); @@ -193,7 +194,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { lo.addComponent(new TextField("Textfield with no error in it")); - TextField tt1 = new TextField("100% wide Textfield with no error in it"); + TextField tt1 = new TextField( + "100% wide Textfield with no error in it"); tt1.setWidth("100%"); lo.addComponent(tt1); @@ -228,14 +230,14 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { t7.setIcon(new ThemeResource("../runo/icons/16/ok.png")); lo.addComponent(t7); - LegacyDateField d1 = new LegacyDateField( + DateField d1 = new DateField( "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); - LegacyDateField d2 = new LegacyDateField(); + DateField d2 = new DateField(); d2.setComponentError(new SystemError("Error")); d2.setRequired(true); lo.addComponent(d2); @@ -276,14 +278,14 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { controls.setSpacing(true); controls.setMargin(false); controls.addComponent(new Label("width")); - controls.addComponent(new TextField(new MethodProperty<Float>( - testedLayout, "width"))); + controls.addComponent(new TextField( + new MethodProperty<Float>(testedLayout, "width"))); CheckBox widthPercentsCheckBox = new CheckBox("%"); widthPercentsCheckBox.setImmediate(true); controls.addComponent(widthPercentsCheckBox); controls.addComponent(new Label("height")); - controls.addComponent(new TextField(new MethodProperty<Float>( - testedLayout, "height"))); + controls.addComponent(new TextField( + new MethodProperty<Float>(testedLayout, "height"))); CheckBox heightPercentsCheckBox = new CheckBox("%"); heightPercentsCheckBox.setImmediate(true); controls.addComponent(heightPercentsCheckBox); @@ -342,8 +344,8 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { hAlign.addItem(new Integer(Bits.ALIGNMENT_LEFT)); hAlign.setItemCaption(new Integer(Bits.ALIGNMENT_LEFT), "left"); hAlign.addItem(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER)); - hAlign.setItemCaption( - new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER), "center"); + hAlign.setItemCaption(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER), + "center"); hAlign.addItem(new Integer(Bits.ALIGNMENT_RIGHT)); hAlign.setItemCaption(new Integer(Bits.ALIGNMENT_RIGHT), "right"); @@ -370,18 +372,18 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { lAlign.addItem(new Integer(Bits.ALIGNMENT_LEFT)); lAlign.setItemCaption(new Integer(Bits.ALIGNMENT_LEFT), "left"); lAlign.addItem(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER)); - lAlign.setItemCaption( - new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER), "center"); + lAlign.setItemCaption(new Integer(Bits.ALIGNMENT_HORIZONTAL_CENTER), + "center"); lAlign.addItem(new Integer(Bits.ALIGNMENT_RIGHT)); lAlign.setItemCaption(new Integer(Bits.ALIGNMENT_RIGHT), "right"); lAlign.addListener(new Property.ValueChangeListener() { @Override public void valueChange(ValueChangeEvent event) { - testPanelLayout.setComponentAlignment( - testedLayout, - new Alignment(((Integer) lAlign.getValue()) - .intValue() + Bits.ALIGNMENT_TOP)); + testPanelLayout.setComponentAlignment(testedLayout, + new Alignment( + ((Integer) lAlign.getValue()).intValue() + + Bits.ALIGNMENT_TOP)); } }); } @@ -389,22 +391,22 @@ public class Ticket1710 extends com.vaadin.server.LegacyApplication { private void updateAlignments(Alignment a) { for (Iterator<Component> i = testedLayout.getComponentIterator(); i .hasNext();) { - ((Layout.AlignmentHandler) testedLayout).setComponentAlignment( - i.next(), a); + ((Layout.AlignmentHandler) testedLayout) + .setComponentAlignment(i.next(), a); } } private void updateMarginsAndSpacing() { if (testedLayout instanceof Layout.MarginHandler) { - ((Layout.MarginHandler) testedLayout).setMargin(new MarginInfo( - marginTop.getValue().booleanValue(), marginRight - .getValue().booleanValue(), marginBottom - .getValue().booleanValue(), marginLeft - .getValue().booleanValue())); + ((Layout.MarginHandler) testedLayout).setMargin( + new MarginInfo(marginTop.getValue().booleanValue(), + marginRight.getValue().booleanValue(), + marginBottom.getValue().booleanValue(), + marginLeft.getValue().booleanValue())); } if (testedLayout instanceof Layout.SpacingHandler) { - ((Layout.SpacingHandler) testedLayout).setSpacing(spacing - .getValue().booleanValue()); + ((Layout.SpacingHandler) testedLayout) + .setSpacing(spacing.getValue().booleanValue()); } } 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 686b0f8434..f58a54ec9a 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++); - LegacyDateField f3 = new LegacyDateField("3"); + DateField f3 = new DateField("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 df5ba0cc48..172ced73cc 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 LegacyDateField()); + i2.getItemProperty(P2).setValue(new DateField()); layout.addComponent(t); } 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 2f0d0318c4..f1969c5aff 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 @@ -7,8 +7,8 @@ import org.junit.Test; import org.openqa.selenium.By; 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 DateFieldDayResolutionOffsetTest extends MultiBrowserTest { @@ -35,8 +35,7 @@ public class DateFieldDayResolutionOffsetTest extends MultiBrowserTest { } private void openDatePicker() { - LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class) - .first(); + DateFieldElement dateField = $(DateFieldElement.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 122e55d8f0..cefd6aa67d 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.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -36,7 +36,7 @@ public class DateFieldIsValidTest extends MultiBrowserTest { waitForElementVisible(By.id("Log")); waitForElementVisible(By.className("v-datefield")); - WebElement dateTextbox = $(LegacyDateFieldElement.class).first() + WebElement dateTextbox = $(DateFieldElement.class).first() .findElement(By.className("v-textfield")); ButtonElement button = $(ButtonElement.class).first(); @@ -62,4 +62,5 @@ public class DateFieldIsValidTest extends MultiBrowserTest { Assert.assertTrue("Expected '" + expected + "' found '" + text + "'", text.equals(expected)); } + } 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 9e6183bb8d..15f196a26b 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 = $(LegacyDateFieldElement.class).first() + WebElement dateFieldText = $(DateFieldElement.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 813a2a825f..ca3d3a8748 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.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; 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. - LegacyDateFieldElement df = $(LegacyDateFieldElement.class).first(); + DateFieldElement df = $(DateFieldElement.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 a49efd661c..c0b01992d7 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.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFieldPopupClosingTest extends MultiBrowserTest { @@ -69,8 +69,7 @@ public class DateFieldPopupClosingTest extends MultiBrowserTest { } private WebElement getToggleButton() { - LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class) - .first(); + DateFieldElement dateField = $(DateFieldElement.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 7859734b77..f896519aae 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.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; /** @@ -55,8 +55,7 @@ public abstract class DateFieldPopupPositionTest extends MultiBrowserTest { } private int getFieldBottom() { - LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class) - .first(); + DateFieldElement dateField = $(DateFieldElement.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 ea189a93a9..08aac1e259 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 @@ -7,7 +7,7 @@ import org.openqa.selenium.Keys; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.tests.tb3.MultiBrowserTest; public class DateFieldReadOnlyTest extends MultiBrowserTest { @@ -36,8 +36,8 @@ public class DateFieldReadOnlyTest extends MultiBrowserTest { private void openPopup() { // waiting for openPopup() in TB4 beta1: // http://dev.vaadin.com/ticket/13766 - $(LegacyDateFieldElement.class).first() - .findElement(By.tagName("button")).click(); + $(DateFieldElement.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 661ca1c94c..45fac010b2 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,8 +21,7 @@ import org.openqa.selenium.By; import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.testbench.elements.DateFieldElement; -import com.vaadin.tests.legacyelements.LegacyDateFieldElement; -import com.vaadin.tests.legacyelements.LegacyPopupDateFieldElement; +import com.vaadin.testbench.elements.PopupDateFieldElement; import com.vaadin.tests.tb3.SingleBrowserTest; public class DateFieldWhenChangingValueAndEnablingParentTest @@ -33,20 +32,23 @@ public class DateFieldWhenChangingValueAndEnablingParentTest openTestURL(); $(CheckBoxElement.class).first().click(); - assertState($(LegacyDateFieldElement.class).id("DATEFIELD_ENABLED"), - true, true); - assertState($(LegacyDateFieldElement.class).id("DATEFIELD_DISABLED"), - false, false); + assertState($(DateFieldElement.class).id("DATEFIELD_ENABLED"), true, + true); + assertState($(DateFieldElement.class).id("DATEFIELD_DISABLED"), false, + false); - assertState($(LegacyPopupDateFieldElement.class) - .id("DATEFIELD_ENABLED_ENABLED"), true, true); - assertState($(LegacyPopupDateFieldElement.class) - .id("DATEFIELD_ENABLED_DISABLED"), true, false); + assertState( + $(PopupDateFieldElement.class).id("DATEFIELD_ENABLED_ENABLED"), + true, true); + assertState( + $(PopupDateFieldElement.class).id("DATEFIELD_ENABLED_DISABLED"), + true, false); // disabling widget should always disable input - assertState($(LegacyPopupDateFieldElement.class) - .id("DATEFIELD_DISABLED_ENABLED"), false, false); - assertState($(LegacyPopupDateFieldElement.class) + assertState( + $(PopupDateFieldElement.class).id("DATEFIELD_DISABLED_ENABLED"), + false, false); + assertState($(PopupDateFieldElement.class) .id("DATEFIELD_DISABLED_DISABLED"), false, false); } 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 7c16995882..88b06540ee 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.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; /** * Test for date field popup calendar position in default theme. @@ -32,7 +32,7 @@ public class DefaultDateFieldPopupPositionTest @Override protected void checkPopupPosition() { - LegacyDateFieldElement field = $(LegacyDateFieldElement.class).first(); + DateFieldElement field = $(DateFieldElement.class).first(); int right = field.getLocation().getX() + field.getSize().getWidth(); WebElement popup = getPopup(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java new file mode 100644 index 0000000000..da13fedb02 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldIsValidTest.java @@ -0,0 +1,65 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.datefield; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.Keys; +import org.openqa.selenium.WebElement; + +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +/** + * @author Vaadin Ltd + */ +public class LegacyDateFieldIsValidTest extends MultiBrowserTest { + + @Test + public void testInvalidText() throws Exception { + openTestURL(); + + waitForElementVisible(By.id("Log")); + waitForElementVisible(By.className("v-datefield")); + WebElement dateTextbox = $(LegacyDateFieldElement.class).first() + .findElement(By.className("v-textfield")); + ButtonElement button = $(ButtonElement.class).first(); + + dateTextbox.sendKeys("01/01/01", Keys.TAB); + assertLogText("1. valueChange: value: 01/01/01, is valid: true"); + button.click(); + assertLogText("2. buttonClick: value: 01/01/01, is valid: true"); + + dateTextbox.sendKeys("lala", Keys.TAB); + assertLogText("3. valueChange: value: null, is valid: false"); + button.click(); + assertLogText("4. buttonClick: value: null, is valid: false"); + + dateTextbox.clear(); + dateTextbox.sendKeys("02/02/02", Keys.TAB); + assertLogText("5. valueChange: value: 02/02/02, is valid: true"); + button.click(); + assertLogText("6. buttonClick: value: 02/02/02, is valid: true"); + } + + private void assertLogText(String expected) throws Exception { + String text = findElement(By.vaadin("PID_SLog_row_0")).getText(); + Assert.assertTrue("Expected '" + expected + "' found '" + text + "'", + text.equals(expected)); + } +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldTestTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldTestTest.java new file mode 100644 index 0000000000..6d43c59d62 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/LegacyDateFieldTestTest.java @@ -0,0 +1,121 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.datefield; + +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.Dimension; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.elements.NotificationElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class LegacyDateFieldTestTest extends MultiBrowserTest { + + @Test + public void testMakingRequired() throws InterruptedException { + setDebug(true); + openTestURL(); + Thread.sleep(1000); + menu("Component"); + menuSub("State"); + menu("Required"); + assertRequiredIndicatorVisible(); + assertNoErrorNotification(); + } + + private void assertRequiredIndicatorVisible() { + getDriver().findElement(By.className("v-required-field-indicator")); + } + + private void assertNoErrorNotification() { + if (isElementPresent(NotificationElement.class)) { + Assert.fail("Notification was present"); + } + } + + @Test + public void testValueAfterOpeningPopupInRequiredField() + throws InterruptedException { + setDebug(true); + openTestURL(); + Thread.sleep(1000); + menu("Component"); + menuSub("State"); + menu("Required"); + + assertRequiredIndicatorVisible(); + + menu("Component"); + menuSub("Features"); + menuSub("Resolution"); + menu("Month"); + + menu("Component"); + menuSub("Listeners"); + menu("Value change listener"); + + String inputtedValue = "2/12"; + getInput().sendKeys(inputtedValue); + + openPopup(); + closePopup(); + String actual = getInput().getAttribute("value"); + Assert.assertEquals(inputtedValue, actual); + assertNoErrorNotification(); + + } + + private void openPopup() throws InterruptedException { + Dimension size = getInput().getSize(); + new Actions(getDriver()).moveToElement(getInput(), 0, 0) + .moveByOffset(size.getWidth() + 5, size.getHeight() / 2) + .click(); + // This fails in Opera for some weird reason + // getDriver().findElement(By.className("v-datefield-button")).click(); + } + + private WebElement getInput() { + return getDriver().findElement(By.xpath("//input")); + } + + private void closePopup() { + getDriver().findElement(By.tagName("body")).click(); + } + + /** + * @since + * @param string + */ + private void menuSub(String string) { + getDriver().findElement(By.xpath("//span[text() = '" + string + "']")) + .click(); + new Actions(getDriver()).moveByOffset(100, 0).build().perform(); + } + + /** + * @since + * @param string + */ + private void menu(String string) { + getDriver().findElement(By.xpath("//span[text() = '" + string + "']")) + .click(); + + } + +} 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 f08fc02ccc..5334327a83 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.tests.legacyelements.LegacyDateFieldElement; -import com.vaadin.tests.legacyelements.LegacyPopupDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; +import com.vaadin.testbench.elements.PopupDateFieldElement; 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($(LegacyPopupDateFieldElement.class).all().size(), is(1)); - assertThat($(LegacyDateFieldElement.class).all().size(), is(2)); + assertThat($(PopupDateFieldElement.class).all().size(), is(1)); + assertThat($(DateFieldElement.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 08d4317145..c34f3fdd01 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,11 +50,10 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { @Test public void testFirstDateField() { - List<LegacyDateFieldElement> dateFields = $( - LegacyDateFieldElement.class).all(); + List<DateFieldElement> dateFields = $(DateFieldElement.class).all(); assertEquals("unexpected amount of datefields", 3, dateFields.size()); - LegacyDateFieldElement dateField = dateFields.get(0); + DateFieldElement dateField = dateFields.get(0); // open the popup dateField.findElement(By.tagName("button")).click(); @@ -159,8 +158,7 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { @Test public void testSecondDateField() throws InterruptedException { - LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class).all() - .get(1); + DateFieldElement dateField = $(DateFieldElement.class).all().get(1); ButtonElement button = $(ButtonElement.class).first(); // change the date @@ -290,8 +288,7 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest { @Test public void testThirdDateField() throws InterruptedException { - LegacyDateFieldElement dateField = $(LegacyDateFieldElement.class).all() - .get(2); + DateFieldElement dateField = $(DateFieldElement.class).all().get(2); ButtonElement button = $(ButtonElement.class).first(); // change the date 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 246176e39c..4e5fa744c7 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 LegacyPopupDateFieldElement dateField = $( - LegacyPopupDateFieldElement.class).first(); + final PopupDateFieldElement dateField = $(PopupDateFieldElement.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 LegacyPopupDateFieldElement dateField, final By locator) { + final PopupDateFieldElement dateField, final By locator) { waitUntil(new ExpectedCondition<Boolean>() { @Override @@ -84,7 +84,7 @@ public class PopupDateFieldInputPromptTest extends MultiBrowserTest { }); } - private boolean isRequired(LegacyPopupDateFieldElement dateField) { + private boolean isRequired(PopupDateFieldElement 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 5c5e4e8710..b8e5ced0e9 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,8 +53,7 @@ public class PopupDateFieldValueChangeEventsTest extends MultiBrowserTest { } public WebElement getPopUpButton() { - LegacyDateFieldElement datefield = $(LegacyDateFieldElement.class) - .first(); + DateFieldElement datefield = $(DateFieldElement.class).first(); return datefield.findElement((By.className("v-datefield-button"))); } 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 2f55bfe18a..b9795adbfd 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.tests.legacyelements.LegacyDateFieldElement; +import com.vaadin.testbench.elements.DateFieldElement; /** * Test for date field popup calendar position in Valo theme. @@ -31,7 +31,7 @@ public class ValoDateFieldPopupPositionTest extends DateFieldPopupPositionTest { @Override protected void checkPopupPosition() { - LegacyDateFieldElement field = $(LegacyDateFieldElement.class).first(); + DateFieldElement field = $(DateFieldElement.class).first(); WebElement popup = getPopup(); int left = field.getLocation().getX(); int popupRight = popup.getLocation().getX() 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 e8f9687e61..9b38a11b25 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 @@ -10,18 +10,18 @@ import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.By; import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.testbench.elements.DateFieldElement; import com.vaadin.testbench.elements.TableElement; import com.vaadin.testbench.elementsbase.ServerClass; import com.vaadin.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.legacy.ui.LegacyDateField") - public static class DateFieldElement extends LegacyDateFieldElement { + @ServerClass("com.vaadin.ui.DateField") + public static class MyDateFieldElement extends DateFieldElement { public void openPopup() { findElement(By.tagName("button")).click(); } @@ -198,13 +198,13 @@ public abstract class ThemeTest extends MultiBrowserTest { private void testDates() throws IOException { compareScreen("dates"); - $(DateFieldElement.class).id("datefield0").openPopup(); + $(MyDateFieldElement.class).id("datefield0").openPopup(); compareScreen("dates-first-popup"); - $(DateFieldElement.class).id("datefield1").openPopup(); + $(MyDateFieldElement.class).id("datefield1").openPopup(); compareScreen("dates-second-popup"); - $(DateFieldElement.class).id("datefield2").openPopup(); + $(MyDateFieldElement.class).id("datefield2").openPopup(); compareScreen("dates-third-popup"); - $(DateFieldElement.class).id("datefield3").openPopup(); + $(MyDateFieldElement.class).id("datefield3").openPopup(); compareScreen("dates-fourth-popup"); } } 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 b1e764a559..7cf8fedbbc 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-legacy"); + compareScreen("all"); } @Test |