From 8648be6705298dbbcfed5aafd9a57ab94d93105a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Fri, 8 Jun 2012 13:58:07 +0300 Subject: [PATCH] Fix broken error tooltips in FormLayout (#8794) --- .../gwt/client/ui/formlayout/VFormLayout.java | 3 +- .../formlayout/FormLayoutErrorHover.html | 47 +++++++++++++++++++ .../formlayout/FormLayoutErrorHover.java | 33 +++++++++++++ 3 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html create mode 100644 tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java diff --git a/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java index 85584755a6..8a859c409c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/formlayout/VFormLayout.java @@ -35,7 +35,6 @@ public class VFormLayout extends SimplePanel { private final static String CLASSNAME = "v-formlayout"; - ApplicationConnection client; VFormLayoutTable table; public VFormLayout() { @@ -371,7 +370,7 @@ public class VFormLayout extends SimplePanel { public void onBrowserEvent(Event event) { super.onBrowserEvent(event); if (owner != null) { - client.handleTooltipEvent(event, owner); + owner.getConnection().handleTooltipEvent(event, owner); } } diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html new file mode 100644 index 0000000000..f6fc12af0a --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html @@ -0,0 +1,47 @@ + + + + + + +PropertyValueChange + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PropertyValueChange
open/run/com.vaadin.tests.components.formlayout.FormLayoutErrorHover?restartApplication&debug
enterCharactervaadin=runcomvaadintestscomponentsformlayoutFormLayoutErrorHover::/VVerticalLayout[0]/VVerticalLayout[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#fieldasdf
pressSpecialKeyvaadin=runcomvaadintestscomponentsformlayoutFormLayoutErrorHover::/VVerticalLayout[0]/VVerticalLayout[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VPopupCalendar[0]#fieldenter
mouseOvervaadin=runcomvaadintestscomponentsformlayoutFormLayoutErrorHover::/VVerticalLayout[0]/VVerticalLayout[0]/VFormLayout[0]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]
pause2000
assertTextvaadin=runcomvaadintestscomponentsformlayoutFormLayoutErrorHover::Root/VTooltip[0]/FlowPanel[0]/VErrorMessage[0]/HTML[0]/domChild[0]Date format not recognized
+ + diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java new file mode 100644 index 0000000000..b65a448830 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.java @@ -0,0 +1,33 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tests.components.formlayout; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.tests.components.AbstractTestRoot; +import com.vaadin.ui.FormLayout; +import com.vaadin.ui.PopupDateField; + +public class FormLayoutErrorHover extends AbstractTestRoot { + + @Override + protected void setup(WrappedRequest request) { + FormLayout formLayout = new FormLayout(); + PopupDateField fromDate = new PopupDateField("Date"); + fromDate.setImmediate(true); + formLayout.addComponent(fromDate); + + addComponent(formLayout); + } + + @Override + protected String getTestDescription() { + return "Enter some random text to the date field and press enter. Then hover the error indicator. This should show a message about the error."; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(8794); + } + +} -- 2.39.5