From 770a1b8b4f3a6254a5e43d9446381d6e31ee402d Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 13 Nov 2012 16:21:56 +0200 Subject: Made PopupView work with TB again and fixed test (#10187) Change-Id: I36b568866a69354caa36609fc7c7d42082bc9489 --- client/src/com/vaadin/client/ui/VPopupView.java | 7 ++++++- .../vaadin/tests/components/popupview/PopupViewClickShortcut.html | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java index 4e0a9bcf98..129e233d5e 100644 --- a/client/src/com/vaadin/client/ui/VPopupView.java +++ b/client/src/com/vaadin/client/ui/VPopupView.java @@ -15,6 +15,7 @@ */ package com.vaadin.client.ui; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.Set; @@ -45,7 +46,7 @@ import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; import com.vaadin.client.ui.popupview.VisibilityChangeEvent; import com.vaadin.client.ui.popupview.VisibilityChangeHandler; -public class VPopupView extends HTML { +public class VPopupView extends HTML implements Iterable { public static final String CLASSNAME = "v-popupview"; @@ -390,4 +391,8 @@ public class VPopupView extends HTML { VisibilityChangeEvent.getType()); } + public Iterator iterator() { + return Collections.singleton((Widget) popup).iterator(); + } + }// class VPopupView diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html index c52bfa634d..7f787017a0 100644 --- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewClickShortcut.html @@ -3,7 +3,7 @@ - + PopupViewClickShortcut @@ -93,12 +93,12 @@ pressSpecialKey - vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0] + vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VOrderedLayout$Slot[2] ctrl alt U mouseClick - vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VPopupView[0]/VPopupView$CustomPopup[0]/VCaptionWrapper[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0]/domChild[0] + vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/ChildComponentContainer[2]/VPopupView[0]/VPopupView$CustomPopup[0]/VCaptionWrapper[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[0] 132,11 @@ -123,7 +123,7 @@ mouseClick - vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VVerticalLayout[0]/domChild[0]/domChild[1] + vaadin=runcomvaadintestscomponentspopupviewPopupViewClickShortcut::/VVerticalLayout[0]/domChild[0] 279,482 -- cgit v1.2.3