diff options
4 files changed, 205 insertions, 3 deletions
diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java index 2bf5234f24..545a1e9e3e 100644 --- a/server/src/com/vaadin/ui/MenuBar.java +++ b/server/src/com/vaadin/ui/MenuBar.java @@ -26,6 +26,8 @@ import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; import com.vaadin.shared.ui.menubar.MenuBarConstants; +import com.vaadin.shared.ui.menubar.MenuBarState; +import com.vaadin.ui.Component.Focusable; /** * <p> @@ -35,7 +37,8 @@ import com.vaadin.shared.ui.menubar.MenuBarConstants; * </p> */ @SuppressWarnings("serial") -public class MenuBar extends AbstractComponent implements LegacyComponent { +public class MenuBar extends AbstractComponent implements LegacyComponent, + Focusable { // Items of the top-level menu private final List<MenuItem> menuItems; @@ -49,6 +52,11 @@ public class MenuBar extends AbstractComponent implements LegacyComponent { private boolean htmlContentAllowed; + @Override + protected MenuBarState getState() { + return (MenuBarState) super.getState(); + } + /** Paint (serialise) the component for the client. */ @Override public void paintContent(PaintTarget target) throws PaintException { @@ -386,6 +394,27 @@ public class MenuBar extends AbstractComponent implements LegacyComponent { return htmlContentAllowed; } + @Override + public int getTabIndex() { + return getState().tabIndex; + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.ui.Component.Focusable#setTabIndex(int) + */ + @Override + public void setTabIndex(int tabIndex) { + getState().tabIndex = tabIndex; + } + + @Override + public void focus() { + // Overridden only to make public + super.focus(); + } + /** * This interface contains the layer for menu commands of the * {@link com.vaadin.ui.MenuBar} class. It's method will fire when the user diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java index 2eb9ae7779..bf812dfbb0 100644 --- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java +++ b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java @@ -15,9 +15,9 @@ */ package com.vaadin.shared.ui.menubar; -import com.vaadin.shared.AbstractComponentState; +import com.vaadin.shared.ui.TabIndexState; -public class MenuBarState extends AbstractComponentState { +public class MenuBarState extends TabIndexState { { primaryStyleName = "v-menubar"; } diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html new file mode 100644 index 0000000000..cd8de3757a --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.html @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/MenuBarFocus?restartApplication</td> + <td></td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td> + <td>enter</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VLabel[0]</td> + <td>Foo clicked</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td> + <td>down</td> +</tr> +<tr> + <td>pressSpecialKey</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VMenuBar[0]</td> + <td>enter</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runMenuBarFocus::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VLabel[0]</td> + <td>Bar clicked</td> +</tr> +</tbody></table> +</body> +</html>
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java new file mode 100644 index 0000000000..2ea7a23333 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/menubar/MenuBarFocus.java @@ -0,0 +1,102 @@ +/* + * Copyright 2000-2013 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.menubar; + +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.Label; +import com.vaadin.ui.MenuBar; +import com.vaadin.ui.MenuBar.Command; +import com.vaadin.ui.MenuBar.MenuItem; + +public class MenuBarFocus extends AbstractTestUI { + + /* + * (non-Javadoc) + * + * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server. + * VaadinRequest) + */ + @Override + protected void setup(VaadinRequest request) { + final MenuBar bar = buildMenu(); + Button focusButton = buildButton(bar); + + addComponent(bar); + addComponent(focusButton); + getLayout().setSpacing(true); + } + + private MenuBar buildMenu() { + final MenuBar bar = new MenuBar(); + bar.setDescription("Root Menu"); + + Command command = new Command() { + + @Override + public void menuSelected(MenuItem selectedItem) { + addComponent(new Label(selectedItem.getText() + " clicked")); + + } + }; + + // File + final MenuItem file = bar.addItem("File", null); + file.addItem("Foo", command); + file.addItem("Bar", command); + + // Edit + MenuItem edit = bar.addItem("Edit", null); + edit.addItem("Baz", command); + edit.addItem("Bay", command); + + bar.setTabIndex(2); + return bar; + } + + private Button buildButton(final MenuBar bar) { + ClickListener buttonClickListener = new ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + bar.focus(); + } + }; + + Button focusButton = new Button("Click me to focus the menubar", + buttonClickListener); + focusButton.setTabIndex(1); + return focusButton; + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription() + */ + @Override + protected String getTestDescription() { + return "This test checks if you can focus a menu bar on the client from the server side"; + } + + @Override + protected Integer getTicketNumber() { + return 7674; + } + +} |