diff options
Diffstat (limited to 'tests/testbench/com/vaadin')
652 files changed, 7450 insertions, 305 deletions
diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java index dd93b1a8b6..b2148c8f08 100644 --- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -61,7 +61,8 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { Collections.addAll(defaultPackages, initParameter.split(",")); } String str = TestBase.class.getName().replace('.', '/') + ".class"; - URL url = getClassLoader().getResource(str); + URL url = getDeploymentConfiguration().getClassLoader() + .getResource(str); if ("file".equals(url.getProtocol())) { File comVaadinTests = new File(url.getPath()).getParentFile() .getParentFile(); diff --git a/tests/testbench/com/vaadin/launcher/DemoLauncher.java b/tests/testbench/com/vaadin/launcher/DemoLauncher.java index 2b2f73abd6..91cdd343c7 100644 --- a/tests/testbench/com/vaadin/launcher/DemoLauncher.java +++ b/tests/testbench/com/vaadin/launcher/DemoLauncher.java @@ -75,6 +75,7 @@ public class DemoLauncher { * dispatch thread. */ java.awt.EventQueue.invokeLater(new Runnable() { + @Override public void run() { try { openServerControlDialog(url); @@ -125,6 +126,7 @@ public class DemoLauncher { // List for close verify buttons final ActionListener buttonListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if (e.getSource() == okButton) { System.exit(0); diff --git a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java index 05658e74b1..cd465bc7cc 100644 --- a/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java +++ b/tests/testbench/com/vaadin/launcher/DevelopmentServerLauncher.java @@ -13,14 +13,14 @@ import java.net.Socket; import java.util.HashMap; import java.util.Map; -import com.vaadin.launcher.util.BrowserLauncher; - import org.mortbay.jetty.Connector; import org.mortbay.jetty.Server; import org.mortbay.jetty.nio.SelectChannelConnector; import org.mortbay.jetty.security.SslSocketConnector; import org.mortbay.jetty.webapp.WebAppContext; +import com.vaadin.launcher.util.BrowserLauncher; + /** * Class for running Jetty servlet container within Eclipse project. * @@ -40,6 +40,7 @@ public class DevelopmentServerLauncher { * @throws Exception */ public static void main(String[] args) { + System.setProperty("java.awt.headless", "true"); // Pass-through of arguments for Jetty final Map<String, String> serverArgs = parseArguments(args); diff --git a/tests/testbench/com/vaadin/tests/Components.java b/tests/testbench/com/vaadin/tests/Components.java index 4352072ccf..f4fa1b6608 100644 --- a/tests/testbench/com/vaadin/tests/Components.java +++ b/tests/testbench/com/vaadin/tests/Components.java @@ -15,9 +15,9 @@ import com.vaadin.data.util.DefaultItemSorter; import com.vaadin.data.util.HierarchicalContainer; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.Sizeable; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; @@ -137,6 +137,7 @@ public class Components extends Application.LegacyApplication { naviTree = new Tree(); naviTree.setItemStyleGenerator(new ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { Class<?> cls = (Class<?>) itemId; if (!isAbstract(cls)) { @@ -182,6 +183,7 @@ public class Components extends Application.LegacyApplication { naviTree.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { Class<?> cls = (Class<?>) event.getItemId(); if (!isAbstract(cls)) { diff --git a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java index 73282cc1fb..6991b669a8 100644 --- a/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/CustomLayoutDemo.java @@ -4,7 +4,7 @@ package com.vaadin.tests; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component.Event; @@ -45,6 +45,7 @@ public class CustomLayoutDemo extends com.vaadin.Application.LegacyApplication private final Button loginButton = new Button("Login", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { loginClicked(); } @@ -131,6 +132,7 @@ public class CustomLayoutDemo extends com.vaadin.Application.LegacyApplication * Handle all menu events. Updates body panel contents if menu item is * clicked. */ + @Override public void componentEvent(Event event) { // Check if event occured at fsTree component if (event.getSource() == menu) { diff --git a/tests/testbench/com/vaadin/tests/FocusingComponents.java b/tests/testbench/com/vaadin/tests/FocusingComponents.java index e74a935830..f63989fafb 100644 --- a/tests/testbench/com/vaadin/tests/FocusingComponents.java +++ b/tests/testbench/com/vaadin/tests/FocusingComponents.java @@ -54,6 +54,7 @@ public class FocusingComponents extends CustomComponent { Button focus = new Button("focus"); focus.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { f.focus(); } diff --git a/tests/testbench/com/vaadin/tests/LayoutDemo.java b/tests/testbench/com/vaadin/tests/LayoutDemo.java index d838283cf1..e2d858560a 100644 --- a/tests/testbench/com/vaadin/tests/LayoutDemo.java +++ b/tests/testbench/com/vaadin/tests/LayoutDemo.java @@ -4,8 +4,8 @@ package com.vaadin.tests; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ClassResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; diff --git a/tests/testbench/com/vaadin/tests/ListenerOrder.java b/tests/testbench/com/vaadin/tests/ListenerOrder.java index 797561eb00..7f136b10ed 100644 --- a/tests/testbench/com/vaadin/tests/ListenerOrder.java +++ b/tests/testbench/com/vaadin/tests/ListenerOrder.java @@ -59,6 +59,7 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication b1.removeListener(b1Listener); // remove non-existing listener b1.removeListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { } }); @@ -107,6 +108,7 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication return listener; } + @Override public void buttonClick(ClickEvent event) { System.out.println("ClickEvent from Test1"); s1.addItem("new item " + System.currentTimeMillis()); @@ -133,6 +135,7 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication System.out.println("Created listener " + name + ", id=" + count); } + @Override public void buttonClick(ClickEvent event) { String msg = "ClickEvent from MyClickListener " + name + ", id=" + count; @@ -142,18 +145,21 @@ public class ListenerOrder extends com.vaadin.Application.LegacyApplication } + @Override public void containerPropertySetChange(PropertySetChangeEvent event) { String msg = "containerPropertySetChange from " + this; System.out.println(msg); getMainWindow().showNotification(msg); } + @Override public void containerItemSetChange(ItemSetChangeEvent event) { String msg = "containerItemSetChange from " + this; System.out.println(msg); getMainWindow().showNotification(msg); } + @Override public void valueChange(ValueChangeEvent event) { String msg = "valueChange from " + this; System.out.println(msg); diff --git a/tests/testbench/com/vaadin/tests/ModalWindow.java b/tests/testbench/com/vaadin/tests/ModalWindow.java index c848803642..340571cd37 100644 --- a/tests/testbench/com/vaadin/tests/ModalWindow.java +++ b/tests/testbench/com/vaadin/tests/ModalWindow.java @@ -54,6 +54,7 @@ public class ModalWindow extends com.vaadin.Application.LegacyApplication } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == reopen) { openSubWindow(); diff --git a/tests/testbench/com/vaadin/tests/NativeWindowing.java b/tests/testbench/com/vaadin/tests/NativeWindowing.java index 6a561dd861..36cbe48935 100644 --- a/tests/testbench/com/vaadin/tests/NativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/NativeWindowing.java @@ -8,7 +8,7 @@ import java.net.MalformedURLException; import java.net.URL; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -26,6 +26,7 @@ public class NativeWindowing extends Application.LegacyApplication { main.addComponent(new Button("Add new subwindow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window w = new Window("sw " + System.currentTimeMillis()); @@ -40,6 +41,7 @@ public class NativeWindowing extends Application.LegacyApplication { final Button closebutton = new Button("Close " + w.getCaption(), new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.removeWindow(w); } @@ -78,6 +80,7 @@ public class NativeWindowing extends Application.LegacyApplication { main.addComponent(new Button( "Open a currently uncreated application level window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { main.open( @@ -114,6 +117,7 @@ public class NativeWindowing extends Application.LegacyApplication { ww.addComponent(new Button("Click me", new Button.ClickListener() { int state = 0; + @Override public void buttonClick(ClickEvent event) { ww.addComponent(new Label("Button clicked " + (++state) + " times")); diff --git a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java index 93e6290ee4..af73bdc652 100644 --- a/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java +++ b/tests/testbench/com/vaadin/tests/OrderedLayoutSwapComponents.java @@ -60,6 +60,7 @@ public class OrderedLayoutSwapComponents extends CustomComponent { ol.addComponent(new Label(name)); up = new Button("up"); up.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int newIndex = order.indexOf(MyComponent.this) - 1; MyComponent old = order.get(newIndex); @@ -77,6 +78,7 @@ public class OrderedLayoutSwapComponents extends CustomComponent { down = new Button("down"); down.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int newIndex = order.indexOf(MyComponent.this) + 1; MyComponent old = order.get(newIndex); diff --git a/tests/testbench/com/vaadin/tests/Parameters.java b/tests/testbench/com/vaadin/tests/Parameters.java index 8d940101c3..1e8ca53875 100644 --- a/tests/testbench/com/vaadin/tests/Parameters.java +++ b/tests/testbench/com/vaadin/tests/Parameters.java @@ -93,6 +93,7 @@ public class Parameters extends com.vaadin.Application.LegacyApplication main.setContent(layout); } + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java index 0d588a3306..e93ebc52f3 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestBasicComponentRendering.java @@ -7,8 +7,8 @@ package com.vaadin.tests; import java.util.Date; import java.util.Map; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.UserError; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index b3f232f24d..66c20009e0 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -6,7 +6,7 @@ package com.vaadin.tests; import java.util.Date; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -39,6 +39,7 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { main.addComponent(new Button("click when rendered", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { endTest(); } @@ -47,6 +48,7 @@ public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { main.addComponent(new Button( "Click for layout repaint (cached components)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { testContainer.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java index 882b776d5d..e0a7e2c90c 100644 --- a/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/tests/testbench/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -6,7 +6,7 @@ package com.vaadin.tests; import java.util.Date; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; @@ -39,6 +39,7 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { addInfo(); Button b = new Button("start test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { startTest(); } @@ -46,6 +47,7 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { b.setDescription("Push this button to start test. A test label will be rendered above existing components."); main.addComponent(b); b = new Button("end test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { endTest(); } diff --git a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java index bd40a7fb7b..9cd27e9d5c 100644 --- a/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java +++ b/tests/testbench/com/vaadin/tests/ScrollbarStressTest.java @@ -73,6 +73,7 @@ public class ScrollbarStressTest extends Application.LegacyApplication { height.setValue("100%"); final Button set = new Button("Set", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getTable = testComponent.getValue().equals("Table"); diff --git a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java index 9c2703822e..87ab7fa1d4 100644 --- a/tests/testbench/com/vaadin/tests/StressComponentsInTable.java +++ b/tests/testbench/com/vaadin/tests/StressComponentsInTable.java @@ -37,6 +37,7 @@ public class StressComponentsInTable extends CustomComponent { } content.add(new Button("b" + i, new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); System.out.println(b.getCaption() + " click: " diff --git a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java index fa7edc3a45..3f87f2fe4c 100644 --- a/tests/testbench/com/vaadin/tests/TableChangingDatasource.java +++ b/tests/testbench/com/vaadin/tests/TableChangingDatasource.java @@ -45,6 +45,7 @@ public class TableChangingDatasource extends CustomComponent implements } + @Override public void buttonClick(ClickEvent event) { int i = mode % 4; t.setContainerDataSource(ta[i].getContainerDataSource()); diff --git a/tests/testbench/com/vaadin/tests/TableSelectTest.java b/tests/testbench/com/vaadin/tests/TableSelectTest.java index 62070c4b97..823bdfb3c4 100644 --- a/tests/testbench/com/vaadin/tests/TableSelectTest.java +++ b/tests/testbench/com/vaadin/tests/TableSelectTest.java @@ -113,6 +113,7 @@ public class TableSelectTest extends CustomComponent implements return id; } + @Override public void valueChange(ValueChangeEvent event) { final Object val = event.getProperty().getValue(); diff --git a/tests/testbench/com/vaadin/tests/TestBench.java b/tests/testbench/com/vaadin/tests/TestBench.java index 1ac497e574..04f71ce535 100644 --- a/tests/testbench/com/vaadin/tests/TestBench.java +++ b/tests/testbench/com/vaadin/tests/TestBench.java @@ -120,6 +120,7 @@ public class TestBench extends com.vaadin.Application.LegacyApplication lo.addComponent(menu); mainWindow.getPage().addListener(new Page.FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent source) { String fragment = source.getFragment(); if (fragment != null && !"".equals(fragment)) { @@ -238,6 +239,7 @@ public class TestBench extends com.vaadin.Application.LegacyApplication } // Handle menu selection and update body + @Override public void valueChange(Property.ValueChangeEvent event) { bodyLayout.removeAllComponents(); bodyLayout.setCaption(null); diff --git a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java index 0e49fdd8ae..d086e0a665 100644 --- a/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java +++ b/tests/testbench/com/vaadin/tests/TestCaptionWrapper.java @@ -4,11 +4,11 @@ package com.vaadin.tests; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ClassResource; import com.vaadin.terminal.ErrorMessage; import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.UserError; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; @@ -195,6 +195,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { layout.addComponent(c); } + @Override public void componentEvent(Event event) { final String feedback = eventListenerString + " source=" + event.getSource() + ", toString()=" + event.toString(); diff --git a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java index 3adaff93ea..e13b907f77 100644 --- a/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java +++ b/tests/testbench/com/vaadin/tests/TestComponentAddAndRecursion.java @@ -43,6 +43,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { Button b = new Button("use gridlayout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setContent(new GridLayout()); p2.setContent(new GridLayout()); @@ -53,6 +54,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("use orderedlayout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setContent(new VerticalLayout()); p2.setContent(new VerticalLayout()); @@ -63,6 +65,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("move B", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p2.addComponent(l2); } @@ -71,6 +74,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("move p", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p3.addComponent(p); } @@ -79,6 +83,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("add to both", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Label l = new Label("both"); p.addComponent(l); @@ -89,6 +94,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("recurse", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { p3.addComponent(p2); @@ -106,6 +112,7 @@ public class TestComponentAddAndRecursion extends CustomComponent { main.addComponent(b); b = new Button("recurse2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Panel p = new Panel("dynamic"); p.addComponent(p2); diff --git a/tests/testbench/com/vaadin/tests/TestContainerChanges.java b/tests/testbench/com/vaadin/tests/TestContainerChanges.java index b7f24abd8b..87251c0d65 100644 --- a/tests/testbench/com/vaadin/tests/TestContainerChanges.java +++ b/tests/testbench/com/vaadin/tests/TestContainerChanges.java @@ -70,6 +70,7 @@ public class TestContainerChanges extends CustomComponent { tbl2.setMultiSelect(false); tbl2.setImmediate(true); tbl2.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println("Value now " + event.getProperty().getValue()); @@ -85,6 +86,7 @@ public class TestContainerChanges extends CustomComponent { Button b = new Button("table.commit()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.commit(); } @@ -95,6 +97,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.addItem()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.addItem(new Integer(cnt++)); } @@ -104,6 +107,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.addItem(null)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.addItem(null); } @@ -113,6 +117,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.removeItem(table.lastItemId()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.removeItem(tbl.lastItemId()); } @@ -123,6 +128,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.addContainerProperty()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.addContainerProperty("prop" + cnt, String.class, "#" + cnt++); @@ -133,6 +139,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("indexedcontainer.clear()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cont.removeAllItems(); } @@ -142,6 +149,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("table.setContainerDataSource(indexedcontainer)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setContainerDataSource(cont); } @@ -151,6 +159,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("table.setContainerDataSource(orderedwrapper)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setContainerDataSource(ordered); } @@ -160,6 +169,7 @@ public class TestContainerChanges extends CustomComponent { b = new Button("table.setContainerDataSource(hierarchicalwrapper)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setContainerDataSource(hierarchical); } diff --git a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java index 67370039bb..eadc787ad8 100644 --- a/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/tests/testbench/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -30,6 +30,7 @@ public class TestForBasicApplicationLayout extends CustomComponent { click = new Button("Set height -1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tab.setHeight(null); } @@ -38,6 +39,7 @@ public class TestForBasicApplicationLayout extends CustomComponent { click2 = new Button("Set height 100%", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tab.setHeight(100, TabSheet.UNITS_PERCENTAGE); } diff --git a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java index e90231eefd..3852c5f13f 100644 --- a/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForChildComponentRendering.java @@ -53,6 +53,7 @@ public class TestForChildComponentRendering extends CustomComponent { se.addItem("Valinta 2"); Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -60,6 +61,7 @@ public class TestForChildComponentRendering extends CustomComponent { main.addComponent(b); b = new Button("reorder view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { randomReorder(); } @@ -68,6 +70,7 @@ public class TestForChildComponentRendering extends CustomComponent { b = new Button("remove randomly one component", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeRandomComponent(); } diff --git a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java index 92b7ae4f62..f3bd5ab227 100644 --- a/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java +++ b/tests/testbench/com/vaadin/tests/TestForContainerFilterable.java @@ -60,6 +60,7 @@ public class TestForContainerFilterable extends CustomComponent { // Handler filterButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ic.removeAllContainerFilters(); if (fooFilter.getValue().length() > 0) { @@ -77,6 +78,7 @@ public class TestForContainerFilterable extends CustomComponent { // Resetbutton lo.addComponent(new Button("Rebind table datasource", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { t.setContainerDataSource(ic); } diff --git a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java index 6adcf49ec6..982c86781c 100644 --- a/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java @@ -54,6 +54,7 @@ public class TestForGridLayoutChildComponentRendering extends CustomComponent { main.addComponent(se, 0, 1, 1, 1); Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -61,6 +62,7 @@ public class TestForGridLayoutChildComponentRendering extends CustomComponent { main.addComponent(b); b = new Button("reorder view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { randomReorder(); } @@ -69,6 +71,7 @@ public class TestForGridLayoutChildComponentRendering extends CustomComponent { b = new Button("remove randomly one component", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeRandomComponent(); } diff --git a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java index e192d2738d..17c118803b 100644 --- a/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java +++ b/tests/testbench/com/vaadin/tests/TestForMultipleStyleNames.java @@ -65,6 +65,7 @@ public class TestForMultipleStyleNames extends CustomComponent implements } + @Override public void valueChange(ValueChangeEvent event) { final String currentStyle = l.getStyleName(); diff --git a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java index 8e4ec17738..ea66ed1ab2 100644 --- a/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForNativeWindowing.java @@ -8,7 +8,7 @@ import java.net.MalformedURLException; import java.net.URL; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -26,6 +26,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { main.addComponent(new Button("Add new subwindow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window w = new Window("sw " + System.currentTimeMillis()); @@ -40,6 +41,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { final Button closebutton = new Button("Close " + w.getCaption(), new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.removeWindow(w); } @@ -78,6 +80,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { main.addComponent(new Button( "Open a currently uncreated application level window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { main.open( @@ -114,6 +117,7 @@ public class TestForNativeWindowing extends Application.LegacyApplication { ww.addComponent(new Button("Click me", new Button.ClickListener() { int state = 0; + @Override public void buttonClick(ClickEvent event) { ww.addComponent(new Label("Button clicked " + (++state) + " times")); diff --git a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java index 74fdb0c35f..9a41d719d4 100644 --- a/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java +++ b/tests/testbench/com/vaadin/tests/TestForPreconfiguredComponents.java @@ -91,6 +91,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements main.addComponent(test); final Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -146,6 +147,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements final Panel status = new Panel("Events"); final Button clear = new Button("clear event log"); clear.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { status.removeAllComponents(); status.addComponent(ol2); @@ -162,6 +164,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements ol.addComponent(status); t.addListener(new Listener() { + @Override public void componentEvent(Event event) { status.addComponent(new Label(event.getClass().getName())); // TODO should not use Field.toString() @@ -173,10 +176,12 @@ public class TestForPreconfiguredComponents extends CustomComponent implements return ol; } + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == actions[1]) { al.addComponent(new Label("Delete selected on " + target)); diff --git a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java index 992222cb9a..417dde71c8 100644 --- a/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java +++ b/tests/testbench/com/vaadin/tests/TestForRichTextEditor.java @@ -7,7 +7,7 @@ package com.vaadin.tests; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CustomComponent; @@ -53,6 +53,7 @@ public class TestForRichTextEditor extends CustomComponent implements b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { rte.setEnabled(!rte.isEnabled()); } @@ -61,6 +62,7 @@ public class TestForRichTextEditor extends CustomComponent implements } + @Override public void valueChange(ValueChangeEvent event) { l.setValue(rte.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java index 1fc20fe3e2..2526941ed1 100644 --- a/tests/testbench/com/vaadin/tests/TestForStyledUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForStyledUpload.java @@ -15,8 +15,8 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import com.vaadin.Application; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.StreamResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -70,6 +70,7 @@ public class TestForStyledUpload extends Application.LegacyApplication up.addListener(new Upload.ProgressListener() { + @Override public void updateProgress(long readBytes, long contentLenght) { pi.setValue(new Float(readBytes / (float) contentLenght)); @@ -83,6 +84,7 @@ public class TestForStyledUpload extends Application.LegacyApplication final Button b = new Button("Update status", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { readState(); } @@ -90,6 +92,7 @@ public class TestForStyledUpload extends Application.LegacyApplication final Button c = new Button("Update status with gc", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gc(); } @@ -112,6 +115,7 @@ public class TestForStyledUpload extends Application.LegacyApplication Button cancel = new Button("Cancel current upload"); cancel.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { buffer.cancel(); } @@ -122,6 +126,7 @@ public class TestForStyledUpload extends Application.LegacyApplication final Button restart = new Button("Restart demo application"); restart.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TestForStyledUpload.this.close(); } @@ -156,6 +161,7 @@ public class TestForStyledUpload extends Application.LegacyApplication refreshMemUsage(); } + @Override public void uploadFinished(FinishedEvent event) { status.removeAllComponents(); final InputStream stream = buffer.getStream(); @@ -208,6 +214,7 @@ public class TestForStyledUpload extends Application.LegacyApplication up.interruptUpload(); } + @Override public InputStream getStream() { if (file == null) { return null; @@ -225,6 +232,7 @@ public class TestForStyledUpload extends Application.LegacyApplication /** * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String, String) */ + @Override public OutputStream receiveUpload(String filename, String MIMEType) { fileName = filename; mimeType = MIMEType; @@ -242,6 +250,7 @@ public class TestForStyledUpload extends Application.LegacyApplication * * @return String */ + @Override public String getFileName() { return fileName; } @@ -257,11 +266,13 @@ public class TestForStyledUpload extends Application.LegacyApplication } + @Override public void uploadFailed(FailedEvent event) { pi.setVisible(false); l.setValue("Upload was interrupted"); } + @Override public void uploadSucceeded(SucceededEvent event) { pi.setVisible(false); l.setValue("Finished upload, idle"); @@ -280,6 +291,7 @@ public class TestForStyledUpload extends Application.LegacyApplication } + @Override public void uploadStarted(StartedEvent event) { pi.setVisible(true); l.setValue("Started uploading file " + event.getFilename()); diff --git a/tests/testbench/com/vaadin/tests/TestForTabSheet.java b/tests/testbench/com/vaadin/tests/TestForTabSheet.java index 938bf43115..d180bd4be3 100644 --- a/tests/testbench/com/vaadin/tests/TestForTabSheet.java +++ b/tests/testbench/com/vaadin/tests/TestForTabSheet.java @@ -32,6 +32,7 @@ public class TestForTabSheet extends CustomComponent implements tabsheet.addTab(tab3_root, "Third tab", null); } + @Override public void buttonClick(ClickEvent event) { System.out.println("tab2=" + tab2_root.isEnabled() + " tab3=" + tab3_root.isEnabled()); @@ -39,6 +40,7 @@ public class TestForTabSheet extends CustomComponent implements tab3_root.setEnabled(true); } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { /* * Cast to a TabSheet. This isn't really necessary in this example, as diff --git a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java index 48c056ff58..a8d42184a0 100644 --- a/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java +++ b/tests/testbench/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java @@ -103,6 +103,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); final Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -125,6 +126,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends } Button button = new Button("b", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { System.out.println("b click"); diff --git a/tests/testbench/com/vaadin/tests/TestForTrees.java b/tests/testbench/com/vaadin/tests/TestForTrees.java index 37030a25c2..24d6102f80 100644 --- a/tests/testbench/com/vaadin/tests/TestForTrees.java +++ b/tests/testbench/com/vaadin/tests/TestForTrees.java @@ -87,6 +87,7 @@ public class TestForTrees extends CustomComponent implements Handler { contextTree = t; final Button b = new Button("refresh view", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createNewView(); } @@ -131,6 +132,7 @@ public class TestForTrees extends CustomComponent implements Handler { final Panel status = new Panel("Events"); final Button clear = new Button("c"); clear.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { status.removeAllComponents(); status.addComponent(clear); @@ -144,6 +146,7 @@ public class TestForTrees extends CustomComponent implements Handler { ol.addComponent(status); t.addListener(new Listener() { + @Override public void componentEvent(Event event) { status.addComponent(new Label(event.getClass().getName())); // TODO should not use Field.toString() @@ -155,10 +158,12 @@ public class TestForTrees extends CustomComponent implements Handler { return ol; } + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == actions[1]) { al.addComponent(new Label("Delete selected on " + target)); diff --git a/tests/testbench/com/vaadin/tests/TestForUpload.java b/tests/testbench/com/vaadin/tests/TestForUpload.java index c254198add..cfb40fc854 100644 --- a/tests/testbench/com/vaadin/tests/TestForUpload.java +++ b/tests/testbench/com/vaadin/tests/TestForUpload.java @@ -17,8 +17,8 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.StreamResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -95,6 +95,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new Listener() { private static final long serialVersionUID = -8319074730512324303L; + @Override public void componentEvent(Event event) { // print out all events fired by upload for debug purposes System.out.println("Upload fired event | " + event); @@ -104,6 +105,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new StartedListener() { private static final long serialVersionUID = 5508883803861085154L; + @Override public void uploadStarted(StartedEvent event) { pi.setVisible(true); pi2.setVisible(true); @@ -117,6 +119,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new Upload.FinishedListener() { private static final long serialVersionUID = -3773034195991947371L; + @Override public void uploadFinished(FinishedEvent event) { pi.setVisible(false); pi2.setVisible(false); @@ -156,6 +159,7 @@ public class TestForUpload extends CustomComponent implements up.addListener(new Upload.ProgressListener() { + @Override public void updateProgress(long readBytes, long contentLenght) { pi2.setValue(new Float(readBytes / (float) contentLenght)); @@ -166,12 +170,14 @@ public class TestForUpload extends CustomComponent implements final Button b = new Button("Reed state from upload", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { readState(); } }); final Button c = new Button("Force GC", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gc(); } @@ -183,6 +189,7 @@ public class TestForUpload extends CustomComponent implements main.addComponent(throwExecption); main.addComponent(interrupt); interrupt.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { up.interruptUpload(); } @@ -195,6 +202,7 @@ public class TestForUpload extends CustomComponent implements uploadBufferSelector.addItem("tempfile"); uploadBufferSelector .addListener(new AbstractField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setBuffer(); } @@ -222,6 +230,7 @@ public class TestForUpload extends CustomComponent implements final Button restart = new Button("R"); restart.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getApplication().close(); } @@ -280,6 +289,7 @@ public class TestForUpload extends CustomComponent implements } + @Override public InputStream getStream() { if (outputBuffer == null) { return null; @@ -290,6 +300,7 @@ public class TestForUpload extends CustomComponent implements /** * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String, String) */ + @Override public OutputStream receiveUpload(String filename, String MIMEType) { fileName = filename; mimeType = MIMEType; @@ -310,6 +321,7 @@ public class TestForUpload extends CustomComponent implements * * @return String */ + @Override public String getFileName() { return fileName; } @@ -344,6 +356,7 @@ public class TestForUpload extends CustomComponent implements } + @Override public InputStream getStream() { if (file == null) { return null; @@ -360,6 +373,7 @@ public class TestForUpload extends CustomComponent implements /** * @see com.vaadin.ui.Upload.Receiver#receiveUpload(String, String) */ + @Override public OutputStream receiveUpload(String filename, String MIMEType) { fileName = filename; mimeType = MIMEType; @@ -387,6 +401,7 @@ public class TestForUpload extends CustomComponent implements * * @return String */ + @Override public String getFileName() { return fileName; } @@ -402,6 +417,7 @@ public class TestForUpload extends CustomComponent implements } + @Override public void updateProgress(long readBytes, long contentLenght) { pi.setValue(new Float(readBytes / (float) contentLenght)); diff --git a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java index 75395f0d5c..761d9bc106 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowOpen.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowOpen.java @@ -21,6 +21,7 @@ public class TestForWindowOpen extends CustomComponent { main.addComponent(new Button("Open in this window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); @@ -33,6 +34,7 @@ public class TestForWindowOpen extends CustomComponent { main.addComponent(new Button("Open in target \"mytarget\"", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); @@ -45,6 +47,7 @@ public class TestForWindowOpen extends CustomComponent { main.addComponent(new Button("Open in target \"secondtarget\"", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final ExternalResource r = new ExternalResource( "http://www.google.com"); diff --git a/tests/testbench/com/vaadin/tests/TestForWindowing.java b/tests/testbench/com/vaadin/tests/TestForWindowing.java index b9e14608f5..bbd523c0fd 100644 --- a/tests/testbench/com/vaadin/tests/TestForWindowing.java +++ b/tests/testbench/com/vaadin/tests/TestForWindowing.java @@ -37,6 +37,7 @@ public class TestForWindowing extends CustomComponent { final Button create = new Button("Create a new window", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window w = new Window("Testing Window"); @@ -59,6 +60,7 @@ public class TestForWindowing extends CustomComponent { s1.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String v = (String) event.getProperty() .getValue(); diff --git a/tests/testbench/com/vaadin/tests/TestIFrames.java b/tests/testbench/com/vaadin/tests/TestIFrames.java index ccddc7f557..48c4027a79 100644 --- a/tests/testbench/com/vaadin/tests/TestIFrames.java +++ b/tests/testbench/com/vaadin/tests/TestIFrames.java @@ -4,7 +4,7 @@ package com.vaadin.tests; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java index a46253598f..064a04847a 100644 --- a/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/tests/testbench/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -50,6 +50,7 @@ public class TestSetVisibleAndCaching extends selectPanel(selectedPanel); buttonNextPanel.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectedPanel++; if (selectedPanel > 2) { diff --git a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java index a9005e7fd3..50028137df 100644 --- a/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java +++ b/tests/testbench/com/vaadin/tests/TestSizeableIncomponents.java @@ -56,6 +56,7 @@ public class TestSizeableIncomponents extends Application.LegacyApplication { prev = new Button("<<-|"); prev.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object cur = select.getValue(); Testable prev = (Testable) cont.prevItemId(cur); @@ -71,6 +72,7 @@ public class TestSizeableIncomponents extends Application.LegacyApplication { }); next = new Button("|->>"); next.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object cur = select.getValue(); Testable next = (Testable) cont.nextItemId(cur); @@ -93,6 +95,7 @@ public class TestSizeableIncomponents extends Application.LegacyApplication { select.setContainerDataSource(cont); select.addListener(new ComboBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Testable t = (Testable) select.getValue(); if (t != null) { diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystem.java b/tests/testbench/com/vaadin/tests/TreeFilesystem.java index e451d2ced7..f43bcfb576 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystem.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystem.java @@ -7,7 +7,7 @@ package com.vaadin.tests; import java.io.File; import com.vaadin.data.Item; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.util.SampleDirectory; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; @@ -60,6 +60,7 @@ public class TreeFilesystem extends com.vaadin.Application.LegacyApplication * Handle tree expand event, populate expanded node's childs with new files * and directories. */ + @Override public void nodeExpand(ExpandEvent event) { final Item i = tree.getItem(event.getItemId()); if (!tree.hasChildren(i)) { diff --git a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java index 1b32a35a38..2458f2dfa1 100644 --- a/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java +++ b/tests/testbench/com/vaadin/tests/TreeFilesystemContainer.java @@ -80,6 +80,7 @@ public class TreeFilesystemContainer extends * Listener for any component events. This class has been registered as an * listener for component fsTree. */ + @Override public void componentEvent(Event event) { // Check if event occured at fsTree component if (event.getSource() == filesystem) { diff --git a/tests/testbench/com/vaadin/tests/UpgradingSample.java b/tests/testbench/com/vaadin/tests/UpgradingSample.java index 0db63ca789..3090962b71 100644 --- a/tests/testbench/com/vaadin/tests/UpgradingSample.java +++ b/tests/testbench/com/vaadin/tests/UpgradingSample.java @@ -94,6 +94,7 @@ public class UpgradingSample extends Application.LegacyApplication implements } // Handle menu selection and update visible page + @Override public void valueChange(Property.ValueChangeEvent event) { layout.removeComponent(1, 0); final String title = (String) menu.getValue(); @@ -116,6 +117,7 @@ public class UpgradingSample extends Application.LegacyApplication implements private final Button loginButton = new Button("Enter", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { login(); } @@ -127,6 +129,7 @@ public class UpgradingSample extends Application.LegacyApplication implements private final Button logoutButton = new Button("Logout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { close(); } @@ -163,6 +166,7 @@ public class UpgradingSample extends Application.LegacyApplication implements } // Update login status on application user change events + @Override public void applicationUserChanged(Application.UserChangeEvent event) { updateStatus(); } diff --git a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java index 54a7d3d080..94635d17c4 100644 --- a/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingCustomNewItemHandlerInSelect.java @@ -51,6 +51,7 @@ public class UsingCustomNewItemHandlerInSelect extends CustomComponent { } public class MyNewItemHandler implements AbstractSelect.NewItemHandler { + @Override public void addNewItem(String newItemCaption) { // here could be db insert or other backend operation Integer id = new Integer(sequence++); diff --git a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java index 13918ace90..db17148549 100644 --- a/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java +++ b/tests/testbench/com/vaadin/tests/UsingObjectsInSelect.java @@ -9,7 +9,7 @@ import java.util.Random; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.Root.LegacyWindow; @@ -60,6 +60,7 @@ public class UsingObjectsInSelect extends } } + @Override public void valueChange(ValueChangeEvent event) { final Task task = (Task) select.getValue(); selectedTask.setValue("<b>Type:</b> " + task.getType() diff --git a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java index 58faec35f0..fbf9e7b46e 100644 --- a/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java +++ b/tests/testbench/com/vaadin/tests/appengine/GAESyncTest.java @@ -59,6 +59,7 @@ public class GAESyncTest extends Application.LegacyApplication { tf = new TextField("Echo thingie"); tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { IntrWindow.this.showNotification((String) event .getProperty().getValue()); @@ -73,6 +74,7 @@ public class GAESyncTest extends Application.LegacyApplication { { Button b = new Button("Slow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { Thread.sleep(15000); @@ -89,6 +91,7 @@ public class GAESyncTest extends Application.LegacyApplication { { Button b = new Button("Add", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (getRoot() == getMainWindow()) { getRoot().getPage().showNotification( diff --git a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java index ce41a895c4..cfbb4045a2 100644 --- a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.application; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.gwt.server.WebApplicationContext; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; @@ -27,6 +27,7 @@ public class ApplicationCloseTest extends TestBase { Label thisApp = new Label("This applications: " + this); Button close = new Button("Close this", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { event.getButton().getApplication().close(); } diff --git a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java index fcc4e26b55..690df3f360 100644 --- a/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java +++ b/tests/testbench/com/vaadin/tests/application/ErrorInUnloadEvent.java @@ -50,6 +50,7 @@ public class ErrorInUnloadEvent extends AbstractTestCase { mainWindow.setContent(formLayout); login.addListener(new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { String username = userField.getValue(); String password = passwordField.getValue(); @@ -81,6 +82,7 @@ public class ErrorInUnloadEvent extends AbstractTestCase { header.addComponent(title); Button logout = new Button("Logout"); logout.addListener(new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { setUser(null); showLoginWindow(); diff --git a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java index f2ae7a3891..4a029e3373 100644 --- a/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java +++ b/tests/testbench/com/vaadin/tests/application/TerminalErrorNotification.java @@ -16,6 +16,7 @@ public class TerminalErrorNotification extends TestBase { Button button = new Button("Throw exception", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new RuntimeException("You asked for it"); } diff --git a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java index fd65adf209..def68a7357 100644 --- a/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java +++ b/tests/testbench/com/vaadin/tests/application/ThreadLocalInstances.java @@ -61,6 +61,7 @@ public class ThreadLocalInstances extends AbstractTestApplication { mainWindow.addComponent(log); mainWindow.addComponent(new Embedded("Icon", resource)); mainWindow.addComponent(new Button("Sync", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { reportCurrentStatus("button listener"); } @@ -92,8 +93,7 @@ public class ThreadLocalInstances extends AbstractTestApplication { } private void reportCurrentStatus(String phase) { - reportStatus(phase, Application.getCurrent(), - Root.getCurrent()); + reportStatus(phase, Application.getCurrent(), Root.getCurrent()); } private void reportStatus(String phase, Application application, Root root) { diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java index a3f11f2cd3..817acf20b5 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserSizeTest.java @@ -18,6 +18,7 @@ public class WebBrowserSizeTest extends TestBase { final Button update = new Button("Refresh", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { screenSizeLabel.setValue(getBrowser().getScreenWidth() + " x " + getBrowser().getScreenHeight()); diff --git a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java index 35235bbe1f..004c8f1c91 100644 --- a/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java +++ b/tests/testbench/com/vaadin/tests/application/WebBrowserTest.java @@ -38,6 +38,7 @@ public class WebBrowserTest extends TestBase { final Button update = new Button("Get TimeZone from browser", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TimeZone hkiTZ = TimeZone .getTimeZone("Europe/Helsinki"); diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java index 17ac74e5a3..abcdf232cd 100644 --- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java +++ b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java @@ -22,6 +22,7 @@ public class ChangeSessionId extends AbstractTestCase { mainWindow.addComponent(new Button("Show session id", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { logSessionId(); } @@ -29,6 +30,7 @@ public class ChangeSessionId extends AbstractTestCase { setMainWindow(mainWindow); loginButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { WebApplicationContext context = ((WebApplicationContext) getContext()); diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java b/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java index 8723e23a2a..f1730ed5f5 100644 --- a/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java +++ b/tests/testbench/com/vaadin/tests/applicationcontext/RemoveTransactionListener.java @@ -15,10 +15,12 @@ public class RemoveTransactionListener extends TestBase { // Add one listener that will remove itself from within transactionEnd getMainWindow().getApplication().getContext() .addTransactionListener(new TransactionListener() { + @Override public void transactionStart(Application application, Object transactionData) { } + @Override public void transactionEnd(Application application, Object transactionData) { removeListener(this); @@ -29,12 +31,14 @@ public class RemoveTransactionListener extends TestBase { // Add one listener that will remove itself from within transactionStart getMainWindow().getApplication().getContext() .addTransactionListener(new TransactionListener() { + @Override public void transactionStart(Application application, Object transactionData) { removeListener(this); log.log("Listener removed in transactionStart"); } + @Override public void transactionEnd(Application application, Object transactionData) { } @@ -45,11 +49,13 @@ public class RemoveTransactionListener extends TestBase { // ignored getMainWindow().getApplication().getContext() .addTransactionListener(new TransactionListener() { + @Override public void transactionStart(Application application, Object transactionData) { log.log("transactionStart from last listener"); } + @Override public void transactionEnd(Application application, Object transactionData) { log.log("transactionEnd from last listener"); diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java index 6e9e4e8930..be3b7760f2 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentContainerTest.java @@ -29,6 +29,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private String CATEGORY_COMPONENT_CONTAINER_FEATURES = "Component container features"; private Command<T, ComponentSize> addButtonCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { Button b = new Button("A button"); c.addComponent(b); @@ -38,6 +39,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, ComponentSize> addNativeButtonCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { NativeButton b = new NativeButton("Native button"); c.addComponent(b); @@ -46,6 +48,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addTextAreaCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { TextArea ta = new TextArea(); c.addComponent(ta); @@ -54,6 +57,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addRichTextAreaCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { RichTextArea ta = new RichTextArea(); c.addComponent(ta); @@ -62,6 +66,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addTextFieldCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { TextField tf = new TextField(); c.addComponent(tf); @@ -70,6 +75,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addInlineDateFieldCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { InlineDateField tf = new InlineDateField(); c.addComponent(tf); @@ -77,6 +83,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent } }; private Command<T, ComponentSize> addPopupDateFieldCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { PopupDateField tf = new PopupDateField(); c.addComponent(tf); @@ -85,6 +92,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addVerticalSplitPanelCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { VerticalSplitPanel vsp = new VerticalSplitPanel(); c.addComponent(vsp); @@ -93,6 +101,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addHorizontalSplitPanelCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { HorizontalSplitPanel vsp = new HorizontalSplitPanel(); c.addComponent(vsp); @@ -101,6 +110,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, ComponentSize> addTabSheetCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { TabSheet ts = createTabSheet(); c.addComponent(ts); @@ -110,6 +120,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, ComponentSize> addTableCommand = new Command<T, ComponentSize>() { + @Override public void execute(T c, ComponentSize size, Object data) { Table t = createTable(); c.addComponent(t); @@ -117,12 +128,14 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent } }; private Command<T, Object> removeAllComponentsCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.removeAllComponents(); } }; private Command<T, Integer> removeComponentByIndexCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { Component child = getComponentAtIndex(c, value); c.removeComponent(child); @@ -131,6 +144,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent }; private Command<T, Boolean> componentAttachListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ComponentAttachListener) AbstractComponentContainerTest.this); @@ -142,6 +156,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, Boolean> componentDetachListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ComponentDetachListener) AbstractComponentContainerTest.this); @@ -153,6 +168,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, Integer> setComponentHeight = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { Component child = getComponentAtIndex(c, value); child.setHeight((String) data); @@ -162,6 +178,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent private Command<T, Integer> setComponentWidth = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { Component child = getComponentAtIndex(c, value); child.setWidth((String) data); @@ -348,6 +365,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent } + @Override public void componentDetachedFromContainer(ComponentDetachEvent event) { log(event.getClass().getSimpleName() + ": " + event.getDetachedComponent().getClass().getSimpleName() @@ -355,6 +373,7 @@ public abstract class AbstractComponentContainerTest<T extends AbstractComponent + event.getContainer().getClass().getSimpleName()); } + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { log(event.getClass().getSimpleName() + ": " + event.getAttachedComponent().getClass().getSimpleName() diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java index 60ce941565..38bba7721c 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTest.java @@ -120,6 +120,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> MenuItem showEventLog = settingsMenu.addItem("Show event log", new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { boolean selected = !isSelected(selectedItem); setLogVisible(selected); @@ -131,6 +132,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> settingsMenu.addItem("Clear log", new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { log.clear(); } @@ -140,6 +142,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> MenuItem layoutHeight = layoutSize.addItem("Height", null); for (final String name : sizeOptions.keySet()) { layoutWidth.addItem(name, new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { getTestComponents().get(0).getParent() .setWidth(sizeOptions.get(name)); @@ -147,6 +150,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> } }); layoutHeight.addItem(name, new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { getTestComponents().get(0).getParent() .setHeight(sizeOptions.get(name)); @@ -243,6 +247,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> protected Command<T, Boolean> focusListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { ((FocusNotifier) c).addListener(AbstractComponentTest.this); @@ -253,6 +258,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> }; protected Command<T, Boolean> blurListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { ((BlurNotifier) c).addListener(AbstractComponentTest.this); @@ -469,6 +475,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> final Object data) { return new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { boolean selected = !isSelected(selectedItem); doCommand(getText(selectedItem), booleanCommand, selected, data); @@ -483,6 +490,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> final DATATYPE value, final Object data) { return new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { doCommand(getText(selectedItem), command, value, data); } @@ -506,6 +514,7 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> final com.vaadin.tests.components.ComponentTestCase.Command<T, VALUETYPE> cmd, final VALUETYPE object, final Object data) { return new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { doCommand(getText(selectedItem), cmd, object, data); @@ -722,10 +731,12 @@ public abstract class AbstractComponentTest<T extends AbstractComponent> } + @Override public void focus(FocusEvent event) { log(event.getClass().getSimpleName()); } + @Override public void blur(BlurEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java index 57a32aafc4..d8ae43fd6d 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractComponentTestCase.java @@ -71,12 +71,14 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, String> widthCommand = new Command<T, String>() { + @Override public void execute(T t, String value, Object data) { t.setWidth(value); } }; protected Command<T, String> heightCommand = new Command<T, String>() { + @Override public void execute(T t, String value, Object data) { t.setHeight(value); } @@ -84,6 +86,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> enabledCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { c.setEnabled(enabled); } @@ -91,6 +94,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> immediateCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean immediate, Object data) { c.setImmediate(immediate); } @@ -98,6 +102,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> errorIndicatorCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { if (enabled) { c.setComponentError(new UserError(errorMessage)); @@ -111,6 +116,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, String> errorMessageCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { errorMessage = value; if (c.getComponentError() != null) { @@ -124,6 +130,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> // TODO Move to AbstractFieldTestCase protected Command<T, Boolean> requiredCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { if (c instanceof Field) { ((Field<?>) c).setRequired(enabled); @@ -135,6 +142,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> }; protected Command<T, String> requiredErrorMessageCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { ((Field<?>) c).setRequiredError(value); } @@ -142,6 +150,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> }; protected Command<T, String> descriptionCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setDescription(value); } @@ -149,6 +158,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> readonlyCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { c.setReadOnly(enabled); } @@ -156,6 +166,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Boolean> visibleCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean enabled, Object data) { c.setVisible(enabled); } @@ -163,6 +174,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Resource> iconCommand = new Command<T, Resource>() { + @Override public void execute(T c, Resource value, Object data) { c.setIcon(value); } @@ -170,6 +182,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> }; protected Command<T, String> captionCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setCaption(value); } @@ -178,6 +191,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> protected Command<T, Locale> localeCommand = new Command<T, Locale>() { + @Override public void execute(T c, Locale value, Object data) { c.setLocale(value); } @@ -206,6 +220,7 @@ public abstract class AbstractComponentTestCase<T extends AbstractComponent> } protected Command<T, String> styleNameCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setStyleName(value); } diff --git a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java b/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java index 5c25359e28..af62e5e4a4 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractLayoutTest.java @@ -15,6 +15,7 @@ public abstract class AbstractLayoutTest<T extends AbstractLayout> extends protected static final String CATEGORY_LAYOUT_FEATURES = "Layout features"; private Command<T, MarginInfo> marginCommand = new Command<T, MarginInfo>() { + @Override public void execute(T c, MarginInfo value, Object data) { c.setMargin(value); @@ -22,6 +23,7 @@ public abstract class AbstractLayoutTest<T extends AbstractLayout> extends }; protected Command<T, Boolean> spacingCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { ((SpacingHandler) c).setSpacing(value); } @@ -29,6 +31,7 @@ public abstract class AbstractLayoutTest<T extends AbstractLayout> extends private Command<T, Integer> setComponentAlignment = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object alignment) { Component child = getComponentAtIndex(c, value); ((AlignmentHandler) c).setComponentAlignment(child, diff --git a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java b/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java index fd323d2156..1d18cba952 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractOrderedLayoutTest.java @@ -12,6 +12,7 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout> private Command<T, Boolean> layoutClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((LayoutClickListener) AbstractOrderedLayoutTest.this); @@ -24,6 +25,7 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout> private Command<T, Integer> setComponentExpandRatio = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object ratio) { Component child = getComponentAtIndex(c, value); c.setExpandRatio(child, (Float) ratio); @@ -74,6 +76,7 @@ public abstract class AbstractOrderedLayoutTest<T extends AbstractOrderedLayout> } + @Override public void layoutClick(LayoutClickEvent event) { log(event.getClass().getSimpleName() + ": button=" + event.getButtonName() + ", childComponent=" diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java b/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java index 875d2b1df8..d20f7a4a21 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractTestRoot.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components; import com.vaadin.Application; import com.vaadin.service.ApplicationContext; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.Component; @@ -57,8 +57,7 @@ public abstract class AbstractTestRoot extends Root { protected abstract Integer getTicketNumber(); protected WebBrowser getBrowser() { - ApplicationContext context = Application.getCurrent() - .getContext(); + ApplicationContext context = Application.getCurrent().getContext(); if (context instanceof AbstractWebApplicationContext) { AbstractWebApplicationContext webContext = (AbstractWebApplicationContext) context; return webContext.getBrowser(); diff --git a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html b/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html new file mode 100644 index 0000000000..512140cc6d --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.html @@ -0,0 +1,456 @@ +<?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="http://localhost:8888/" /> +<title>AddRemoveSetStyleNamesTest</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">AddRemoveSetStyleNamesTest</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>run/com.vaadin.tests.components.AddRemoveSetStyleNamesTest?restartApplication</td> + <td></td> +</tr> +<!--add style 1. assert style1--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<!--add style 2. assert style1, style2--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style2</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style2</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style2</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style2</td> +</tr> +<!--remove style 1. assertNot style1. assert style2--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style2</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style2</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style2</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style2</td> +</tr> +<!--remove style 2. assertNot style1, style2--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[1]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style2</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style2</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style2</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style2</td> +</tr> +<!--add style1. set thestyle. assertNot style1. assert thestyle.--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>thestyle</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-thestyle</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-thestyle</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>thestyle</td> +</tr> +<!--remove thestyle. assertNot thestyle--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>thestyle</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-thestyle</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-thestyle</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>thestyle</td> +</tr> +<!--set thestyle. add style1. assert thestyle, style1--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>thestyle</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-thestyle</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-thestyle</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>thestyle</td> +</tr> +<!--remove style 1. assertNot style1. assert thestyle--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-thestyle</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>thestyle</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-thestyle</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>thestyle</td> +</tr> +<!--add style 1. remove thestyle. assertNot style1, thestyle--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VButton[2]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>v-datefield-thestyle</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]</td> + <td>thestyle</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::/VVerticalLayout[0]/VVerticalLayout[0]/VPopupCalendar[0]#popupButton</td> + <td></td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-style1</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>style1</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>v-datefield-popup-thestyle</td> +</tr> +<tr> + <td>assertNotCSSClass</td> + <td>vaadin=runcomvaadintestscomponentsAddRemoveSetStyleNamesTest::Root/VOverlay[0]</td> + <td>thestyle</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java b/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java new file mode 100644 index 0000000000..926af72a2f --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/AddRemoveSetStyleNamesTest.java @@ -0,0 +1,83 @@ +package com.vaadin.tests.components; + +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.PopupDateField; + +public class AddRemoveSetStyleNamesTest extends TestBase { + + private String style1 = "style1"; + private String style2 = "style2"; + private String thestyle = "thestyle"; + + private PopupDateField popupDateField; + private Button button1; + private Button button2; + private Button button3; + + private Button.ClickListener listener; + + @Override + protected void setup() { + popupDateField = new PopupDateField("PopupDateField"); + popupDateField.setRequired(true); + popupDateField.setRequiredError("abcd"); + addComponent(popupDateField); + + listener = new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + String style = (String) event.getButton().getData(); + setComponentsStyle(style, !popupDateField.getStyleName() + .contains(style), event.getButton()); + } + }; + + button1 = new Button("Add style1", listener); + button1.setData(style1); + addComponent(button1); + + button2 = new Button("Add style2", listener); + button2.setData(style2); + addComponent(button2); + + button3 = new Button("Set thestyle", new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + if (popupDateField.getStyleName().contains(thestyle)) { + popupDateField.removeStyleName(thestyle); + button3.setCaption("Set thestyle"); + } else { + popupDateField.setStyleName(thestyle); + button1.setCaption("Add style1"); + button2.setCaption("Add style2"); + button3.setCaption("Remove thestyle"); + } + } + }); + addComponent(button3); + } + + private void setComponentsStyle(String style, boolean add, Button button) { + if (add) { + popupDateField.addStyleName(style); + button.setCaption("Remove " + style); + } else { + popupDateField.removeStyleName(style); + button.setCaption("Add " + style); + } + } + + @Override + protected String getDescription() { + return "If a widget has set multiple css class names, AbtractComponentConnector.getStyleNames() removes all but first one of them. This is not acceptable, because we should be able to create connector for any existing GWT component and thus we do not know it it depends on multiple css class names."; + } + + @Override + protected Integer getTicketNumber() { + return 8664; + } + +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java index a2c186df7e..e949d62f71 100644 --- a/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/ComponentTestCase.java @@ -114,6 +114,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends CheckBox checkBox = new CheckBox(caption); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean enabled = (Boolean) event.getProperty().getValue(); doCommand(command, enabled); @@ -136,6 +137,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends Button button = new Button(caption); button.setData(Boolean.FALSE); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); boolean state = (Boolean) b.getData(); @@ -163,6 +165,7 @@ public abstract class ComponentTestCase<T extends AbstractComponent> extends select.setNullSelectionAllowed(false); select.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object itemId = event.getProperty().getValue(); Item item = select.getItem(itemId); diff --git a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java index 57b81ddecc..9fe13c457a 100644 --- a/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java +++ b/tests/testbench/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java @@ -57,6 +57,7 @@ public class CustomComponentwithUndefinedSize extends TestBase { Button button = new Button("Change panel size", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { switch (step++ % 4) { case 0: diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java b/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java index aa83ff7a42..cd284224a0 100644 --- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java +++ b/tests/testbench/com/vaadin/tests/components/DisableEnableCascade.java @@ -33,6 +33,7 @@ public class DisableEnableCascade extends TestBase { enableDisablePanelButton = new Button("Disable panel", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(outerPanel, enableDisablePanelButton); @@ -42,6 +43,7 @@ public class DisableEnableCascade extends TestBase { enableDisableTabSheetButton = new Button("Disable TabSheet", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(innerTabsheet, enableDisableTabSheetButton); @@ -52,6 +54,7 @@ public class DisableEnableCascade extends TestBase { enableDisableButtonButton = new Button("Disable Button", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(button, enableDisableButtonButton); diff --git a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java b/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java index f3391afd1f..0279a92437 100644 --- a/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java +++ b/tests/testbench/com/vaadin/tests/components/DisableEnableCascadeStyles.java @@ -55,6 +55,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisablePanelButton = new Button("Disable panel", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(outerPanel, enableDisablePanelButton); @@ -64,6 +65,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisableTabSheetButton = new Button("Disable TabSheet", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(innerTabsheet, enableDisableTabSheetButton); @@ -74,6 +76,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisableLayoutButton = new Button("Disable Tab content (Layout)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { enableDisable(layout, enableDisableLayoutButton); @@ -82,6 +85,7 @@ public class DisableEnableCascadeStyles extends TestBase { enableDisableComponentsButton = new Button("Disable Layout Components", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (Iterator<Component> i = layout .getComponentIterator(); i.hasNext();) { diff --git a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java index 267807b16b..7987c800f9 100644 --- a/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java +++ b/tests/testbench/com/vaadin/tests/components/FocusAndBlurListeners.java @@ -23,6 +23,7 @@ public class FocusAndBlurListeners extends TestBase { private FocusListener focusListener = new FocusListener() { + @Override public void focus(FocusEvent event) { Label msg = new Label(new Date() + " Focused " + event.getComponent().getCaption()); @@ -31,6 +32,7 @@ public class FocusAndBlurListeners extends TestBase { }; private BlurListener blurListener = new BlurListener() { + @Override public void blur(BlurEvent event) { Label msg = new Label(new Date() + " Blurred " + event.getComponent().getCaption()); @@ -74,6 +76,7 @@ public class FocusAndBlurListeners extends TestBase { private int i; + @Override public void buttonClick(ClickEvent event) { ogm.addItem("newItem" + i++); diff --git a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java b/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java index 124f2b9cdf..cffc8ca27b 100644 --- a/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java +++ b/tests/testbench/com/vaadin/tests/components/FocusFromShortcutAction.java @@ -20,6 +20,7 @@ public class FocusFromShortcutAction extends TestBase { addComponent(select); addComponent(text); Button focusText = new Button("Focus text", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { text.focus(); } @@ -29,6 +30,7 @@ public class FocusFromShortcutAction extends TestBase { addComponent(focusText); Button focusSelect = new Button("Focus select", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { select.focus(); } diff --git a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java index dc07c35f62..6e54c0d9f4 100644 --- a/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java +++ b/tests/testbench/com/vaadin/tests/components/LayoutAttachListenerInfo.java @@ -27,6 +27,7 @@ public class LayoutAttachListenerInfo extends TestBase { layouts.select("AbsoluteLayout"); layouts.setImmediate(true); layouts.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (event.getProperty().getValue().equals("AbsoluteLayout")) { testAbsoluteLayout(); @@ -64,6 +65,7 @@ public class LayoutAttachListenerInfo extends TestBase { a.setWidth("300px"); a.setHeight("300px"); a.addListener(new ComponentContainer.ComponentAttachListener() { + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { AbsoluteLayout layout = (AbsoluteLayout) event.getContainer(); AbsoluteLayout.ComponentPosition position = layout @@ -78,6 +80,7 @@ public class LayoutAttachListenerInfo extends TestBase { content.addComponent(new Button("Attach label to layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { a.addComponent(new Label("X"), "top:50px;left:50px"); } @@ -91,6 +94,7 @@ public class LayoutAttachListenerInfo extends TestBase { v.setWidth("300px"); v.setHeight("300px"); v.addListener(new ComponentContainer.ComponentAttachListener() { + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { VerticalLayout layout = (VerticalLayout) event.getContainer(); getMainWindow().showNotification( @@ -104,6 +108,7 @@ public class LayoutAttachListenerInfo extends TestBase { content.addComponent(new Button("Attach label to layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { v.addComponent(new Label("X")); @@ -118,6 +123,7 @@ public class LayoutAttachListenerInfo extends TestBase { g.setWidth("300px"); g.setHeight("300px"); g.addListener(new ComponentContainer.ComponentAttachListener() { + @Override public void componentAttachedToContainer(ComponentAttachEvent event) { GridLayout layout = (GridLayout) event.getContainer(); GridLayout.Area area = layout.getComponentArea(event @@ -133,6 +139,7 @@ public class LayoutAttachListenerInfo extends TestBase { content.addComponent(new Button("Attach label to layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { g.addComponent(new Label("X"), 2, 3); } diff --git a/tests/testbench/com/vaadin/tests/components/LongTooltip.html b/tests/testbench/com/vaadin/tests/components/LongTooltip.html index ac317380b8..a5055741f1 100644 --- a/tests/testbench/com/vaadin/tests/components/LongTooltip.html +++ b/tests/testbench/com/vaadin/tests/components/LongTooltip.html @@ -36,8 +36,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -63,8 +63,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -113,8 +113,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -140,8 +140,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -190,8 +190,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -217,8 +217,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -267,8 +267,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -294,8 +294,8 @@ </tr> <!--Hide tooltip--> <tr> - <td>mouseOut</td> - <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/VVerticalLayout[0]/VGridLayout[0]</td> <td>55,43</td> </tr> <!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> @@ -319,7 +319,6 @@ <td></td> <td>tooltip-upper-left-3</td> </tr> - </tbody></table> </body> </html> diff --git a/tests/testbench/com/vaadin/tests/components/TestBase.java b/tests/testbench/com/vaadin/tests/components/TestBase.java index b3c0f63dcb..a66f0efe64 100644 --- a/tests/testbench/com/vaadin/tests/components/TestBase.java +++ b/tests/testbench/com/vaadin/tests/components/TestBase.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Root.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java b/tests/testbench/com/vaadin/tests/components/TouchScrollables.java index 8ad12da85f..415f660c62 100644 --- a/tests/testbench/com/vaadin/tests/components/TouchScrollables.java +++ b/tests/testbench/com/vaadin/tests/components/TouchScrollables.java @@ -11,7 +11,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.SourceIs; -import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.tests.util.Person; import com.vaadin.tests.util.PersonContainer; import com.vaadin.tests.util.TestUtils; @@ -79,12 +79,14 @@ public class TouchScrollables extends TestBase { final Label l = l50; Button button = new Button("Scroll to label 50", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getLayout().getRoot().scrollIntoView(l); } }); cssLayout.addComponent(button); button = new Button("Scroll to 100px", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setScrollTop(100); } @@ -117,6 +119,7 @@ public class TouchScrollables extends TestBase { Button button = new Button("Toggle lazyloading"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (table.getCacheRate() == 100) { table.setCacheRate(2); @@ -131,6 +134,7 @@ public class TouchScrollables extends TestBase { button = new Button("Toggle selectable"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setSelectable(!table.isSelectable()); } @@ -159,6 +163,7 @@ public class TouchScrollables extends TestBase { private Component getSubWindowTest() { Button b = new Button("Open subwindow", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window w = new Window("Subwindow"); w.center(); @@ -185,10 +190,12 @@ public class TouchScrollables extends TestBase { Action[] actions = new Action[] { new Action("FOO"), new Action("BAR"), new Action("CAR") }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { Notification.show(action.getCaption()); @@ -206,10 +213,12 @@ public class TouchScrollables extends TestBase { // accept only drags from this table AcceptCriterion crit = new SourceIs(table); + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java index 139ed5bb0b..826b7cee07 100644 --- a/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java +++ b/tests/testbench/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java @@ -22,6 +22,7 @@ public class MoveComponentsFromAbsoluteLayoutToInnerLayout extends TestBase { testButton = new Button("Click to move to inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.addComponent(testButton); } @@ -37,6 +38,7 @@ public class MoveComponentsFromAbsoluteLayoutToInnerLayout extends TestBase { Button b = new Button("Repaint inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java new file mode 100644 index 0000000000..17cc4270fb --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/AllComponentTooltipTest.java @@ -0,0 +1,50 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tests.components.abstractcomponent; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.tests.VaadinClasses; +import com.vaadin.tests.components.AbstractTestRoot; +import com.vaadin.ui.AbstractComponent; +import com.vaadin.ui.Component; +import com.vaadin.ui.GridLayout; + +public class AllComponentTooltipTest extends AbstractTestRoot { + + @Override + protected void setup(WrappedRequest request) { + setContent(new GridLayout(5, 5)); + for (Class<? extends Component> cls : VaadinClasses.getComponents()) { + try { + AbstractComponent c = (AbstractComponent) cls.newInstance(); + if (c instanceof LegacyWindow) { + continue; + } + + c.setDebugId(cls.getName()); + c.setCaption(cls.getName()); + c.setDescription(cls.getName()); + c.setWidth("100px"); + c.setHeight("100px"); + getContent().addComponent(c); + System.out.println("Added " + cls.getName()); + } catch (Exception e) { + System.err.println("Could not instatiate " + cls.getName()); + } + } + } + + @Override + protected String getTestDescription() { + // TODO Auto-generated method stub + return null; + } + + @Override + protected Integer getTicketNumber() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java index 9261962b0d..f8931ecdea 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/EnableState.java @@ -20,6 +20,7 @@ public class EnableState extends AbstractTestCase { CheckBox enable = new CheckBox("Toggle button enabled", true); enable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean enabled = (Boolean) event.getProperty().getValue(); button.setEnabled(enabled); @@ -31,6 +32,7 @@ public class EnableState extends AbstractTestCase { CheckBox caption = new CheckBox("Toggle button caption", true); caption.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { button.setCaption(button.getCaption() + "+"); } @@ -40,6 +42,7 @@ public class EnableState extends AbstractTestCase { CheckBox visible = new CheckBox("Toggle panel visibility", true); visible.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean visible = (Boolean) event.getProperty().getValue(); @@ -51,6 +54,7 @@ public class EnableState extends AbstractTestCase { CheckBox panelEnable = new CheckBox("Toggle panel enabled", true); panelEnable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean enabled = (Boolean) event.getProperty().getValue(); panel.setEnabled(enabled); diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.html b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.html new file mode 100644 index 0000000000..3cea965690 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.html @@ -0,0 +1,92 @@ +<?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="http://localhost:8888/" /> +<title>TooltipTests</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">TooltipTests</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.abstractcomponent.TooltipTests?restartApplication</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>//div[@id='label']</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>no_tooltip</td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[0]/domChild[0]</td> + <td>10,7</td> +</tr> +<tr> + <td>showTooltip</td> + <td>//div[@id='label']</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>panel_tooltip</td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[1]/domChild[0]</td> + <td>8,6</td> +</tr> +<tr> + <td>showTooltip</td> + <td>//div[@id='label']</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>layout_tooltip</td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsabstractcomponentTooltipTests::/VVerticalLayout[0]/VVerticalLayout[0]/VHorizontalLayout[0]/VCheckBox[2]/domChild[0]</td> + <td>5,5</td> +</tr> +<tr> + <td>showTooltip</td> + <td>//div[@id='label']</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>label_tooltip</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java new file mode 100644 index 0000000000..300abe1851 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/abstractcomponent/TooltipTests.java @@ -0,0 +1,100 @@ +package com.vaadin.tests.components.abstractcomponent; + +import com.vaadin.data.Property; +import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; +import com.vaadin.ui.VerticalLayout; + +public class TooltipTests extends TestBase { + + private Panel panel; + private VerticalLayout layout; + private Label label; + + @Override + protected String getDescription() { + return "Generic tooltip handling tests"; + } + + @Override + protected Integer getTicketNumber() { + return 8425; + } + + @Override + protected void setup() { + HorizontalLayout topLayout = new HorizontalLayout(); + addComponent(topLayout); + CheckBox panelCbox = new CheckBox("Panel"); + panelCbox.addListener(panelListener); + topLayout.addComponent(panelCbox); + CheckBox layoutCbox = new CheckBox("Layout"); + layoutCbox.addListener(layoutListener); + topLayout.addComponent(layoutCbox); + CheckBox labelCbox = new CheckBox("Label"); + topLayout.addComponent(labelCbox); + labelCbox.addListener(labelListener); + + panel = new Panel(); + panel.setCaption("Panel caption"); + panel.setDebugId("panel"); + addComponent(panel); + + layout = new VerticalLayout(); + layout.setDebugId("layout"); + layout.setMargin(true); + layout.setSpacing(true); + panel.setContent(layout); + + label = new Label("Hover me!"); + label.setDebugId("label"); + layout.addComponent(label); + } + + private final Property.ValueChangeListener panelListener = new Property.ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + boolean value = (Boolean) (event.getProperty().getValue()); + if (value) { + panel.setDescription("I'm panel!"); + } else { + panel.setDescription(""); + } + } + + }; + + private final Property.ValueChangeListener layoutListener = new Property.ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + boolean value = (Boolean) (event.getProperty().getValue()); + if (value) { + layout.setDescription("I'm layout!"); + } else { + layout.setDescription(""); + } + } + + }; + + private final Property.ValueChangeListener labelListener = new Property.ValueChangeListener() { + + @Override + public void valueChange(ValueChangeEvent event) { + boolean value = (Boolean) (event.getProperty().getValue()); + if (value) { + label.setDescription("I'm label!"); + } else { + label.setDescription(""); + } + } + + }; + +} diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java index 93ba858e37..9b29ae1bab 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractComponentDataBindingTest.java @@ -45,6 +45,7 @@ public abstract class AbstractComponentDataBindingTest extends TestBase cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateLocale((Locale) localeSelect.getValue()); } @@ -91,6 +92,7 @@ public abstract class AbstractComponentDataBindingTest extends TestBase return null; } + @Override public void valueChange(ValueChangeEvent event) { AbstractField field = (AbstractField) event.getProperty(); // if (field == localeSelect) { diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java index 5d0e0fe488..aa630c79fd 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java @@ -33,6 +33,7 @@ public class AbstractFieldCommitWithInvalidValues extends TestBase { Button b = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { tf.commit(); diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java index 780130847a..f1b96d24fd 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java @@ -34,6 +34,7 @@ public class AbstractFieldDataSourceReadOnly extends TestBase { // Button Button button = new Button("Make data source read-only"); button.addListener(new Listener() { + @Override public void componentEvent(Event event) { stateHolder.buttonClicked(); } diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java index 716f80e23f..efba67199d 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java @@ -24,6 +24,8 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends AbstractComponentTest<T> implements ValueChangeListener, ReadOnlyStatusChangeListener { + private boolean sortValueChanges = true; + @Override protected void createActions() { super.createActions(); @@ -65,6 +67,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends .addItem("AbstractField", null); abstractField.addItem("Show value", new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { for (T a : getTestComponents()) { log(a.getClass().getSimpleName() + " value: " @@ -72,6 +75,18 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends } } }); + + MenuItem sortValueChangesItem = abstractField.addItem( + "Show sorted value changes", new MenuBar.Command() { + @Override + public void menuSelected(MenuItem selectedItem) { + sortValueChanges = selectedItem.isChecked(); + log("Show sorted value changes: " + + sortValueChanges); + } + }); + sortValueChangesItem.setCheckable(true); + sortValueChangesItem.setChecked(true); } } @@ -101,6 +116,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends protected Command<T, Boolean> valueChangeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ValueChangeListener) AbstractFieldTest.this); @@ -111,6 +127,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends }; protected Command<T, Boolean> readonlyStatusChangeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this); @@ -122,11 +139,13 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends protected Command<T, Object> setValueCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.setValue(value); } }; + @Override public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { log(event.getClass().getSimpleName() + ", new value: " + getValue(event.getProperty())); @@ -135,7 +154,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends @SuppressWarnings({ "rawtypes", "unchecked" }) private String getValue(Property property) { Object o = property.getValue(); - if (o instanceof Collection) { + if (o instanceof Collection && sortValueChanges) { // Sort collections to avoid problems with values printed in // different order try { @@ -168,6 +187,7 @@ public abstract class AbstractFieldTest<T extends AbstractField<?>> extends } + @Override public void readOnlyStatusChange(ReadOnlyStatusChangeEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java index b68134f379..1f407c710f 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java @@ -14,12 +14,14 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setMaxLength(value); } }; private Command<T, Boolean> nullSelectionAllowedCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setNullSettingAllowed(value); @@ -27,18 +29,21 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> }; private Command<T, String> nullRepresentationCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setNullRepresentation(value); } }; private Command<T, String> inputPromptCommand = new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { c.setInputPrompt(value); } }; private Command<T, Boolean> textChangeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((TextChangeListener) AbstractTextFieldTest.this); @@ -49,24 +54,28 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> }; private Command<T, Integer> colsCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setColumns(value); } }; private Command<T, TextChangeEventMode> textChangeEventModeCommand = new Command<T, TextChangeEventMode>() { + @Override public void execute(T c, TextChangeEventMode value, Object data) { c.setTextChangeEventMode(value); } }; private Command<T, Integer> textChangeTimeoutCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setTextChangeTimeout(value); } }; private Command<T, Range> selectionRangeCommand = new Command<T, Range>() { + @Override public void execute(T c, Range value, Object data) { c.setSelectionRange(value.getStart(), value.getEnd() - value.getStart()); @@ -74,6 +83,7 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> } }; private Command<T, Object> selectAllCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.selectAll(); } @@ -81,6 +91,7 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> private Command<T, Integer> setCursorPositionCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.setCursorPosition(value); } @@ -230,6 +241,7 @@ public abstract class AbstractTextFieldTest<T extends AbstractTextField> } + @Override public void textChange(TextChangeEvent event) { AbstractTextField tf = (AbstractTextField) event.getComponent(); log("TextChangeEvent: text='" + event.getText() + "', cursor position=" diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java b/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java index deea0fbe0a..aa8c7ff778 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnLong.java @@ -24,6 +24,7 @@ public class DateFieldBasedOnLong extends AbstractComponentDataBindingTest { addComponent(new Button("Set property value to 10000L", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { property.setValue(10000L); diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java index c13aadd895..01fcb02b77 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerDoubleFieldsWithDataSource.java @@ -34,6 +34,7 @@ public class IntegerDoubleFieldsWithDataSource extends TestBase { tf.setImmediate(true); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { log.log("Value for " + tf.getCaption() + " changed to " diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java index b25dc9d953..929247fc80 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/IntegerFieldWithoutDataSource.java @@ -29,6 +29,7 @@ public class IntegerFieldWithoutDataSource extends TestBase { tf.setImmediate(true); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { log.log("Value for " + tf.getCaption() + " changed to " diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java index 26720d67f3..309e297374 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/ShortcutAddAndRemove.java @@ -20,6 +20,7 @@ public class ShortcutAddAndRemove extends TestBase { final Button logButton = new Button("Log a row (enter shortcut)"); logButton.setClickShortcut(KeyCode.ENTER); logButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Log button was clicked"); } @@ -27,6 +28,7 @@ public class ShortcutAddAndRemove extends TestBase { final Button removeShortcut = new Button("Remove shortcut"); removeShortcut.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { logButton.removeClickShortcut(); logButton.setCaption("Log a row (no shortcut)"); @@ -34,6 +36,7 @@ public class ShortcutAddAndRemove extends TestBase { }); final Button addShortcut = new Button("Add shortcut"); addShortcut.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { logButton.setClickShortcut(KeyCode.ENTER); logButton.setCaption("Log a row (enter shortcut)"); diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java b/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java index 8ce214918d..fc08a4505c 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/TextFieldConversions.java @@ -31,6 +31,7 @@ public class TextFieldConversions extends AbstractComponentDataBindingTest { dataType.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setPropertyDataSource(new ObjectProperty<Object>(o, (Class<Object>) dataType.getValue())); @@ -42,6 +43,7 @@ public class TextFieldConversions extends AbstractComponentDataBindingTest { addComponent(tf); tf.setErrorHandler(new ComponentErrorHandler() { + @Override public boolean handleComponentError(ComponentErrorEvent event) { tf.setComponentError(new UserError("Invalid value")); return true; diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java b/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java index 0228a59f06..a9aa4d2a43 100644 --- a/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java +++ b/tests/testbench/com/vaadin/tests/components/abstractfield/Vaadin6ImplicitDoubleConverter.java @@ -7,6 +7,7 @@ import com.vaadin.data.util.converter.Converter; public class Vaadin6ImplicitDoubleConverter implements Converter<String, Double> { + @Override public Double convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (null == value) { @@ -15,6 +16,7 @@ public class Vaadin6ImplicitDoubleConverter implements return new Double(value.toString()); } + @Override public String convertToPresentation(Double value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -24,10 +26,12 @@ public class Vaadin6ImplicitDoubleConverter implements } + @Override public Class<Double> getModelType() { return Double.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java index a048cf04a8..d24def22dd 100644 --- a/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java +++ b/tests/testbench/com/vaadin/tests/components/accordion/RemoveTabs.java @@ -47,6 +47,7 @@ public class RemoveTabs extends TestBase { closeCurrent = new Button("Close current tab"); closeCurrent.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTab(); @@ -55,6 +56,7 @@ public class RemoveTabs extends TestBase { closeFirst = new Button("close first tab"); closeFirst.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeFirstTab(); @@ -63,6 +65,7 @@ public class RemoveTabs extends TestBase { closeLast = new Button("close last tab"); closeLast.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeLastTab(); @@ -71,6 +74,7 @@ public class RemoveTabs extends TestBase { reorderTabs = new Button("reorder"); reorderTabs.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { reorder(); diff --git a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java index f613a8b14f..605ab676b6 100644 --- a/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java +++ b/tests/testbench/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java @@ -29,6 +29,7 @@ public class BeanItemContainerNullValues extends TestBase { Button b = new Button("Disable sorting", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setSortEnabled(!table.isSortEnabled()); if (table.isSortEnabled()) { diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java b/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java index 7efd40ca5d..0d4981a441 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonEnterWithWindowShortcut.java @@ -17,10 +17,12 @@ public class ButtonEnterWithWindowShortcut extends TestBase { getMainWindow().addActionHandler(new Handler() { private static final long serialVersionUID = -4976129418325394913L; + @Override public void handleAction(Action action, Object sender, Object target) { log.log(action.getCaption() + " pressed in window"); } + @Override public Action[] getActions(Object target, Object sender) { ShortcutAction enter = new ShortcutAction("enter", ShortcutAction.KeyCode.ENTER, null); @@ -32,6 +34,7 @@ public class ButtonEnterWithWindowShortcut extends TestBase { Button button = new Button("Focus me and press enter", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("button click listener fired"); } diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java b/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java index aca85d4efe..b27f948669 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonErrorMessage.java @@ -11,6 +11,7 @@ public class ButtonErrorMessage extends TestBase { protected void setup() { Button b = new Button("Click for error"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new NullPointerException(); } diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java b/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java index 253de5b43c..5cdc34e8e8 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonHtml.java @@ -19,6 +19,7 @@ public class ButtonHtml extends TestBase { final Button swapButton = new Button("<i>Swap button<i>"); swapButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { swapButton.setHtmlContentAllowed(!swapButton .isHtmlContentAllowed()); diff --git a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java index 8fe56b7619..1b6a81551a 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonMouseDetails.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.button; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -14,6 +14,7 @@ public class ButtonMouseDetails extends TestBase { private Button.ClickListener clickListener = new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuilder str = new StringBuilder(out.getValue().toString()); str.append(clickCounter + ":\t"); diff --git a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java b/tests/testbench/com/vaadin/tests/components/button/Buttons2.java index e04d50bddb..7526e7dbc3 100644 --- a/tests/testbench/com/vaadin/tests/components/button/Buttons2.java +++ b/tests/testbench/com/vaadin/tests/components/button/Buttons2.java @@ -13,6 +13,7 @@ public class Buttons2<T extends Button> extends AbstractComponentTest<T> private Command<T, Boolean> disableOnClickCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setDisableOnClick(value); } @@ -20,6 +21,7 @@ public class Buttons2<T extends Button> extends AbstractComponentTest<T> private Command<T, Boolean> clickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((Button.ClickListener) Buttons2.this); @@ -62,6 +64,7 @@ public class Buttons2<T extends Button> extends AbstractComponentTest<T> } + @Override public void buttonClick(ClickEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java index 295c04fc0c..4fb8df678e 100644 --- a/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java +++ b/tests/testbench/com/vaadin/tests/components/button/ShortCutListenerModification.java @@ -60,6 +60,7 @@ public class ShortCutListenerModification extends TestBase implements } + @Override public void buttonClick(ClickEvent event) { Component c = event.getButton(); while (!(c instanceof Window)) { diff --git a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java b/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java index 4952b4bc50..c1f1846415 100644 --- a/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java +++ b/tests/testbench/com/vaadin/tests/components/button/TooltipForDisabledButton.java @@ -27,6 +27,7 @@ public class TooltipForDisabledButton extends TestBase { buttonDisabled.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Clicked Disabled"); } @@ -35,6 +36,7 @@ public class TooltipForDisabledButton extends TestBase { buttonEnabled.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Clicked Enabled"); } diff --git a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java index 3211a9c142..57ef9e6656 100644 --- a/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java +++ b/tests/testbench/com/vaadin/tests/components/caption/IconsInCaption.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.caption; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.VaadinClasses; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; @@ -47,6 +47,7 @@ public class IconsInCaption extends TestBase { iconTypeSelect.setImmediate(true); iconTypeSelect.setNullSelectionAllowed(false); iconTypeSelect.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateContainer(); } @@ -60,6 +61,7 @@ public class IconsInCaption extends TestBase { containerSelect.setImmediate(true); containerSelect.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateContainer(); diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java index 2c981432c8..28abf5172d 100644 --- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java +++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxNullValue.java @@ -29,6 +29,7 @@ public class CheckBoxNullValue extends TestBase { final Button button = new Button("Validate"); addComponent(button); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { checkbox.setComponentError(null); requiredCheckbox.setComponentError(null); diff --git a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java index 4f9cd10ecc..6734c752de 100644 --- a/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java +++ b/tests/testbench/com/vaadin/tests/components/checkbox/CheckBoxes2.java @@ -19,6 +19,7 @@ public class CheckBoxes2 extends AbstractFieldTest<CheckBox> implements } + @Override public void buttonClick(ClickEvent event) { log(event.getClass().getSimpleName()); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java index 88a403b1b6..38bdf0c5fe 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxCombinedWithEnterShortcut.java @@ -29,6 +29,7 @@ public class ComboBoxCombinedWithEnterShortcut extends TestBase { aButton.setClickShortcut(KeyCode.ENTER); aButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button clicked. ComboBox value: " + l.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java index 9285983b99..a475c86ca0 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java @@ -57,6 +57,7 @@ public class ComboBoxDataSourceChange extends TestBase { Button b = new Button("Use ds1"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cb2.setContainerDataSource(ds1); currentDS.setValue("ds1"); @@ -72,6 +73,7 @@ public class ComboBoxDataSourceChange extends TestBase { b = new Button("Use ds2"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cb2.setContainerDataSource(ds2); currentDS.setValue("ds2"); @@ -82,6 +84,7 @@ public class ComboBoxDataSourceChange extends TestBase { addComponent(hl); cb2.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentValue.setValue(event.getProperty().getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java index d9739602f6..c5e411678d 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxEnablesComboBox.java @@ -16,6 +16,7 @@ public class ComboBoxEnablesComboBox extends TestBase { populate(cb); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cb2.setEnabled(true); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java index fd434a7acd..5f33b96a73 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxIdenticalItems.java @@ -27,6 +27,7 @@ public class ComboBoxIdenticalItems extends TestBase { select.addListener(new Property.ValueChangeListener() { private static final long serialVersionUID = -7932700771673919620L; + @Override public void valueChange(ValueChangeEvent event) { log.log("Item " + select.getValue() + " selected"); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java index 70aad31364..c0490c127d 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInPopup.java @@ -17,6 +17,7 @@ public class ComboBoxInPopup extends TestBase { w.addComponent(createComboBox()); Button close = new Button("Close window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.close(); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java index e11b10f3e1..0afa1e887e 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.java @@ -24,6 +24,7 @@ public class ComboBoxInvalidNullSelection extends TestBase { Button b = new Button("Swap data source"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (combo.getContainerDataSource() == ds1) { combo.setContainerDataSource(ds2); @@ -39,6 +40,7 @@ public class ComboBoxInvalidNullSelection extends TestBase { combo.setContainerDataSource(ds1); combo.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value is now: " + combo.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java index c78ff7675f..5dc5a2efbd 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxReapperingOldValue.java @@ -58,6 +58,7 @@ public class ComboBoxReapperingOldValue extends Application.LegacyApplication return container; } + @Override public void valueChange(ValueChangeEvent event) { cbox2.removeAllItems(); if ("1".equals(event.getProperty().getValue().toString())) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java index 15742cc783..0336ff423b 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlow.java @@ -45,6 +45,7 @@ public class ComboBoxSlow extends TestBase { } cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value changed to " + cb.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java index 5c1dad4a30..d98997d28f 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSlowInFF.java @@ -24,6 +24,7 @@ public class ComboBoxSlowInFF extends TestBase { Button fill = new Button("fill it"); fill.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { t.removeAllItems(); for (int i = 0; i < 200; i++) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java index 09354fdacf..24aea18314 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxSuggestionOnDetach.java @@ -16,6 +16,7 @@ public class ComboBoxSuggestionOnDetach extends TestBase { ComboBox comboBox = new ComboBox("Combo box", Arrays.asList("Option 1", "Option 2", "Option 3")); comboBox.addListener(new FieldEvents.FocusListener() { + @Override public void focus(FocusEvent event) { popup.close(); } diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java index 6f6e550ab4..d33a858dc8 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxTextFieldEventOrder.java @@ -17,6 +17,7 @@ public class ComboBoxTextFieldEventOrder extends TestBase { final Select select = new Select("select", Arrays.asList("1", "2", "3", "4")); textField.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { select.addItem(Long.valueOf(select.size() + 1).toString()); // or // just diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java index b8f7a9758d..76ee83384e 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxValueUpdate.java @@ -29,6 +29,7 @@ public class ComboBoxValueUpdate extends TestBase { select.addListener(new ComboBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err .println("Selected " + event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java index 8befbb4612..3071ab4c2d 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxes2.java @@ -10,12 +10,14 @@ import com.vaadin.ui.Select; public class ComboBoxes2 extends SelectTest<ComboBox> { private Command<ComboBox, String> inputPromptCommand = new Command<ComboBox, String>() { + @Override public void execute(ComboBox c, String value, Object data) { c.setInputPrompt(value); } }; private Command<ComboBox, Integer> filteringModeCommand = new Command<ComboBox, Integer>() { + @Override public void execute(ComboBox c, Integer value, Object data) { c.setFilteringMode(value); } @@ -39,6 +41,7 @@ public class ComboBoxes2 extends SelectTest<ComboBox> { private void createTextInputAlowedAction(String category) { createBooleanAction("Text input allowed", category, true, new Command<ComboBox, Boolean>() { + @Override public void execute(ComboBox c, Boolean value, Object data) { c.setTextInputAllowed(value.booleanValue()); } @@ -48,6 +51,7 @@ public class ComboBoxes2 extends SelectTest<ComboBox> { private void createNewItemsAllowedAction(String category) { createBooleanAction("New items allowed", category, false, new Command<ComboBox, Boolean>() { + @Override public void execute(ComboBox c, Boolean value, Object data) { c.setNewItemsAllowed(value.booleanValue()); } @@ -80,6 +84,7 @@ public class ComboBoxes2 extends SelectTest<ComboBox> { createSelectAction("Icon", category, createIconOptions(false), "-", new Command<ComboBox, Resource>() { + @Override public void execute(ComboBox c, Resource value, Object data) { for (Object id : c.getItemIds()) { if (value == null) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java index 44285f97c2..b9c222247b 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java @@ -7,7 +7,7 @@ import com.vaadin.data.util.ObjectProperty; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.FocusEvent; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; @@ -34,6 +34,7 @@ public class ComboFocusBlurEvents extends TestBase { final ObjectProperty<String> log = new ObjectProperty<String>(""); cb.addListener(new FieldEvents.FocusListener() { + @Override public void focus(FocusEvent event) { log.setValue(log.getValue().toString() + "<br>" + counter + ": Focus event!"); @@ -42,6 +43,7 @@ public class ComboFocusBlurEvents extends TestBase { }); cb.addListener(new FieldEvents.BlurListener() { + @Override public void blur(BlurEvent event) { log.setValue(log.getValue().toString() + "<br>" + counter + ": Blur event!"); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java index 94ab20df43..5b1af58421 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/Comboboxes.java @@ -136,6 +136,7 @@ public class Comboboxes extends ComponentTestCase<ComboBox> { return createSelectAction("Icon", options, "<None>", new Command<ComboBox, String>() { + @Override public void execute(ComboBox c, String value, Object data) { for (Object id : c.getItemIds()) { if (value == null) { diff --git a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java b/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java index d93db563e3..00e9242a7a 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/NewItemsESCPress.java @@ -17,6 +17,7 @@ public class NewItemsESCPress extends TestBase { final ComboBox box = new ComboBox("New items are allowed"); box.setNewItemsAllowed(true); box.setNewItemHandler(new NewItemHandler() { + @Override public void addNewItem(String newItemCaption) { String value = (String) addedItems.getValue(); addedItems.setValue(value + newItemCaption + "\n"); diff --git a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java b/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java index a79b85ece4..ce6a24d9bd 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java +++ b/tests/testbench/com/vaadin/tests/components/combobox/RemovalOfSelectedIcon.java @@ -22,6 +22,7 @@ public class RemovalOfSelectedIcon extends TestBase { btClear.setImmediate(true); btClear.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cb2.removeAllItems(); cb2.setContainerDataSource(null); diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java index 22fc381c72..094a63c163 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/ClipContent.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.customcomponent; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; @@ -24,6 +24,7 @@ public class ClipContent extends TestBase { final TextField w = new TextField("Width"); w.setValue("20px"); w.addListener(new TextField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cc.setWidth(w.getValue()); } @@ -32,6 +33,7 @@ public class ClipContent extends TestBase { final TextField h = new TextField("Height"); h.setValue("20px"); h.addListener(new TextField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cc.setHeight(h.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java index 9a559f7414..4311ad1f08 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentGrowingContent.java @@ -24,6 +24,7 @@ public class CustomComponentGrowingContent extends TestBase { }); addComponent(new Button("Set long content", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { label.setValue("Longer content that should be fully visible"); } diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java index 43d4c70eb8..2351b02e2a 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java @@ -20,6 +20,7 @@ public class CustomComponentSizeUpdate extends TestBase { nb.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { cc.setWidth((cc.getWidth() - 20) + "px"); cc.setHeight((cc.getHeight() - 20) + "px"); diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java index 2dc3063b0c..28e4dfb385 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTemplate.java @@ -54,6 +54,7 @@ public class CustomLayoutUsingTemplate extends TestBase implements return null; } + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new TextField("A text field!"), "location2"); } diff --git a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java index 6ea1d0a0c5..06dd39ac38 100644 --- a/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java +++ b/tests/testbench/com/vaadin/tests/components/customcomponent/CustomLayoutUsingTheme.java @@ -28,6 +28,7 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener { VerticalLayout menu = new VerticalLayout(); menu.addComponent(new Button("Set body to label", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new Label(LoremIpsum.get(200)), "body"); } @@ -35,6 +36,7 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener { menu.addComponent(new Button("Set body to huge NativeButton", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new NativeButton( "This is it, the body!"), "body"); @@ -53,6 +55,7 @@ public class CustomLayoutUsingTheme extends TestBase implements ClickListener { return null; } + @Override public void buttonClick(ClickEvent event) { layout.addComponent(new TextField("A text field!"), "location2"); } diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java b/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java index c15ca1916a..07c740a96d 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/AbstractNestedFormExample.java @@ -52,6 +52,7 @@ public abstract class AbstractNestedFormExample extends TestBase { private Property.ValueChangeListener getTableValueChangeListener() { return new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (personForm != null) { removeComponent(personForm); diff --git a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java b/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java index 02c080e8fd..693b1e11b1 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/AddressFormExample.java @@ -21,6 +21,7 @@ public class AddressFormExample extends TestBase { addComponent(field); Button commitButton = new Button("Save", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { field.commit(); Address address = field.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java b/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java index dc60d7e517..409ecccca8 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/BooleanField.java @@ -23,6 +23,7 @@ public class BooleanField extends CustomField { final Button button = new Button("Click me"); button.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object value = getValue(); boolean newValue = true; diff --git a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java b/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java index 694c5b54f9..a52b168e84 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/BooleanFieldExample.java @@ -61,10 +61,11 @@ public class BooleanFieldExample extends TestBase { layout.addComponent(form); Button submit = new Button("Submit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.commit(); Notification.show("The custom boolean field value is " - + data.isCustom() + ".<br>" + + data.isCustom() + ".\n" + "The checkbox (default boolean field) value is " + data.isNormal() + "."); } diff --git a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java b/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java index e0a3b08bc7..0bc4f45545 100644 --- a/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java +++ b/tests/testbench/com/vaadin/tests/components/customfield/NestedPersonForm.java @@ -48,6 +48,7 @@ public class NestedPersonForm extends Form { buttons.setSpacing(true); Button discardChanges = new Button("Discard changes", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { NestedPersonForm.this.discard(); } @@ -56,6 +57,7 @@ public class NestedPersonForm extends Form { buttons.setComponentAlignment(discardChanges, Alignment.MIDDLE_LEFT); Button apply = new Button("Apply", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { NestedPersonForm.this.commit(); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java index 1395b4d735..c4f001ac41 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/CommitInvalid.java @@ -72,6 +72,7 @@ public class CommitInvalid extends TestBase { Button validate = new Button("Validate"); validate.setDebugId("_validate"); validate.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.validate(); @@ -88,6 +89,7 @@ public class CommitInvalid extends TestBase { Button commit = new Button("Commit"); commit.setDebugId("_commit"); commit.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.commit(); @@ -103,6 +105,7 @@ public class CommitInvalid extends TestBase { form.getFooter().addComponent(commit); Button printState = new Button("printState"); printState.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { printState(); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java index 48bf3622d1..acca47ee5e 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/CustomDateFormats.java @@ -37,6 +37,7 @@ public class CustomDateFormats extends TestBase { s.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setDateFieldLocale((Locale) s.getValue()); } @@ -155,6 +156,7 @@ public class CustomDateFormats extends TestBase { df.setValue(cal.getTime()); df.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateServerSideLabel((DateField) event.getProperty()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java index dac3169b18..5098a4e459 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java @@ -7,7 +7,7 @@ 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.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; @@ -48,6 +48,7 @@ public class DateFieldEmptyValid extends TestBase { df.setImmediate(true); df.setResolution(DateField.RESOLUTION_DAY); df.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value changeEvent"); checkEmpty(); @@ -59,6 +60,7 @@ public class DateFieldEmptyValid extends TestBase { b.setDebugId("clear"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Clearing date aka setValue(null)"); df.setValue(null); @@ -70,6 +72,7 @@ public class DateFieldEmptyValid extends TestBase { b.setDebugId("set4.5.1990"); b.addListener(new ClickListener() { + @Override @SuppressWarnings("deprecation") public void buttonClick(ClickEvent event) { log.log("Setting new value to datefield (4.5.1990)"); @@ -81,6 +84,7 @@ public class DateFieldEmptyValid extends TestBase { b = new Button("Set date to 5.6.2000 using a property data source"); b.addListener(new ClickListener() { + @Override @SuppressWarnings("deprecation") public void buttonClick(ClickEvent event) { log.log("Setting new object property (5.6.2000) to datefield"); @@ -97,6 +101,7 @@ public class DateFieldEmptyValid extends TestBase { b.setDebugId("set-via-ds"); b.addListener(new ClickListener() { + @Override @SuppressWarnings("deprecation") public void buttonClick(ClickEvent event) { log.log("Setting object property (with value null) to datefield and set value of property to 27.8.2005"); @@ -111,6 +116,7 @@ public class DateFieldEmptyValid extends TestBase { b = new Button("Check value"); b.setDebugId("check-value"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Checking state"); checkEmpty(); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java index 298359068e..2a7807670b 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java @@ -106,6 +106,7 @@ public class DateFieldInSubWindow extends AbstractTestCase { Button b = new Button("Close", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TestCaseWindow.this.close(); } @@ -122,6 +123,7 @@ public class DateFieldInSubWindow extends AbstractTestCase { LegacyWindow mainWindow = new LegacyWindow(); setMainWindow(mainWindow); Button open = new Button("Open window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addWindow(new TestCaseWindow()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java index dd61ccd60c..5d06895d11 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldLocale.java @@ -21,6 +21,7 @@ public class DateFieldLocale extends TestBase { addComponent(new Button("Change locale", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (dateField.getLocale().getCountry().equalsIgnoreCase("fi")) { dateField.setLocale(new Locale("zh", "CN")); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java index e7c3442060..1a3b3858b8 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldMinResolution.java @@ -39,6 +39,7 @@ public class DateFieldMinResolution extends TestBase { idf.setImmediate(true); idf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { lbl.setValue(dformat.format(event.getProperty().getValue())); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java index bf93d8c8b9..befdd65693 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldRangeValidation.java @@ -56,6 +56,7 @@ public class DateFieldRangeValidation extends TestBase { private Range range = new Range(); private ValueChangeListener refreshField = new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { actualDateField.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java index 516d207a38..392dbaf9c6 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldReadOnly.java @@ -43,6 +43,7 @@ public class DateFieldReadOnly extends TestBase { Button b = new Button("Switch read-only"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { timeField.setReadOnly(!timeField.isReadOnly()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java index e8c8b69f9f..c502b9597e 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTest.java @@ -21,6 +21,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { private Command<T, Date> setValue = new Command<T, Date>() { + @Override public void execute(T c, Date value, Object data) { c.setValue(value); } @@ -109,6 +110,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { private Command<T, Resolution> resolutionCommand = new Command<T, Resolution>() { + @Override public void execute(T c, Resolution value, Object data) { c.setResolution(value); @@ -116,6 +118,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { }; private Command<T, Boolean> lenientCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setLenient(false); @@ -123,6 +126,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { }; private Command<T, Boolean> weekNumberCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setShowISOWeekNumbers(value); @@ -130,6 +134,7 @@ public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> { }; 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/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java index 340b647931..6f31b4d80f 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldTimezone.java @@ -51,6 +51,7 @@ public class DateFieldTimezone extends TestBase { timezoneSelector.setNullSelectionItemId(nullValue); timezoneSelector.setFilteringMode(ComboBox.FILTERINGMODE_CONTAINS); timezoneSelector.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); TimeZone timeZone; @@ -75,6 +76,7 @@ public class DateFieldTimezone extends TestBase { 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( diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java index 9b4a3c3383..bbe2423a3f 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DateFieldUnparsableDate.java @@ -15,6 +15,7 @@ public class DateFieldUnparsableDate extends TestBase { public MyDateField(String caption) { super(caption); addListener(new Property.ValueChangeListener() { + @Override public void valueChange( com.vaadin.data.Property.ValueChangeEvent event) { oldDate = getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java b/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java index 060c7fcc0a..b5842694f0 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DefaultHandleUnparsableDateField.java @@ -15,6 +15,7 @@ public class DefaultHandleUnparsableDateField extends TestBase { date.setImmediate(true); addComponent(date); date.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (date.isValid()) { getMainWindow() diff --git a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java index 8f201e120d..4e256aa947 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java @@ -16,6 +16,7 @@ public class DisabledDateFieldWidth extends TestBase { Button button = new Button("Repaint datefield", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { dateField1.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java index b8c5be57bf..c642db1bc0 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/InlineDateFields.java @@ -81,6 +81,7 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> { return createSelectAction("Resolution", options, "Year", new Command<InlineDateField, Resolution>() { + @Override public void execute(InlineDateField c, Resolution value, Object data) { c.setResolution(value); @@ -97,6 +98,7 @@ public class InlineDateFields extends ComponentTestCase<InlineDateField> { return createSelectAction("Locale", options, LOCALES[0].toString(), new Command<InlineDateField, Locale>() { + @Override public void execute(InlineDateField c, Locale value, Object data) { c.setCaption(c.getCaption().replaceAll( diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java b/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java index cbe9ac613f..585395d747 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/LenientMode.java @@ -73,6 +73,7 @@ public class LenientMode extends TestBase implements ValueChangeListener { } + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "New value" + event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java b/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java index 1c1994cbe5..9c2d3d7d51 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/LowResolution.java @@ -16,6 +16,7 @@ public class LowResolution extends TestBase { dateField.setValue(new java.util.Date()); dateField.setResolution(PopupDateField.RESOLUTION_MONTH); dateField.addListener(new PopupDateField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "Date now" + event.getProperty()); @@ -28,6 +29,7 @@ public class LowResolution extends TestBase { // dateField.setValue(new java.util.Date()); dateField3.setResolution(PopupDateField.RESOLUTION_YEAR); dateField3.addListener(new PopupDateField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "Date now" + event.getProperty()); @@ -40,6 +42,7 @@ public class LowResolution extends TestBase { dateField2.setValue(new java.util.Date()); dateField2.setResolution(PopupDateField.RESOLUTION_MONTH); dateField2.addListener(new PopupDateField.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { getMainWindow().showNotification( "Date now" + event.getProperty()); @@ -52,6 +55,7 @@ public class LowResolution extends TestBase { "Immediate (use sync button to change fields) "); immediate.setValue(true); immediate.addListener(new CheckBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean immediate = !dateField.isImmediate(); dateField.setImmediate(immediate); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java index 357c61f4f6..a12bdfa44c 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRange.java @@ -41,6 +41,7 @@ public class PopupDateFieldExtendedRange extends TestBase { } addComponent(new Button("Change date", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { date.set(2010, 1, 16); for (PopupDateField f : fields) { diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java index 3ab1f52891..3e8b0678a7 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFieldTest.java @@ -27,6 +27,7 @@ public class PopupDateFieldTest extends DateFieldTest<PopupDateField> { createSelectAction("Input prompt", category, options, "<none>", new Command<PopupDateField, String>() { + @Override public void execute(PopupDateField c, String value, Object data) { c.setInputPrompt(value); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java index ad961ee7a6..bf2a679c63 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/PopupDateFields.java @@ -77,6 +77,7 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> { return createSelectAction("Resolution", options, "Year", new Command<PopupDateField, Resolution>() { + @Override public void execute(PopupDateField c, Resolution value, Object data) { c.setResolution(value); @@ -94,6 +95,7 @@ public class PopupDateFields extends ComponentTestCase<PopupDateField> { return createSelectAction("Input prompt", options, "<none>", new Command<PopupDateField, String>() { + @Override public void execute(PopupDateField c, String value, Object data) { c.setInputPrompt(value); diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java index 6686fa6fe0..da8f45690c 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/ShowSelectedDateAfterInvalid.java @@ -28,6 +28,7 @@ public class ShowSelectedDateAfterInvalid extends TestBase { Button button = new Button("Validate"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { form.setValidationVisible(true); if (form.isValid()) { diff --git a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java index 578c4df903..a45d3b8ad0 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/ValueThroughProperty.java @@ -6,7 +6,7 @@ import java.util.Locale; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -44,6 +44,7 @@ public class ValueThroughProperty extends TestBase { cal.set(Calendar.DAY_OF_MONTH, 14); Button setDateButton1 = new Button( "Set value to 12/14/10 using property", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { dateProperty.setValue(cal.getTime()); } @@ -53,6 +54,7 @@ public class ValueThroughProperty extends TestBase { Button setDateButton2 = new Button( "Set value to 12/14/10 using setValue", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { df.setValue(cal.getTime()); } diff --git a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java b/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java index 88542751c3..b7b0f50947 100644 --- a/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java +++ b/tests/testbench/com/vaadin/tests/components/datefield/WidthRecalculationOnEnableStateChange.java @@ -20,12 +20,14 @@ public class WidthRecalculationOnEnableStateChange extends TestBase { addComponent(df); addComponent(new Button("Toggle disabled for date field", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { df.setEnabled(!df.isEnabled()); } })); addComponent(new Button("Toggle read only for date field", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { df.setReadOnly(!df.isReadOnly()); } diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java index 6b89d1392c..aeb0864707 100644 --- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java +++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/DragAndDropWrapperTooltips.java @@ -80,10 +80,12 @@ public class DragAndDropWrapperTooltips extends TestBase { private DropHandler dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html index 08dc608787..c85d7e0626 100644 --- a/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html +++ b/tests/testbench/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.html @@ -17,7 +17,7 @@ <td></td> </tr> <tr> - <td>mouseOver</td> + <td>showTooltip</td> <td>vaadin=runcomvaadintestscomponentsdraganddropwrapperTooltipHandlingWhenNotDefined::PID_StooltipLabel</td> <td></td> </tr> diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java index f8874810fc..9a412cee9d 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedAltText.java @@ -38,6 +38,7 @@ public class EmbeddedAltText extends TestBase { Button changeAltTexts = new Button("Change alt texts", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { e.setAlternateText("New alt text of the image!"); player.setAlternateText("New alt text of the object!"); diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java index 96b1d36901..c9b6991d8f 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinates.java @@ -14,6 +14,7 @@ public class EmbeddedClickListenerRelativeCoordinates extends TestBase { "../runo/icons/64/ok.png")); e.addListener(new ClickListener() { + @Override public void click(ClickEvent event) { getMainWindow() .showNotification( diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java index 1a5327c8b9..e316fcc5ec 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java @@ -45,6 +45,7 @@ public class EmbeddedImageRefresh extends TestBase { // The button requests repainting the embedded. Button button = new Button("refr"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { embedded.requestRepaint(); } @@ -52,6 +53,7 @@ public class EmbeddedImageRefresh extends TestBase { addComponent(button); button = new Button("refr name"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ((StreamResource) embedded.getSource()).setFilename(new Date() .getTime() + ".png"); @@ -61,6 +63,7 @@ public class EmbeddedImageRefresh extends TestBase { addComponent(button); button = new Button("200x200"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { embedded.setWidth("200px"); embedded.setHeight("200px"); @@ -69,6 +72,7 @@ public class EmbeddedImageRefresh extends TestBase { addComponent(button); button = new Button("undef"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { embedded.setSizeUndefined(); } @@ -85,6 +89,7 @@ public class EmbeddedImageRefresh extends TestBase { return (int) Math.round(pos * resolution / (cells * 1.0)); } + @Override public InputStream getStream() { // Create an image and draw some background on it. BufferedImage image = new BufferedImage(640, 480, diff --git a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java index d507cebebc..c3854d2420 100644 --- a/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java +++ b/tests/testbench/com/vaadin/tests/components/embedded/EmbeddedPdf.java @@ -29,6 +29,7 @@ public class EmbeddedPdf extends TestBase { addComponent(player); addComponent(new Button("Remove pdf", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeComponent(player); } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java index 5255b97ffa..539263a363 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormClearDatasourceRepaint.java @@ -42,6 +42,7 @@ public class FormClearDatasourceRepaint extends TestBase { addComponent(form); addComponent(new Button("Clear datasource", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(null); } @@ -49,6 +50,7 @@ public class FormClearDatasourceRepaint extends TestBase { addComponent(new Button("Change data source", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(new BeanItem<MyBean>( new MyBean())); diff --git a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java index 6bc7cb5cca..907b8a27f3 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java @@ -34,6 +34,7 @@ public class FormCommitWithInvalidValues extends TestBase { Button b = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.commit(); diff --git a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java index 63369413f6..76ea039756 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormDescription.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormDescription.java @@ -17,6 +17,7 @@ public class FormDescription extends TestBase { addComponent(new Button("Toggle description", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (form.getDescription() == null) { form.setDescription("Form description"); diff --git a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java b/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java index ecf3215005..41e1a91781 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormRenderingFlicker.java @@ -49,6 +49,7 @@ public class FormRenderingFlicker extends TestBase { table.setImmediate(true); table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { clicked(event.getItem()); } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormTest.java b/tests/testbench/com/vaadin/tests/components/form/FormTest.java index 451a1b7fa3..604beb5fcc 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormTest.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormTest.java @@ -4,7 +4,7 @@ import java.util.LinkedHashMap; import com.vaadin.data.Item; import com.vaadin.data.util.BeanItem; -import com.vaadin.terminal.gwt.client.ui.AlignmentInfo; +import com.vaadin.shared.ui.AlignmentInfo; import com.vaadin.tests.components.abstractfield.AbstractFieldTest; import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.tests.util.Person; @@ -30,6 +30,7 @@ public class FormTest extends AbstractFieldTest<Form> { private Command<Form, String> footerWidthCommand = new Command<Form, String>() { + @Override public void execute(Form c, String value, Object data) { Layout footer = c.getFooter(); if (footer != null) { @@ -40,6 +41,7 @@ public class FormTest extends AbstractFieldTest<Form> { }; private Command<Form, String> footerHeightCommand = new Command<Form, String>() { + @Override public void execute(Form c, String value, Object data) { Layout footer = c.getFooter(); if (footer != null) { @@ -51,6 +53,7 @@ public class FormTest extends AbstractFieldTest<Form> { private Command<Form, Class<? extends Layout>> formLayoutCommand = new Command<Form, Class<? extends Layout>>() { + @Override public void execute(Form c, Class<? extends Layout> value, Object data) { if (value == null) { c.setLayout(null); @@ -73,6 +76,7 @@ public class FormTest extends AbstractFieldTest<Form> { }; private Command<Form, Class<? extends Layout>> formFooterCommand = new Command<Form, Class<? extends Layout>>() { + @Override public void execute(Form c, Class<? extends Layout> value, Object data) { if (value == null) { c.setFooter(null); @@ -92,6 +96,7 @@ public class FormTest extends AbstractFieldTest<Form> { }; private Command<Form, Item> formItemDataSourceCommand = new Command<Form, Item>() { + @Override public void execute(Form c, Item value, Object data) { c.setItemDataSource(value); } @@ -148,6 +153,7 @@ public class FormTest extends AbstractFieldTest<Form> { options.put("Default", DefaultFieldFactory.get()); options.put("Custom FieldFactory", new FormFieldFactory() { + @Override public Field<?> createField(Item item, Object propertyId, Component uiContext) { Class<?> type = item.getItemProperty(propertyId).getType(); @@ -186,6 +192,7 @@ public class FormTest extends AbstractFieldTest<Form> { Command<Form, FormFieldFactory> formFactoryCommand = new Command<Form, FormFieldFactory>() { + @Override public void execute(Form c, FormFieldFactory value, Object data) { c.setFormFieldFactory(value); c.setItemDataSource(c.getItemDataSource()); @@ -227,6 +234,7 @@ public class FormTest extends AbstractFieldTest<Form> { } Command<Form, Alignment> footerComponentAlignmentCommand = new Command<Form, Alignment>() { + @Override public void execute(Form c, Alignment value, Object data) { Layout l = c.getFooter(); if (l instanceof AlignmentHandler) { diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java index 689ba7ea83..ed1a3d9bd9 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormWithEnterShortCut.java @@ -20,6 +20,7 @@ public class FormWithEnterShortCut extends TestBase { Button button = new Button("Go"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("search: " + tf.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java b/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java index b803f8667f..24d207739e 100644 --- a/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java +++ b/tests/testbench/com/vaadin/tests/components/form/FormWithPropertyFormatterConnected.java @@ -18,6 +18,7 @@ public class FormWithPropertyFormatterConnected extends TestBase { Form form2 = new Form(); form2.setFormFieldFactory(new FormFieldFactory() { + @Override public Field createField(Item item, Object propertyId, Component uiContext) { AbstractField f = (AbstractField) DefaultFieldFactory.get() diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java index e74969f637..0055c3782e 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutCaptionStyles.java @@ -20,6 +20,7 @@ public class FormLayoutCaptionStyles extends TestBase { fl.addComponent(new Button("Toggle Text field 2 bold style", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if ("bold".equals(f2.getStyleName())) { f2.setStyleName(""); diff --git a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html index f6fc12af0a..7733da4e95 100644 --- a/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html +++ b/tests/testbench/com/vaadin/tests/components/formlayout/FormLayoutErrorHover.html @@ -28,7 +28,7 @@ </tr> <!--Hover error indicator--> <tr> - <td>mouseOver</td> + <td>showTooltip</td> <td>vaadin=runcomvaadintestscomponentsformlayoutFormLayoutErrorHover::/VVerticalLayout[0]/VVerticalLayout[0]/VFormLayout[0]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td> <td></td> </tr> diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java b/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java index 648bbd2d52..165827eb6b 100644 --- a/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java +++ b/tests/testbench/com/vaadin/tests/components/gridlayout/GridLayoutInForm.java @@ -45,6 +45,7 @@ public class GridLayoutInForm extends TestBase { addComponent(new Button("Use 15 first fields", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setVisibleItemProperties(propertyIds .subList(0, 15)); @@ -52,6 +53,7 @@ public class GridLayoutInForm extends TestBase { })); addComponent(new Button("Use 15 last fields", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setVisibleItemProperties(propertyIds.subList(35, 50)); @@ -59,6 +61,7 @@ public class GridLayoutInForm extends TestBase { })); addComponent(new Button("Use all fields", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setVisibleItemProperties(propertyIds); } diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java index da0efe9464..1c10b1d9d7 100644 --- a/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java +++ b/tests/testbench/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java @@ -22,6 +22,7 @@ public class MoveComponentsFromGridLayoutToInnerLayout extends TestBase { testButton = new Button("Click to move to inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.addComponent(testButton); } @@ -37,6 +38,7 @@ public class MoveComponentsFromGridLayoutToInnerLayout extends TestBase { Button b = new Button("Repaint inner layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vl.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html new file mode 100644 index 0000000000..16e74aa485 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html @@ -0,0 +1,62 @@ +<?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/com.vaadin.tests.components.javascriptcomponent.BasicJavaScriptComponent?restartApplication</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]</td> + <td>3. Got callback message: Callback message processed</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[1]</td> + <td>2. Got RPC message: RPC message processed</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[2]</td> + <td>1. Parent ids checked</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/domChild[1]/domChild[0]/domChild[0]</td> + <td>Component caption</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/JavaScriptWidget[0]/domChild[0]</td> + <td>4. Url: /run/com.vaadin.tests.components.javascriptcomponent.BasicJavaScriptComponent/APP/1/test</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/JavaScriptWidget[0]/domChild[1]</td> + <td>3. State message: Second state message</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/JavaScriptWidget[0]/domChild[2]</td> + <td>2. State message: First state message</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/JavaScriptWidget[0]/domChild[3]</td> + <td>1. Parent element className: v-verticallayout v-connector v-has-width</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index 5f2f945c8b..9ea61b92bb 100644 --- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -3,79 +3,128 @@ */ package com.vaadin.tests.components.javascriptcomponent; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.vaadin.annotations.LoadScripts; +import com.vaadin.annotations.JavaScript; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; +import com.vaadin.shared.communication.ClientRpc; +import com.vaadin.shared.communication.ServerRpc; +import com.vaadin.shared.communication.URLReference; +import com.vaadin.shared.ui.JavaScriptComponentState; +import com.vaadin.terminal.ClassResource; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.communication.ServerRpc; -import com.vaadin.terminal.gwt.client.ui.JavaScriptComponentState; +import com.vaadin.terminal.gwt.server.ResourceReference; import com.vaadin.tests.components.AbstractTestRoot; +import com.vaadin.tests.util.Log; import com.vaadin.ui.AbstractJavaScriptComponent; +import com.vaadin.ui.HasComponents; import com.vaadin.ui.JavaScriptCallback; -import com.vaadin.ui.Notification; -@LoadScripts({ "/statictestfiles/jsconnector.js" }) public class BasicJavaScriptComponent extends AbstractTestRoot { - public interface ExampleClickRpc extends ServerRpc { - public void onClick(String message); + public interface TestRpc extends ServerRpc, ClientRpc { + public void sendRpc(String message); } - public static class SpecialState extends JavaScriptComponentState { - private List<String> data; + public static class TestState extends JavaScriptComponentState { + private List<String> messages = new ArrayList<String>(); + private URLReference url; - public List<String> getData() { - return data; + public List<String> getMessages() { + return messages; } - public void setData(List<String> data) { - this.data = data; + public void setMessages(List<String> messages) { + this.messages = messages; + } + + public URLReference getUrl() { + return url; + } + + public void setUrl(URLReference url) { + this.url = url; } } - public static class ExampleWidget extends AbstractJavaScriptComponent { + @JavaScript("BasicJavaScriptComponentConnector.js") + public class ExampleWidget extends AbstractJavaScriptComponent { public ExampleWidget() { - registerRpc(new ExampleClickRpc() { - public void onClick(String message) { - Notification.show("Got a click: " + message); + registerRpc(new TestRpc() { + @Override + public void sendRpc(String message) { + log.log("Got RPC message: " + message); } }); - registerCallback("onclick", new JavaScriptCallback() { + registerCallback("messageToServer", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { - Notification.show("Got a callback: " - + arguments.getString(0)); + log.log("Got callback message: " + arguments.getString(0)); } }); - getState().setData(Arrays.asList("a", "b", "c")); + + registerCallback("reportParentIds", new JavaScriptCallback() { + @Override + public void call(JSONArray arguments) throws JSONException { + JSONArray parentIds = arguments.getJSONArray(0); + if (!parentIds.getString(0).equals(getConnectorId())) { + log.log("Connector ids doesn't match"); + } + + HasComponents parent = getParent(); + int i = 1; + while (parent != null) { + if (!parentIds.getString(i).equals( + parent.getConnectorId())) { + log.log("parentIds[" + i + "] doesn't match"); + } + i++; + parent = parent.getParent(); + } + log.log("Parent ids checked"); + } + }); + + getRpcProxy(TestRpc.class).sendRpc("RPC message"); + invokeCallback("messageToClient", "Callback message"); + + getState() + .setMessages( + Arrays.asList("First state message", + "Second state message")); + ClassResource resource = new ClassResource("test", + BasicJavaScriptComponent.this.getApplication()); + getState().setUrl(new ResourceReference(resource)); } @Override - public SpecialState getState() { - return (SpecialState) super.getState(); + public TestState getState() { + return (TestState) super.getState(); } } + private final Log log = new Log(5); + @Override protected void setup(WrappedRequest request) { + addComponent(log); + ExampleWidget c = new ExampleWidget(); - c.setCaption("test caption"); - c.setDescription("Some description"); + c.setCaption("Component caption"); addComponent(c); } @Override protected String getTestDescription() { - // TODO Auto-generated method stub - return null; + return "Test for basic JavaScript component functionality."; } @Override protected Integer getTicketNumber() { - // TODO Auto-generated method stub - return null; + return Integer.valueOf(8888); } } diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js new file mode 100644 index 0000000000..fe8367d18a --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentConnector.js @@ -0,0 +1,40 @@ +window.com_vaadin_tests_components_javascriptcomponent_BasicJavaScriptComponent_ExampleWidget = function() { + var parentIds = []; + var connectorId = this.getConnectorId(); + while(connectorId) { + parentIds.push(connectorId); + connectorId = this.getParentId(connectorId); + } + this.reportParentIds(parentIds); + + this.onStateChange = function() { + var e = this.getElement(); + + e.innerHTML = ''; + + var row = 1; + var log = function(text) { + e.innerHTML = "<div>" + row++ + ". " + text + "</div>" + e.innerHTML; + } + + log("Parent element className: " + this.getElement(this.getParentId()).className); + + var messages = this.getState().messages; + for(var i = 0; i < messages.length; i++) { + log("State message: " + messages[i]); + } + + var url = this.getState().url; + log("Url: " + this.translateVaadinUri(url.uRL)); //Strange format, see #9210 + } + + this.registerRpc({ + sendRpc: function(message) { + this.getRpcProxy().sendRpc(message + " processed"); + } + }); + + this.messageToClient = function(message) { + this.messageToServer(message + " processed"); + } +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java index a5bb291b67..61caf9a2f2 100644 --- a/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java +++ b/tests/testbench/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java @@ -27,6 +27,7 @@ public class HundredPercentWideLabelResize extends TestBase { getLayout().addComponent( new Button("toggle width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (getLayout().getWidth() == 500) { getLayout().setWidth("100px"); diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelModes.java b/tests/testbench/com/vaadin/tests/components/label/LabelModes.java index c220076b58..207a9a8de7 100644 --- a/tests/testbench/com/vaadin/tests/components/label/LabelModes.java +++ b/tests/testbench/com/vaadin/tests/components/label/LabelModes.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.label; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java b/tests/testbench/com/vaadin/tests/components/label/LabelTest.java index 6547e7a20f..186b3deeb3 100644 --- a/tests/testbench/com/vaadin/tests/components/label/LabelTest.java +++ b/tests/testbench/com/vaadin/tests/components/label/LabelTest.java @@ -5,7 +5,7 @@ import java.util.LinkedHashMap; import java.util.List; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.Label; @@ -14,12 +14,14 @@ public class LabelTest extends AbstractComponentTest<Label> implements private Command<Label, Object> setValueCommand = new Command<Label, Object>() { + @Override public void execute(Label c, Object value, Object data) { c.setValue(value); } }; private Command<Label, Boolean> valueChangeListenerCommand = new Command<Label, Boolean>() { + @Override public void execute(Label c, Boolean value, Object data) { if (value) { c.addListener(LabelTest.this); @@ -31,6 +33,7 @@ public class LabelTest extends AbstractComponentTest<Label> implements }; private Command<Label, ContentMode> contentModeCommand = new Command<Label, ContentMode>() { + @Override public void execute(Label c, ContentMode value, Object data) { c.setContentMode(value); } @@ -87,6 +90,7 @@ public class LabelTest extends AbstractComponentTest<Label> implements valueChangeListenerCommand); } + @Override public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { Object o = event.getProperty().getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java index 166d0bda77..82969fdb08 100644 --- a/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java +++ b/tests/testbench/com/vaadin/tests/components/label/LabelWrapping.java @@ -28,6 +28,7 @@ public class LabelWrapping extends TestBase { Button changeLength = new Button("Change length"); changeLength.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (longLabel.getValue().equals(longString)) { longLabel.setValue(""); diff --git a/tests/testbench/com/vaadin/tests/components/label/Labels.java b/tests/testbench/com/vaadin/tests/components/label/Labels.java index 1536f4555e..1da588576b 100644 --- a/tests/testbench/com/vaadin/tests/components/label/Labels.java +++ b/tests/testbench/com/vaadin/tests/components/label/Labels.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.label; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java index 55f5d431d3..b1cf2957be 100644 --- a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java +++ b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.Accordion; diff --git a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java index ce8626444c..f14e1afd8c 100644 --- a/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java +++ b/tests/testbench/com/vaadin/tests/components/link/LinkToPercentage.java @@ -15,6 +15,7 @@ public class LinkToPercentage extends TestBase { protected void setup() { String filename = "110% Vaadin"; ApplicationResource resource = new StreamResource(new StreamSource() { + @Override public InputStream getStream() { return new InputStream() { boolean first = true; diff --git a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java b/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java index 3bab03287c..a3fa973bc2 100644 --- a/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java +++ b/tests/testbench/com/vaadin/tests/components/listselect/ListSelects.java @@ -8,12 +8,14 @@ import com.vaadin.ui.ListSelect; public class ListSelects extends AbstractSelectTestCase<ListSelect> { private Command<ListSelect, Integer> rowsCommand = new Command<ListSelect, Integer>() { + @Override public void execute(ListSelect c, Integer value, Object data) { c.setRows(value); } }; private Command<ListSelect, Integer> colsCommand = new Command<ListSelect, Integer>() { + @Override public void execute(ListSelect c, Integer value, Object data) { c.setColumns(value); } diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled new file mode 100644 index 0000000000..075bb3c57f --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormInIframe.html_disabled @@ -0,0 +1,61 @@ +<?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>LoginFormTest</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">LoginFormTest</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/statictestfiles/LoginFormIframe.html</td> + <td></td> +</tr> +<tr> + <td>selectFrame</td> + <td>LoginForm</td> + <td></td> +</tr> +<tr> + <td>selectFrame</td> + <td>PID6</td> + <td></td> +</tr> +<tr> + <td>enterCharacter</td> + <td>username</td> + <td>username</td> +</tr> +<tr> + <td>enterCharacter</td> + <td>password</td> + <td>password</td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='loginf']/div[5]/div/span/span</td> + <td></td> +</tr> +<tr> + <td>selectFrame</td> + <td>relative=top</td> + <td></td> +</tr> +<tr> + <td>selectFrame</td> + <td>LoginForm</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentsloginformLoginFormTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]</td> + <td>User 'username', password='password' logged in</td> +</tr> +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java index bbc7d2ca7e..629edc2130 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormTest.java @@ -31,6 +31,7 @@ public class LoginFormTest extends TestBase { */ private static final long serialVersionUID = 1L; + @Override public void onLogin(LoginEvent event) { login((LoginForm) event.getSource(), event.getLoginParameter("username"), @@ -43,6 +44,7 @@ public class LoginFormTest extends TestBase { Button changeWidth = new Button("Change width", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (loginForm.getWidth() < 0) { loginForm.setWidth("300px"); @@ -55,6 +57,7 @@ public class LoginFormTest extends TestBase { Button changeHeight = new Button("Change height", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (loginForm.getHeight() < 0) { loginForm.setHeight("200px"); @@ -88,6 +91,7 @@ public class LoginFormTest extends TestBase { + "' logged in"); Button logoutButton = new Button("Log out", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); loginFormLayout.replaceComponent(b.getParent(), diff --git a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index 1295cadf95..83f89f0214 100644 --- a/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/tests/testbench/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -27,6 +27,7 @@ public class LoginFormWithMultipleWindows extends Application { private static final long serialVersionUID = 1L; + @Override public void onLogin(LoginEvent event) { showNotification(event.getLoginParameter("username") + ":" + event.getLoginParameter("password")); diff --git a/tests/testbench/com/vaadin/tests/components/media/Media.java b/tests/testbench/com/vaadin/tests/components/media/Media.java index 84b6974293..a1977c6ba1 100644 --- a/tests/testbench/com/vaadin/tests/components/media/Media.java +++ b/tests/testbench/com/vaadin/tests/components/media/Media.java @@ -27,6 +27,7 @@ public class Media extends TestBase { addComponent(v); addComponent(new Button("Play video", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { v.play(); } @@ -34,6 +35,7 @@ public class Media extends TestBase { })); addComponent(new Button("Pause video", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { v.pause(); } @@ -50,6 +52,7 @@ public class Media extends TestBase { addComponent(new Button("Play audio", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { a.play(); } @@ -57,6 +60,7 @@ public class Media extends TestBase { })); addComponent(new Button("Pause audio", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { a.pause(); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java index ba22bcb7a4..d7585af8ac 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarHtmlItems.java @@ -44,6 +44,7 @@ public class MenuBarHtmlItems extends ComponentTestCase<MenuBar> { private Component createSwitchHtmlAction() { return createBooleanAction("Html content allowed", false, new Command<MenuBar, Boolean>() { + @Override public void execute(MenuBar c, Boolean value, Object data) { c.setHtmlContentAllowed(value.booleanValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java index ede0c0c5a5..3af07645d6 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarNavigation.java @@ -47,6 +47,7 @@ public class MenuBarNavigation extends TestBase implements Command { return 5174; } + @Override public void menuSelected(MenuItem selectedItem) { log.log("MenuItem " + getName(selectedItem) + " selected"); } diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java index f162386336..c093a61812 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarRootItemSelectWithKeyboard.java @@ -10,6 +10,7 @@ public class MenuBarRootItemSelectWithKeyboard extends TestBase { @Override protected void setup() { Command c = new Command() { + @Override public void menuSelected(MenuItem selectedItem) { getMainWindow().showNotification(selectedItem.getText()); diff --git a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java index 2dc119bf43..5ab2b2145f 100644 --- a/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java +++ b/tests/testbench/com/vaadin/tests/components/menubar/MenuBarTest.java @@ -141,6 +141,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { /* COMMANDS */ Command<MenuBar, Integer> createRootMenuItems = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { rootItems = value; createRootItems(c); @@ -149,6 +150,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { Command<MenuBar, Integer> createSubMenuItems = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subItems = value; createSubItems(c); @@ -157,6 +159,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { Command<MenuBar, Integer> setSubMenuLevels = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subLevels = value; createSubItems(c); @@ -164,6 +167,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { }; private Command<MenuBar, Integer> setMenuIcons = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { iconInterval = value; updateIcons(c); @@ -172,6 +176,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setSubMenuDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subMenuDensity = value; createSubItems(c); @@ -180,6 +185,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setMenuItemDisabledDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { disabledDensity = value; createRootItems(c); @@ -188,6 +194,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setMenuItemInvisibleDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { invisibleDensity = value; createRootItems(c); @@ -196,6 +203,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setMenuItemCheckableDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { checkableDensity = value; createRootItems(c); @@ -204,6 +212,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> setSubMenuSeparatorDensity = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { subMenuSeparatorDensity = value; createSubItems(c); @@ -212,6 +221,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Boolean> setOpenRootOnHover = new Command<MenuBar, Boolean>() { + @Override public void execute(MenuBar c, Boolean value, Object data) { openRootMenuOnHover = value; c.setAutoOpen(value); @@ -221,6 +231,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Command<MenuBar, Integer> selectIcon = new Command<MenuBar, Integer>() { + @Override public void execute(MenuBar c, Integer value, Object data) { iconSize = value; updateIcons(c); @@ -231,6 +242,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private MenuBar.Command menuCommand = new MenuBar.Command() { + @Override public void menuSelected(MenuItem selectedItem) { log("Menu item '" + selectedItem.getText() + "' selected"); diff --git a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java index 011439f810..94023db2d0 100644 --- a/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java +++ b/tests/testbench/com/vaadin/tests/components/nativebutton/NativeButtonHtml.java @@ -20,6 +20,7 @@ public class NativeButtonHtml extends TestBase { final NativeButton swapButton = new NativeButton("<i>Swap button<i>"); swapButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { swapButton.setHtmlContentAllowed(!swapButton .isHtmlContentAllowed()); diff --git a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java b/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java index ec46757106..80b088f03a 100644 --- a/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java +++ b/tests/testbench/com/vaadin/tests/components/nativeselect/NativeSelects.java @@ -35,6 +35,7 @@ public class NativeSelects extends AbstractSelectTestCase<NativeSelect> { private Command<NativeSelect, Integer> columnsAction = new Command<NativeSelect, Integer>() { + @Override public void execute(NativeSelect c, Integer value, Object data) { c.setColumns(value); } diff --git a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java index 5a158c8f03..ab632a2a57 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/Notifications.java +++ b/tests/testbench/com/vaadin/tests/components/notification/Notifications.java @@ -50,9 +50,11 @@ public class Notifications extends TestBase implements ClickListener { return null; } + @Override public void buttonClick(ClickEvent event) { Notification n = new Notification(tf.getValue(), (Integer) type.getValue()); + n.setHtmlContentAllowed(true); n.show(Page.getCurrent()); } } diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java index 547ef3077b..25bc05c771 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java +++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsAndModalWindow.java @@ -17,6 +17,7 @@ public class NotificationsAndModalWindow extends TestBase { Button b = new Button("Button"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window w = new Window("This is a window"); w.setModal(true); diff --git a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java index 8e42db57f3..767d16b6da 100644 --- a/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java +++ b/tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java @@ -44,6 +44,7 @@ public class NotificationsHtmlAllowed extends TestBase implements ClickListener return 6097; } + @Override public void buttonClick(ClickEvent event) { Notification n = makeNotification(); n.show(Page.getCurrent()); diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java index 4668ef5ab8..877f9aa675 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java @@ -52,6 +52,7 @@ public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Toggle selection mode", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { if (og.isMultiSelect()) { @@ -69,6 +70,7 @@ public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Invert disabled items", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup c, Boolean value, Object data) { for (Object itemId : c.getItemIds()) { diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java index 0f6ae8917a..179d1aa5ff 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/HtmlOptionGroupItems.java @@ -54,6 +54,7 @@ public class HtmlOptionGroupItems extends ComponentTestCase<OptionGroup> { private Component createInvertHtmlItemsAction() { return createButtonAction("Toggle html mode", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { og.setHtmlContentAllowed(!og.isHtmlContentAllowed()); @@ -65,6 +66,7 @@ public class HtmlOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Toggle selection mode", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { if (og.isMultiSelect()) { @@ -82,6 +84,7 @@ public class HtmlOptionGroupItems extends ComponentTestCase<OptionGroup> { return createButtonAction("Invert disabled items", new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup c, Boolean value, Object data) { for (Object itemId : c.getItemIds()) { diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java index ff860f3293..213258ed29 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java @@ -2,7 +2,7 @@ package com.vaadin.tests.components.optiongroup; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; import com.vaadin.ui.OptionGroup; @@ -33,6 +33,7 @@ public class OptionGroupMultipleValueChange extends TestBase { og.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String s = "ValueChange: " + event.getProperty().getValue(); events.setValue(events.getValue() + "\n" + s); diff --git a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java index f8af6b07e4..c20de87ec7 100644 --- a/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java +++ b/tests/testbench/com/vaadin/tests/components/optiongroup/OptionGroups.java @@ -21,6 +21,7 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> { createDisabledItemsMultiToggle("Disabled items"); createBooleanAction("HTML content allowed", CATEGORY_STATE, false, new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup og, Boolean value, Object data) { og.setHtmlContentAllowed(value.booleanValue()); @@ -39,6 +40,7 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> { createSelectAction(string, CATEGORY_DECORATIONS, options, options .keySet().iterator().next(), new Command<OptionGroup, ThemeResource>() { + @Override public void execute(OptionGroup c, ThemeResource icon, Object data) { Collection<?> itemIds = c.getItemIds(); @@ -58,6 +60,7 @@ public class OptionGroups extends AbstractSelectTestCase<OptionGroup> { private Command<OptionGroup, Boolean> enabledItemCommand = new Command<OptionGroup, Boolean>() { + @Override public void execute(OptionGroup c, Boolean value, Object data) { c.setItemEnabled(data, value); diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java index 4f4faf15bb..821a5dbb93 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutClickListenerTest.java @@ -59,6 +59,7 @@ public class LayoutClickListenerTest extends TestBase { // Listen for layout click events layout.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { // Get the deepest nested component which was clicked diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java index b5e83978b7..62c552ee75 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java @@ -1,7 +1,7 @@ package com.vaadin.tests.components.orderedlayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -37,6 +37,7 @@ public class LayoutResizeTest extends TestBase { Button resize = new Button("Resize to 700x400", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { event.getButton() .getRoot() @@ -49,6 +50,7 @@ public class LayoutResizeTest extends TestBase { left.addComponent(resize); resize = new Button("Resize to 900x600", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { event.getButton() .getRoot() diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java index a4a7098f52..aeae09e7b9 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java @@ -31,18 +31,21 @@ public class OrderedLayoutCases extends AbstractTestRoot { setStyleName("sampleChild"); addComponent(createSimpleSelector("Child width", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setWidth(event.getProperty().getValue().toString()); } }, dimensionValues)); addComponent(createSimpleSelector("Child height", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setHeight(event.getProperty().getValue().toString()); } }, dimensionValues)); addComponent(createSimpleSelector("Caption", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = event.getProperty().getValue() .toString(); @@ -58,6 +61,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { addComponent(createSimpleSelector("Expand ratio", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { AbstractOrderedLayout parent = (AbstractOrderedLayout) getParent(); if (parent == null) { @@ -81,6 +85,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { } addComponent(createSimpleSelector("Alignment", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = event.getProperty().getValue() .toString(); @@ -130,6 +135,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { sizeBar.addComponent(createSimpleSelector("Layout width", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setWidth(event.getProperty().getValue() .toString()); @@ -137,6 +143,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, dimensionValues)); sizeBar.addComponent(createSimpleSelector("Layout height", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setHeight(event.getProperty().getValue() .toString()); @@ -144,6 +151,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, dimensionValues)); sizeBar.addComponent(createSimpleSelector("Spacing", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setSpacing(Boolean.parseBoolean(event .getProperty().getValue().toString())); @@ -151,6 +159,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, "false", "true")); sizeBar.addComponent(createSimpleSelector("Margin", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentLayout.setMargin(Boolean.parseBoolean(event .getProperty().getValue().toString())); @@ -158,6 +167,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { }, "false", "true")); sizeBar.addComponent(createSimpleSelector("Direction", new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); @@ -191,6 +201,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { HorizontalLayout caseBar = new HorizontalLayout(); caseBar.addComponent(new Button("Undefined without relative", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); setState(sizeBar, 2, 1); @@ -204,6 +215,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { })); caseBar.addComponent(new Button("Undefined with relative", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // width: 100% to middle child @@ -212,6 +224,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { })); caseBar.addComponent(new Button("Fixed with overflow", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // layout width: 350px @@ -222,6 +235,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { })); caseBar.addComponent(new Button("Fixed with extra space", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout width: 800px @@ -239,6 +253,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Expand with alignment", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout width: 800px @@ -256,6 +271,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Multiple expands", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout width: 800px @@ -278,6 +294,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Fixed + relative height", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Layout height: 100% @@ -295,6 +312,7 @@ public class OrderedLayoutCases extends AbstractTestRoot { caseBar.addComponent(new Button("Undefined + relative height", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { resetState(); // Height: 350px to left child diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java index 501c377ab7..a18400ce08 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java @@ -26,6 +26,7 @@ public class ReplaceComponentNPE extends TestBase { Button changer = new Button("ReplaceComponent"); changer.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getLayout().replaceComponent(button, outer); outer.addComponent(button); diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java index f20f26153f..945ccf0e28 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java +++ b/tests/testbench/com/vaadin/tests/components/orderedlayout/VerticalLayoutWidthCalculation.java @@ -43,6 +43,7 @@ public class VerticalLayoutWidthCalculation extends AbstractTestCase { Button btn = new Button("Show/hide"); btn.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tf2.setVisible(!tf2.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java b/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java index 671b2c3fca..b3eac5c82e 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java +++ b/tests/testbench/com/vaadin/tests/components/panel/BasicPanelTest.java @@ -37,6 +37,7 @@ public class BasicPanelTest extends TestBase { final CheckBox heightSelection = new CheckBox("Undefined height"); heightSelection.setImmediate(true); heightSelection.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (heightSelection.getValue() == Boolean.TRUE) { panel.setHeight(null); diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java index 4859b22932..7722e182ff 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelChangeContents.java @@ -48,6 +48,7 @@ public class PanelChangeContents extends AbstractTestRoot implements setContent(content); } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == statsButton) { panel.setContent(stats); diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java index 65a185b160..40f6d5ea33 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.java @@ -12,6 +12,7 @@ public class PanelClickListenerRelativeCoordinates extends TestBase { Panel panel = new Panel("Panel's caption"); panel.addListener(new ClickListener() { + @Override public void click(ClickEvent event) { getMainWindow() .showNotification( diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java index 65754de0f3..a4cba89732 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldNotScroll.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.panel; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -23,6 +23,7 @@ public class PanelShouldNotScroll extends TestBase { p.addComponent(foo()); addMore = new Button("Add"); addMore.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.removeComponent(addMore); p.addComponent(foo()); diff --git a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java index eec39359aa..5ca5c5135f 100644 --- a/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java +++ b/tests/testbench/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java @@ -34,6 +34,7 @@ public class PanelShouldRemoveActionHandler extends TestBase { Button add = new Button("Add an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { add(); } @@ -42,6 +43,7 @@ public class PanelShouldRemoveActionHandler extends TestBase { Button addAnother = new Button("Add another action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addAnother(); } @@ -50,6 +52,7 @@ public class PanelShouldRemoveActionHandler extends TestBase { Button remove = new Button("Remove an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { remove(); } @@ -73,12 +76,14 @@ public class PanelShouldRemoveActionHandler extends TestBase { panel.setCaption(panel.getCaption() + " - Added handler"); Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Left", ShortcutAction.KeyCode.ARROW_LEFT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); @@ -92,12 +97,14 @@ public class PanelShouldRemoveActionHandler extends TestBase { public void addAnother() { Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Right", ShortcutAction.KeyCode.ARROW_RIGHT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java new file mode 100644 index 0000000000..6461d10277 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewClickShortcut.java @@ -0,0 +1,78 @@ +package com.vaadin.tests.components.popupview; + +import com.vaadin.event.ShortcutAction.KeyCode; +import com.vaadin.event.ShortcutAction.ModifierKey; +import com.vaadin.tests.components.TestBase; +import com.vaadin.tests.util.Log; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.ComponentContainer; +import com.vaadin.ui.Layout; +import com.vaadin.ui.PopupView; +import com.vaadin.ui.Table; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; + +public class PopupViewClickShortcut extends TestBase { + + private Window sub = new Window("Table", makeTable("Subwindow", KeyCode.S)); + + private Log log = new Log(5); + + @Override + protected void setup() { + sub.center(); + getMainWindow().addWindow(sub); + addComponent(log); + addComponent(new PopupView("Show popup table", makeTable("Popup", + KeyCode.P))); + addComponent(makeTable("Main window", KeyCode.M)); + sub.addComponent(new PopupView("Show popup table", makeTable( + "Subwindow popup", KeyCode.U))); + } + + private ComponentContainer makeTable(final String caption, int keyCode) { + final Table t = new Table(); + t.setSelectable(true); + t.setHeight("200px"); + t.setWidth("200px"); + t.addContainerProperty("foo", String.class, "foo"); + for (int i = 0; i < 5; i++) { + t.addItem(new String[] { "foo " + i }, i); + } + + final Layout l = new VerticalLayout(); + l.setCaption(caption); + l.setWidth(null); + + Button b = new Button("Submit " + caption + " (Ctrl+Alt+" + + String.valueOf(Character.toChars(keyCode)) + ")", + new Button.ClickListener() { + private int i = 5; + + @Override + public void buttonClick(ClickEvent event) { + log.log("Submitted from " + + event.getButton().getParent().getCaption()); + t.addItem(new String[] { "added " + i++ }, i); + } + }); + b.setClickShortcut(keyCode, ModifierKey.CTRL, ModifierKey.ALT); + + l.addComponent(t); + l.addComponent(b); + + return l; + } + + @Override + protected String getDescription() { + return "Enter ClickShortcut does not work with PopupView"; + } + + @Override + protected Integer getTicketNumber() { + return 8193; + } + +} diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java index 481c134ee6..75f95977bd 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewNullValues.java @@ -20,6 +20,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[0]); b[0] = new Button("Open popupview 1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[0].setPopupVisible(true); } @@ -38,6 +39,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[1]); b[1] = new Button("Open popupview 2", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[1].setPopupVisible(true); } @@ -55,6 +57,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[2]); b[2] = new Button("Open popupview 3", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[2].setPopupVisible(true); } @@ -72,6 +75,7 @@ public class PopupViewNullValues extends TestBase { addComponent(pv[3]); b[3] = new Button("Open popupview 4", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { pv[3].setPopupVisible(true); } diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java index 72183e3570..01ed34a13f 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewOffScreen.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.popupview; import java.util.ArrayList; import java.util.List; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.Button; @@ -42,6 +42,7 @@ public class PopupViewOffScreen extends TestBase { Button showall = new Button("Popup all", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (PopupView pv : popupViews) { pv.setPopupVisible(true); diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java index 7e917630c8..271a7eea2a 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewShouldCloseOnTabOut.java @@ -24,10 +24,12 @@ public class PopupViewShouldCloseOnTabOut extends TestBase { protected void setup() { PopupView pv = new PopupView(new Content() { + @Override public String getMinimizedValueAsHTML() { return "<b>click me</b>"; } + @Override public Component getPopupComponent() { VerticalLayout vl = new VerticalLayout(); TextField field1 = new TextField(); diff --git a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java index 5ed0a375fe..069ccef2bb 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/PopupViewWithRTE.java @@ -27,6 +27,7 @@ public class PopupViewWithRTE extends TestBase { VerticalLayout vl = new VerticalLayout(); + @Override public String getMinimizedValueAsHTML() { String value = rte.getValue(); if (value == null || "".equals(value)) { @@ -40,6 +41,7 @@ public class PopupViewWithRTE extends TestBase { return value.toString(); } + @Override public Component getPopupComponent() { return vl; } diff --git a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java index 89f6d155f2..bef3cfced8 100644 --- a/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java +++ b/tests/testbench/com/vaadin/tests/components/popupview/ReopenPopupView.java @@ -18,6 +18,7 @@ public class ReopenPopupView extends AbstractTestRoot { addComponent(log); addComponent(new PopupView("PopupView", new Button("Button", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button clicked"); } diff --git a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java index 62dba61191..9f632ac806 100644 --- a/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java +++ b/tests/testbench/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java @@ -22,6 +22,7 @@ public class ProgressIndicatorInvisible extends TestBase { addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { // If we skip hiding the layout, hiding the ProgressIndicator // will stop the polling diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html new file mode 100644 index 0000000000..be1c5a2cde --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html @@ -0,0 +1,27 @@ +<?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>RichTextAreaScrolling</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">RichTextAreaScrolling</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.richtextarea.RichTextAreaScrolling?restartApplication</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java new file mode 100644 index 0000000000..f88ed0c67c --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java @@ -0,0 +1,57 @@ +package com.vaadin.tests.components.richtextarea; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalLayout; + +public class RichTextAreaScrolling extends TestBase { + + @Override + protected String getDescription() { + return "A read-only RichTextArea should be (touch) scrollable"; + } + + @Override + protected Integer getTicketNumber() { + return 7036; + } + + @Override + protected void setup() { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 50; ++i) { + sb.append("A long string with several lines<br/>"); + } + + HorizontalLayout main = new HorizontalLayout(); + main.setSpacing(true); + addComponent(main); + + RichTextArea first = new RichTextArea("Defined height"); + RichTextArea second = new RichTextArea("Full height"); + RichTextArea third = new RichTextArea("Undefined height"); + + first.setValue(sb); + second.setValue(sb); + third.setValue(sb); + + first.setReadOnly(true); + second.setReadOnly(true); + third.setReadOnly(true); + + first.setWidth("200px"); + first.setHeight("400px"); + second.setSizeFull(); + third.setSizeUndefined(); + + VerticalLayout secondLayout = new VerticalLayout(); + secondLayout.setWidth("200px"); + secondLayout.setHeight("200px"); + secondLayout.addComponent(second); + + main.addComponent(first); + main.addComponent(secondLayout); + main.addComponent(third); + } +} diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java index cb7b991bda..4155dd8a07 100644 --- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java @@ -14,6 +14,7 @@ public class RichTextAreaTest extends AbstractFieldTest<RichTextArea> { private Command<RichTextArea, Boolean> nullSelectionAllowedCommand = new Command<RichTextArea, Boolean>() { + @Override public void execute(RichTextArea c, Boolean value, Object data) { c.setNullSettingAllowed(value); @@ -21,6 +22,7 @@ public class RichTextAreaTest extends AbstractFieldTest<RichTextArea> { }; private Command<RichTextArea, String> nullRepresentationCommand = new Command<RichTextArea, String>() { + @Override public void execute(RichTextArea c, String value, Object data) { c.setNullRepresentation(value); } diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java index 98f31cd68c..73d7a95e9f 100644 --- a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java @@ -3,6 +3,7 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ShortcutAction; +import com.vaadin.terminal.Page; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Component; @@ -19,6 +20,7 @@ public class RichTextAreaWithKeyboardShortcuts extends TestBase { ShortcutAction save = new ShortcutAction("^Save"); private Action[] actions = new Action[] { save }; + @Override public void handleAction(Action action, Object sender, Object target) { String msg = "Action: " + action.getCaption(); msg += " From : " + sender.getClass().getSimpleName() + " '" @@ -31,10 +33,13 @@ public class RichTextAreaWithKeyboardShortcuts extends TestBase { String string = f.getValue().toString(); msg += " Value: " + string; - Notification.show(msg); + Notification notification = new Notification(msg); + notification.setHtmlContentAllowed(true); + notification.show(Page.getCurrent()); } + @Override public Action[] getActions(Object target, Object sender) { return actions; } diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java index c4547e56ff..254410a549 100644 --- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java +++ b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.root; import com.vaadin.RootRequiresMoreInformationException; import com.vaadin.annotations.EagerInit; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.WrappedRequest; import com.vaadin.terminal.WrappedRequest.BrowserDetails; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestApplication; import com.vaadin.ui.Label; import com.vaadin.ui.Link; diff --git a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java b/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java index 251672fb9a..d34c7718ce 100644 --- a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java +++ b/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java @@ -17,12 +17,14 @@ public class UriFragmentTest extends AbstractTestRoot { addComponent(fragmentLabel); updateLabel(); getPage().addListener(new Page.FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent event) { updateLabel(); } }); addComponent(new Button("Navigate to #test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getPage().setFragment("test"); } diff --git a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java index 0565811e15..7c2d8dd243 100644 --- a/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/select/AbstractSelectTestCase.java @@ -146,6 +146,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Boolean> nullSelectionAllowedCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { (c).setNullSelectionAllowed(value); } @@ -153,6 +154,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Boolean> multiselectCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setMultiSelect(value); } @@ -160,6 +162,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Object> nullSelectItemIdCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { c.setNullSelectionItemId(value); } @@ -167,6 +170,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Integer> itemsInContainerCommand = new Command<T, Integer>() { + @Override public void execute(T t, Integer value, Object data) { items = value; updateContainer(); @@ -175,6 +179,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Integer> propertiesInContainerCommand = new Command<T, Integer>() { + @Override public void execute(T t, Integer value, Object data) { properties = value; updateContainer(); @@ -183,6 +188,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends protected Command<T, Boolean> itemClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { ((ItemClickNotifier) c) @@ -206,6 +212,7 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends /* COMMANDS END */ + @Override public void itemClick(ItemClickEvent event) { String type = event.getButtonName(); if (event.isDoubleClick()) { diff --git a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java index 931686003a..470c97442f 100644 --- a/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java +++ b/tests/testbench/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java @@ -22,6 +22,7 @@ public class ComboBoxAddWhileFiltering extends TestBase { Button b = new Button("add item (^N)"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addItem(comboBox); } diff --git a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java b/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java index dd2a8bb1a8..6f203bf8c9 100644 --- a/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java +++ b/tests/testbench/com/vaadin/tests/components/select/FocusListenerBreaksDropdownMenu.java @@ -14,6 +14,7 @@ public class FocusListenerBreaksDropdownMenu extends TestBase { } comboBox.addListener(new FieldEvents.FocusListener() { + @Override public void focus(FieldEvents.FocusEvent event) { comboBox.addItem(); } diff --git a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java index d5577e213c..75a3f1b751 100644 --- a/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java +++ b/tests/testbench/com/vaadin/tests/components/select/NativeSelects.java @@ -108,6 +108,7 @@ public class NativeSelects extends ComponentTestCase<NativeSelect> { actions.add(createBooleanAction("Null selection allowed", false, new Command<NativeSelect, Boolean>() { + @Override public void execute(NativeSelect c, Boolean value, Object data) { c.setNullSelectionAllowed(value); diff --git a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java b/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java index 74ebb08826..984bab5b34 100644 --- a/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java +++ b/tests/testbench/com/vaadin/tests/components/select/NullSelectionItemId.java @@ -36,6 +36,7 @@ public class NullSelectionItemId extends TestBase implements ClickListener { button = new Button( "Select null with select(NULL_ITEM_ID) (should make value null)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mySelect.select(NULL_ITEM_ID); } @@ -46,6 +47,7 @@ public class NullSelectionItemId extends TestBase implements ClickListener { button = new Button( "Select null with setValue(null) (should make value null)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mySelect.setValue(null); } @@ -55,6 +57,7 @@ public class NullSelectionItemId extends TestBase implements ClickListener { } + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification( "mySelect.getValue() returns: " + mySelect.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java index 743dc071c9..b9ae958a03 100644 --- a/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java +++ b/tests/testbench/com/vaadin/tests/components/select/SelectDisplaysOldValue.java @@ -143,6 +143,7 @@ public class SelectDisplaysOldValue extends TestBase { private class ControllerUpdatedListener implements Property.ValueChangeListener { + @Override public void valueChange(Property.ValueChangeEvent valueChangeEvent) { refreshSlaveDropdown((Integer) valueChangeEvent.getProperty() .getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java b/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java index b3911f19c7..b97231ae8e 100644 --- a/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java +++ b/tests/testbench/com/vaadin/tests/components/select/StylingPopupOpener.java @@ -19,6 +19,7 @@ public class StylingPopupOpener extends TestBase { addComponent(select); addComponent(new Button("Update style", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { select.setStyleName("mystyle"); } diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java index cf33e2c7ff..789174260f 100644 --- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java +++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectCaptionStyles.java @@ -20,6 +20,7 @@ public class TwinColSelectCaptionStyles extends TestBase { Button b = new Button("Set height and width to 500px", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { sel.setHeight("500px"); sel.setWidth("500px"); diff --git a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java index 031a7e9d3d..b27dfa0ec8 100644 --- a/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java +++ b/tests/testbench/com/vaadin/tests/components/select/TwinColSelectTest.java @@ -7,12 +7,14 @@ import com.vaadin.ui.TwinColSelect; public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, Integer> rowsCommand = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setRows(value); } }; private Command<TwinColSelect, Integer> colsCommand = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setColumns(value); } @@ -20,6 +22,7 @@ public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, String> leftColumnCaptionCommand = new Command<TwinColSelect, String>() { + @Override public void execute(TwinColSelect c, String value, Object data) { c.setLeftColumnCaption(value); } @@ -27,6 +30,7 @@ public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, String> rightColumnCaptionCommand = new Command<TwinColSelect, String>() { + @Override public void execute(TwinColSelect c, String value, Object data) { c.setRightColumnCaption(value); } diff --git a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java b/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java index e34a294740..9be1fea987 100644 --- a/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java +++ b/tests/testbench/com/vaadin/tests/components/slider/SliderTest.java @@ -8,23 +8,27 @@ import com.vaadin.ui.Slider; public class SliderTest extends AbstractFieldTest<Slider> { private Command<Slider, Double> minCommand = new Command<Slider, Double>() { + @Override public void execute(Slider c, Double value, Object data) { c.setMin(value); } }; private Command<Slider, Double> maxCommand = new Command<Slider, Double>() { + @Override public void execute(Slider c, Double value, Object data) { c.setMax(value); } }; private Command<Slider, Integer> orientationCommand = new Command<Slider, Integer>() { + @Override public void execute(Slider c, Integer value, Object data) { c.setOrientation(value); } }; private Command<Slider, Integer> resolutionCommand = new Command<Slider, Integer>() { + @Override public void execute(Slider c, Integer value, Object data) { c.setResolution(value); } diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java index 1f7b6b7cbe..dc361b1b27 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/AbstractSplitPanelTest.java @@ -13,6 +13,7 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel> private Command<T, Boolean> splitterClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((SplitterClickListener) AbstractSplitPanelTest.this); @@ -23,12 +24,14 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel> } }; private Command<T, SplitPosition> setSplitPositionCommand = new Command<T, AbstractSplitPanelTest.SplitPosition>() { + @Override public void execute(T c, SplitPosition value, Object data) { value.apply(c); } }; private Command<T, Boolean> splitterLockCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setLocked(value); } @@ -122,6 +125,7 @@ public abstract class AbstractSplitPanelTest<T extends AbstractSplitPanel> } + @Override public void splitterClick(SplitterClickEvent event) { log(event.getClass().getSimpleName() + ": " + event.getButtonName() + " at " + event.getRelativeX() + "," + event.getRelativeY()); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index d4716433b7..05e10397ac 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -53,6 +53,7 @@ public class SplitPanelExtraScrollbars extends AbstractTestCase implements return 3458; } + @Override public void buttonClick(ClickEvent event) { if (b.getHeight() == 200) { b.setHeight("1200px"); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java index ef17a3c668..a86d209f65 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelReversePosition.java @@ -26,6 +26,7 @@ public class SplitPanelReversePosition extends TestBase { hsplit.setImmediate(true); hsplit.setSplitPosition(100, Sizeable.UNITS_PIXELS, hsplitReversed); hsplit.addListener(new HorizontalSplitPanel.SplitterClickListener() { + @Override public void splitterClick(SplitterClickEvent event) { getMainWindow().showNotification("Horizontal Splitter Clicked"); } @@ -40,6 +41,7 @@ public class SplitPanelReversePosition extends TestBase { vsplit.setImmediate(true); vsplit.setSplitPosition(10, Sizeable.UNITS_PERCENTAGE, vsplitReversed); vsplit.addListener(new SplitterClickListener() { + @Override public void splitterClick(SplitterClickEvent event) { getMainWindow().showNotification("Vertical Splitter Clicked"); } @@ -61,6 +63,7 @@ public class SplitPanelReversePosition extends TestBase { buttons.addComponent(new Button("Swap horizontal positioning", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { hsplitReversed = !hsplitReversed; hsplit.setSplitPosition(100, Sizeable.UNITS_PIXELS, @@ -71,6 +74,7 @@ public class SplitPanelReversePosition extends TestBase { buttons.addComponent(new Button("Swap vertical positioning", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { vsplitReversed = !vsplitReversed; vsplit.setSplitPosition(10, Sizeable.UNITS_PERCENTAGE, diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java index 5fad68fef5..08e602241f 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java @@ -47,6 +47,7 @@ public class SplitPanelSplitterWidth extends TestBase { getLayout().addComponent( new Button("Unlock", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { split.setLocked(false); split2.setLocked(false); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java index 470a47f160..26abd0a782 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelSwapComponents.java @@ -19,6 +19,7 @@ public class SplitPanelSwapComponents extends TestBase { getLayout().addComponent(hsplit); Button swap = new Button("Swap components", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Component first = hsplit.getFirstComponent(); hsplit.removeComponent(first); diff --git a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java index f7c3dd84e4..2a730da9be 100644 --- a/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java +++ b/tests/testbench/com/vaadin/tests/components/splitpanel/SplitPanelWithMinimumAndMaximum.java @@ -276,6 +276,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { Button disableMinimum = new Button("Disable min limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMinSplitPosition(0, Sizeable.UNITS_PERCENTAGE); @@ -284,6 +285,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { }); Button enableMinimum = new Button("Enable min limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMinSplitPosition(10, Sizeable.UNITS_PERCENTAGE); @@ -292,6 +294,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { }); Button disableMaximum = new Button("Disable max limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMaxSplitPosition(100, Sizeable.UNITS_PERCENTAGE); @@ -300,6 +303,7 @@ public class SplitPanelWithMinimumAndMaximum extends TestBase { }); Button enableMaximum = new Button("Enable max limit", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { togglableSplitPanel.setMaxSplitPosition(80, Sizeable.UNITS_PERCENTAGE); diff --git a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java b/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java index e8445f8422..bde50af013 100644 --- a/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/AddItemToEmptyTable.java @@ -20,6 +20,7 @@ public class AddItemToEmptyTable extends TestBase { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { rightTable.setColumnWidth("name", 150); @@ -36,6 +37,7 @@ public class AddItemToEmptyTable extends TestBase { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { rightTable.setColumnWidth("info", 20); @@ -71,6 +73,7 @@ public class AddItemToEmptyTable extends TestBase { Button b = new Button("Add item", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object id = rightTable.addItem(); Item item = rightTable.getItem(id); @@ -83,6 +86,7 @@ public class AddItemToEmptyTable extends TestBase { b = new Button("Clear", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { rightTable.removeAllItems(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java b/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java index 5486d6248d..80b136d2ab 100644 --- a/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java +++ b/tests/testbench/com/vaadin/tests/components/table/AddNonRenderedRow.java @@ -22,6 +22,7 @@ public class AddNonRenderedRow extends TestBase { Button addrowButton = new Button("Add row"); addrowButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent pEvent) { addRow(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java index 08bbd0790f..35f35c1407 100644 --- a/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java +++ b/tests/testbench/com/vaadin/tests/components/table/CellStyleGeneratorTest.java @@ -16,6 +16,7 @@ public class CellStyleGeneratorTest extends TestBase { CellStyleGenerator g = new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (propertyId != null && propertyId.equals("red")) { return "red"; diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java index 95e94bcd47..08b65e2ef5 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java @@ -30,10 +30,12 @@ public class ColumnCollapsingAndColumnExpansion extends TestBase { final Action H = new Action("Toggle Col2"); final Action[] actions = new Action[] { H }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { table.setColumnCollapsed("Col2", !table.isColumnCollapsed("Col2")); @@ -55,6 +57,7 @@ public class ColumnCollapsingAndColumnExpansion extends TestBase { final TextField tf = new TextField("Column name (ColX)"); Button hide = new Button("Collapse", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed(tf.getValue(), true); } @@ -63,6 +66,7 @@ public class ColumnCollapsingAndColumnExpansion extends TestBase { Button show = new Button("Show", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed(tf.getValue(), false); } diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java b/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java index d3dfa61ceb..2898750113 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnGeneratorAddingOrder.java @@ -23,6 +23,7 @@ public class ColumnGeneratorAddingOrder extends TestBase { Table t = new Table(); t.addGeneratedColumn("col2", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Button("generated b c2"); @@ -39,6 +40,7 @@ public class ColumnGeneratorAddingOrder extends TestBase { t.setContainerDataSource(c); t.addGeneratedColumn("col1", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Button("generated b c1"); diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java index fdcb458a6a..324d1a63cf 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnHeaderAlignments.java @@ -30,6 +30,7 @@ public class ColumnHeaderAlignments extends TestBase { theme.setNullSelectionAllowed(false); theme.setImmediate(true); theme.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setTheme(String.valueOf(event.getProperty().getValue())); } @@ -38,6 +39,7 @@ public class ColumnHeaderAlignments extends TestBase { CheckBox footers = new CheckBox("Show footers"); footers.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean visible = (Boolean) event.getProperty().getValue(); fooTable.setFooterVisible(visible); diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java b/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java index 4c1fc70e5e..f32633eece 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnReorderEvent.java @@ -83,6 +83,7 @@ public class ColumnReorderEvent extends TestBase { table.setColumnHeader("lastname", "LastName"); table.addListener(new Table.ColumnReorderListener() { + @Override public void columnReorder( com.vaadin.ui.Table.ColumnReorderEvent event) { order.setValue(aToString(table.getVisibleColumns())); diff --git a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java b/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java index 29131b8d7a..f092ba8bca 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java +++ b/tests/testbench/com/vaadin/tests/components/table/ColumnResizeEvent.java @@ -84,6 +84,7 @@ public class ColumnResizeEvent extends TestBase { column3Width.setValue(table.getColumnWidth("150pxfixedCol") + "px"); table.addListener(new ColumnResizeListener() { + @Override public void columnResize(com.vaadin.ui.Table.ColumnResizeEvent event) { if (event.getPropertyId().equals("firstname")) { diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java index b8e9226ad2..c76edca40d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java +++ b/tests/testbench/com/vaadin/tests/components/table/ContainerChangeWithPartlySamePropertyIds.java @@ -68,6 +68,7 @@ public class ContainerChangeWithPartlySamePropertyIds extends TestBase { Button switchContainerButton = new Button("switch container"); switchContainerButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (testTable.getContainerDataSource() == containerA) { testTable.setContainerDataSource(containerB); @@ -80,6 +81,7 @@ public class ContainerChangeWithPartlySamePropertyIds extends TestBase { Button clearButton = new Button("clear (click twice)"); clearButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { me.removeComponent(testTable); diff --git a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java index 84e98deffb..c24be6de96 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java +++ b/tests/testbench/com/vaadin/tests/components/table/ContainerSizeChange.java @@ -32,6 +32,7 @@ public class ContainerSizeChange extends TestBase { Button b = new Button("Decrease size", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ds.decreaseSize(); } @@ -42,6 +43,7 @@ public class ContainerSizeChange extends TestBase { b = new Button("Increase size", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ds.increaseSize(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java b/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java index 86646f522f..c52f57358c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java +++ b/tests/testbench/com/vaadin/tests/components/table/DisabledTableShouldNotSendPageLengthUpdates.java @@ -16,6 +16,7 @@ public class DisabledTableShouldNotSendPageLengthUpdates extends TestBase { HorizontalSplitPanel split = new HorizontalSplitPanel(); table.addContainerProperty("name", Integer.class, 0); Button button = new Button("Add items", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (int i = 0; i < 5; i++) { Object id = table.addItem(); diff --git a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java b/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java index c048c770fa..920ccc2038 100644 --- a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java @@ -40,6 +40,7 @@ public class DoublesInTable extends TestBase { editMode.setImmediate(true); editMode.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setEditable(editMode.getValue()); @@ -50,6 +51,7 @@ public class DoublesInTable extends TestBase { useCustomConverters.setImmediate(true); useCustomConverters.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { recreateTable(); } @@ -75,6 +77,7 @@ public class DoublesInTable extends TestBase { cb.setValue(Locale.US); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { recreateTable(); } @@ -134,6 +137,7 @@ public class DoublesInTable extends TestBase { t.setImmediate(true); t.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value is now: " + event.getProperty().getValue()); @@ -145,12 +149,14 @@ public class DoublesInTable extends TestBase { private void addConverters(Table t) { t.setConverter("sex", new Converter<String, Sex>() { + @Override public Sex convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { // not used in this test - Table only converts to presentation return null; } + @Override public String convertToPresentation(Sex value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -159,22 +165,26 @@ public class DoublesInTable extends TestBase { return value.getStringRepresentation(); } + @Override public Class<Sex> getModelType() { return Sex.class; } + @Override public Class<String> getPresentationType() { return String.class; } }); t.setConverter("deceased", new Converter<String, Boolean>() { + @Override public Boolean convertToModel(String value, Locale locale) { // not used in this test - Table only converts from source to // target return null; } + @Override public String convertToPresentation(Boolean value, Locale locale) { if (value == null || value) { return "YES, DEAD!"; @@ -183,16 +193,19 @@ public class DoublesInTable extends TestBase { } } + @Override public Class<Boolean> getModelType() { return Boolean.class; } + @Override public Class<String> getPresentationType() { return String.class; } }); t.setConverter("age", new Converter<String, Integer>() { + @Override public Integer convertToModel(String value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { // not used in this test - Table only converts from source to @@ -200,6 +213,7 @@ public class DoublesInTable extends TestBase { return null; } + @Override public String convertToPresentation(Integer value, Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException { if (value == null) { @@ -216,32 +230,38 @@ public class DoublesInTable extends TestBase { } } + @Override public Class<Integer> getModelType() { return Integer.class; } + @Override public Class<String> getPresentationType() { return String.class; } }); t.setConverter("address", new Converter<String, Address>() { + @Override public Address convertToModel(String value, Locale locale) throws ConversionException { // not used in this test - Table only converts to presentation return null; } + @Override public String convertToPresentation(Address value, Locale locale) throws ConversionException { return value.getStreetAddress() + ", " + value.getCity() + " (" + value.getCountry() + ")"; } + @Override public Class<Address> getModelType() { return Address.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java index acb866a1da..5db294088a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java +++ b/tests/testbench/com/vaadin/tests/components/table/EditableModeChange.java @@ -44,6 +44,7 @@ public class EditableModeChange extends TestBase { items.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { if (event.isDoubleClick()) { selectionEvent = event; diff --git a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java index 8aa6d1277f..88c7c76889 100644 --- a/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java +++ b/tests/testbench/com/vaadin/tests/components/table/EditableTableLeak.java @@ -9,7 +9,7 @@ import java.util.HashMap; import com.vaadin.data.Container; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.Button; @@ -88,6 +88,7 @@ public class EditableTableLeak extends TestBase { useFieldFactory.setImmediate(true); useFieldFactory.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (useFieldFactory.getValue()) { table.setTableFieldFactory(new CachingFieldFactory()); @@ -111,6 +112,7 @@ public class EditableTableLeak extends TestBase { addComponent(sizeLabel); addComponent(new Button("Show size of the table", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.requestRepaintAll(); updateSize(); @@ -119,6 +121,7 @@ public class EditableTableLeak extends TestBase { })); addComponent(new Button("Select the second row", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.select("AL"); updateSize(); diff --git a/tests/testbench/com/vaadin/tests/components/table/Footer.java b/tests/testbench/com/vaadin/tests/components/table/Footer.java index c962ce8468..7fd8d3563f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/Footer.java +++ b/tests/testbench/com/vaadin/tests/components/table/Footer.java @@ -50,6 +50,7 @@ public class Footer extends TestBase { final CheckBox visible = new CheckBox("Footers Visible", true); visible.setImmediate(true); visible.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setFooterVisible((Boolean) visible.getValue()); @@ -61,6 +62,7 @@ public class Footer extends TestBase { final TextField footer1Value = new TextField(null, "Footer1"); footer1Value.setImmediate(true); Button footer1Btn = new Button("Change", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnFooter("col1", footer1Value.getValue() == null ? "" : footer1Value @@ -75,6 +77,7 @@ public class Footer extends TestBase { final TextField footer2Value = new TextField(null, "Footer2"); footer2Value.setImmediate(true); Button footer2Btn = new Button("Change", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnFooter("col2", footer2Value.getValue() == null ? "" : footer2Value @@ -89,6 +92,7 @@ public class Footer extends TestBase { final TextField footer3Value = new TextField(null, "Footer3"); footer3Value.setImmediate(true); Button footer3Btn = new Button("Change", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnFooter("col3", footer3Value.getValue() == null ? "" : footer3Value diff --git a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java index 2ae663986b..08dc47908a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/FooterClick.java +++ b/tests/testbench/com/vaadin/tests/components/table/FooterClick.java @@ -42,6 +42,7 @@ public class FooterClick extends TestBase { // Add a footer click listener table.addListener(new Table.FooterClickListener() { + @Override public void footerClick(FooterClickEvent event) { columnField.setValue(String.valueOf(event.getPropertyId())); log.log("Clicked on footer: " + event.getPropertyId()); @@ -53,6 +54,7 @@ public class FooterClick extends TestBase { immediateCheckbox.setValue(table.isImmediate()); immediateCheckbox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setImmediate((Boolean) event.getProperty().getValue()); } @@ -65,6 +67,7 @@ public class FooterClick extends TestBase { columnReorderingCheckbox .addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setColumnReorderingAllowed((Boolean) event .getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java index d5debcfe16..b335e34d84 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java +++ b/tests/testbench/com/vaadin/tests/components/table/HeaderClick.java @@ -28,6 +28,7 @@ public class HeaderClick extends TestBase { // Add a header click listener table.addListener(new Table.HeaderClickListener() { + @Override public void headerClick(HeaderClickEvent event) { columnField.setValue(String.valueOf(event.getPropertyId())); } @@ -38,6 +39,7 @@ public class HeaderClick extends TestBase { immediateCheckbox.setValue(table.isImmediate()); immediateCheckbox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setImmediate((Boolean) event.getProperty().getValue()); } @@ -48,6 +50,7 @@ public class HeaderClick extends TestBase { sortEnabledCheckbox.setValue(table.isSortEnabled()); sortEnabledCheckbox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setSortDisabled(!(Boolean) event.getProperty().getValue()); } @@ -60,6 +63,7 @@ public class HeaderClick extends TestBase { columnReorderingCheckbox .addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setColumnReorderingAllowed((Boolean) event .getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java index cd54e21395..ec82b36575 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java +++ b/tests/testbench/com/vaadin/tests/components/table/HeaderFooterClickLeftRightMiddle.java @@ -33,6 +33,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { immediateCheckbox.setValue(table.isImmediate()); immediateCheckbox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setImmediate((Boolean) event.getProperty().getValue()); } @@ -45,6 +46,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { private HeaderClickListener headerClickListener = new HeaderClickListener() { + @Override public void headerClick(HeaderClickEvent event) { String type = event.isDoubleClick() ? "Double click" : "Click"; @@ -55,6 +57,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { }; + @Override public void valueChange(ValueChangeEvent event) { if (table.getListeners(HeaderClickEvent.class).isEmpty()) { table.addListener(headerClickListener); @@ -72,6 +75,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { private FooterClickListener footerClickListener = new FooterClickListener() { + @Override public void footerClick(FooterClickEvent event) { String type = event.isDoubleClick() ? "Double click" : "Click"; @@ -81,6 +85,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { } }; + @Override public void valueChange(ValueChangeEvent event) { if (table.getListeners(FooterClickEvent.class).isEmpty()) { table.addListener(footerClickListener); @@ -95,6 +100,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { sortEnabledCheckbox.setImmediate(true); sortEnabledCheckbox.setValue(table.isSortEnabled()); sortEnabledCheckbox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setSortEnabled((Boolean) event.getProperty().getValue()); } @@ -106,6 +112,7 @@ public class HeaderFooterClickLeftRightMiddle extends TestBase { columnReorderingCheckbox.setValue(table.isColumnReorderingAllowed()); columnReorderingCheckbox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setColumnReorderingAllowed((Boolean) event.getProperty() .getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java index f1e4e09d57..6dafdd3dd5 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java +++ b/tests/testbench/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java @@ -20,6 +20,7 @@ public class HeaderUpdateWhenNoRows extends TestBase { final CheckBox showHeaders = new CheckBox("Show headers"); showHeaders.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (showHeaders.getValue()) { table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); diff --git a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java b/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java index 007c93573f..4a729d221f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java +++ b/tests/testbench/com/vaadin/tests/components/table/HiddenColumnsExpandRatios.java @@ -35,12 +35,14 @@ public class HiddenColumnsExpandRatios extends TestBase { } addComponent(new Button("All", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setVisibleColumns(table.getContainerPropertyIds() .toArray()); } })); addComponent(new Button("Some", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setWidth("100px"); table.setWidth("800px"); diff --git a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java b/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java index 3478750622..434d650d6d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java +++ b/tests/testbench/com/vaadin/tests/components/table/HugeRowCount.java @@ -22,6 +22,7 @@ public class HugeRowCount extends TestBase { final TextField tf = new TextField("Rows"); tf.setValue(String.valueOf(100000)); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { container.setSize(Integer.parseInt(tf.getValue().toString())); } diff --git a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java index 537461ce0f..4bdb20adea 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java +++ b/tests/testbench/com/vaadin/tests/components/table/ItemClickEvents.java @@ -27,6 +27,7 @@ public class ItemClickEvents extends TestBase { HorizontalLayout ol = createHorizontalLayout(tree); Button b = new Button("icon", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (tree.getItemIconPropertyId() == null) { tree.setItemIconPropertyId("icon"); @@ -55,6 +56,7 @@ public class ItemClickEvents extends TestBase { "http://www.itmill.com/res/images/itmill_logo.gif")); tree.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { logEvent(event, "tree"); } @@ -73,6 +75,7 @@ public class ItemClickEvents extends TestBase { } table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { logEvent(event, "table"); } @@ -82,6 +85,7 @@ public class ItemClickEvents extends TestBase { addComponent(log); addComponent(new Button("Clear log", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.clear(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java b/tests/testbench/com/vaadin/tests/components/table/KeyControl.java index e662db338c..2998940db1 100644 --- a/tests/testbench/com/vaadin/tests/components/table/KeyControl.java +++ b/tests/testbench/com/vaadin/tests/components/table/KeyControl.java @@ -41,6 +41,7 @@ public class KeyControl extends TestBase { layout1.addComponent(table1); table1.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { @SuppressWarnings("unchecked") Set<String> value = (Set<String>) table1.getValue(); @@ -63,6 +64,7 @@ public class KeyControl extends TestBase { layout2.addComponent(table2); table2.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = table2.getValue() == null ? "No selected items" : table2.getValue().toString(); @@ -86,6 +88,7 @@ public class KeyControl extends TestBase { layout3.addComponent(table3); table3.addListener(new Table.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { @SuppressWarnings("unchecked") Set<String> value = (Set<String>) table3.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java index 44a2dcd9a9..bc0601684f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java +++ b/tests/testbench/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java @@ -35,6 +35,7 @@ public class KeyboardNavigationWithChangingContent extends TestBase { new Button("Change elements and selection", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { bic.removeAllItems(); diff --git a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index de0d2b8d56..b9e7fde17a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.table; import com.vaadin.data.Item; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; @@ -56,6 +56,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { System.out.println("Clickevent on item " + event.getItemId() + ", column: " + event.getPropertyId()); diff --git a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java b/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java index 2100d3852e..b7379b4f2c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java +++ b/tests/testbench/com/vaadin/tests/components/table/LastColumnNegative.java @@ -16,6 +16,7 @@ public class LastColumnNegative extends TestBase { Button addButton = new Button("Add a table", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { wrapper.addComponent(table); } @@ -24,6 +25,7 @@ public class LastColumnNegative extends TestBase { Button removeButton = new Button("Remove a table", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { wrapper.removeComponent(table); } @@ -31,6 +33,7 @@ public class LastColumnNegative extends TestBase { Button shrinkWrapper = new Button("Shrink wrapper", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { wrapper.setWidth("400px"); } diff --git a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java b/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java index 0196395bf4..43a89e4211 100644 --- a/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java +++ b/tests/testbench/com/vaadin/tests/components/table/LongMultiselect.java @@ -41,6 +41,7 @@ public class LongMultiselect extends TestBase { // Add action button layout.addComponent(new Button("Do It", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { // Set ItemProperty.COLUMN2 for all selected values of table Collection selectedIds = (Collection) table.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java index 5f65b40f2f..e51cec2a6d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java +++ b/tests/testbench/com/vaadin/tests/components/table/MissingScrollbar.java @@ -43,6 +43,7 @@ public class MissingScrollbar extends TestBase { Button b = new Button("Set items to 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setContainerDataSource(container2); } @@ -51,6 +52,7 @@ public class MissingScrollbar extends TestBase { b = new Button("Set items to 50", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setContainerDataSource(container50); } diff --git a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java index a472b43ce7..00965220db 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java +++ b/tests/testbench/com/vaadin/tests/components/table/ModifyContainerProperty.java @@ -26,12 +26,14 @@ public class ModifyContainerProperty extends TestBase { table.setContainerDataSource(ic); addComponent(new Button("Remove container property", new Button.ClickListener() { + @Override public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) { ic.removeContainerProperty("one"); } })); addComponent(new Button("Add container property", new Button.ClickListener() { + @Override public void buttonClick(com.vaadin.ui.Button.ClickEvent arg0) { boolean added = ic.addContainerProperty("three", String.class, "three"); diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java b/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java index d437ab7a04..0e440a95d0 100644 --- a/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java +++ b/tests/testbench/com/vaadin/tests/components/table/MultiClickingItemThatDetachesTable.java @@ -21,6 +21,7 @@ public class MultiClickingItemThatDetachesTable extends TestBase { item.getItemProperty("p1").setValue(i + ""); } table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { if (event.isDoubleClick()) { try { diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html b/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html new file mode 100644 index 0000000000..4bac7741da --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/MultiSelectValueOrder.html @@ -0,0 +1,275 @@ +<?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="http://localhost:8888/" /> +<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/com.vaadin.tests.components.table.Tables?restartApplication</td> + <td></td> +</tr> +<!--Default multi select--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>6,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td> + <td>73,0</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td> + <td>33,13</td> +</tr> +<!--ValueChangeListener--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>14,10</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td> + <td>75,5</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item0</td> + <td>64,6</td> +</tr> +<!--Disable sorting value change logging--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td> + <td>16,8</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item3</td> + <td>22,6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td> + <td>16,12</td> +</tr> +<!--Clear log to ensure numbers matches with the later case--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td> + <td>29,6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td> + <td>40,7</td> +</tr> +<!--Start clicking--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[0]/domChild[0]</td> + <td>48,18</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>0. ValueChangeEvent, new value: '[Item 5]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[1]/domChild[0]</td> + <td>40,12:ctrl</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>1. ValueChangeEvent, new value: '[Item 5, Item 3]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[6]/domChild[1]/domChild[0]</td> + <td>54,15:ctrl</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>2. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[1]/domChild[0]</td> + <td>54,9:shift+ctrl</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>3. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7, Item 8, Item 9]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> + <td>67,8:ctrl</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>4. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7, Item 8, Item 9, Item 1]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[2]/domChild[0]</td> + <td>71,8:shift+ctrl</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>5. ValueChangeEvent, new value: '[Item 5, Item 3, Item 7, Item 8, Item 9, Item 1, Item 2, Item 4]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td> + <td>56,6:ctrl</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>6. ValueChangeEvent, new value: '[Item 3, Item 7, Item 8, Item 9, Item 1, Item 2, Item 4]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td> + <td>67,11:ctrl</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>7. ValueChangeEvent, new value: '[Item 3, Item 7, Item 8, Item 9, Item 1, Item 2, Item 4, Item 5]'</td> +</tr> +<!--Simple multi select--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>33,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td> + <td>44,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td> + <td>40,11</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item2</td> + <td>58,8</td> +</tr> +<!--Clear value--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>38,6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item4</td> + <td>14,8</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item3</td> + <td>55,3</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td> + <td>21,3</td> +</tr> +<!--Clear log--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item1</td> + <td>26,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item1</td> + <td>30,6</td> +</tr> +<!--Start clicking--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[1]/domChild[0]</td> + <td>60,9</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>0. ValueChangeEvent, new value: '[Item 5]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[1]/domChild[0]</td> + <td>38,9</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>1. ValueChangeEvent, new value: '[Item 5, Item 3]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[1]/domChild[0]</td> + <td>46,13</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>2. ValueChangeEvent, new value: '[Item 5, Item 3, Item 4]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[1]/domChild[0]</td> + <td>65,8</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>3. ValueChangeEvent, new value: '[Item 5, Item 4]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td> + <td>45,7</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>4. ValueChangeEvent, new value: '[Item 4]'</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[4]/domChild[2]/domChild[0]</td> + <td>35,9</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_SLog_row_0</td> + <td>5. ValueChangeEvent, new value: '[Item 4, Item 5]'</td> +</tr> +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java index 6773f0a96c..06deb98f7f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java +++ b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithNotIdentityEqualIds.java @@ -20,6 +20,7 @@ public class MultiSelectWithNotIdentityEqualIds extends TestBase { t.setSelectable(true); t.setImmediate(true); t.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Notification.show("Selected: " + event.getProperty()); diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html new file mode 100644 index 0000000000..c41f3fbfdd --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html @@ -0,0 +1,150 @@ +<?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/com.vaadin.tests.components.table.MultiSelectWithRemovedRow?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td> + <td>34,9</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::PID_SLog_row_0</td> + <td>1. Selection: [Joe]</td> +</tr> +<!--Remove selection + shift select--> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td> + <td>19,4:shift</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::PID_SLog_row_0</td> + <td>2. Selection: [William, Jack, Averell]</td> +</tr> +<!--Remove first + shift select--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td> + <td>23,13</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td> + <td>26,10:shift</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::PID_SLog_row_0</td> + <td>3. Selection: [Jack, Averell, Bob]</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td> + <td>34,14:shift</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::PID_SLog_row_0</td> + <td>4. Selection: [William, Averell, Bob, Grat]</td> +</tr> +<!--Sort + shift select down--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td> + <td>31,15</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]</td> + <td>36,11</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td> + <td>30,6:shift</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::PID_SLog_row_0</td> + <td>5. Selection: [Bob, Emmett, Grat]</td> +</tr> +<!--Sort + shift select up--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td> + <td>24,8</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]</td> + <td>11,2</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td> + <td>30,11:shift</td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::PID_SLog_row_0</td> + <td>6. Selection: [Grat, Emmett, Bob]</td> +</tr> +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java new file mode 100644 index 0000000000..12ae4a3c4d --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.java @@ -0,0 +1,93 @@ +package com.vaadin.tests.components.table; + +import java.util.Arrays; +import java.util.Collection; + +import com.vaadin.data.util.BeanItemContainer; +import com.vaadin.tests.components.TestBase; +import com.vaadin.tests.util.Log; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Table; + +@SuppressWarnings("serial") +public class MultiSelectWithRemovedRow extends TestBase { + public static class Person { + private final String name; + + public Person(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + @Override + public String toString() { + return name; + } + } + + @Override + protected void setup() { + final Log log = new Log(5); + addComponent(log); + + final BeanItemContainer<Person> container = new BeanItemContainer<Person>( + Person.class, Arrays.asList(new Person("Joe"), new Person( + "William"), new Person("Jack"), new Person("Averell"), + new Person("Bob"), new Person("Grat"), new Person( + "Bill"), new Person("Emmett"))); + final Table table = new Table("Table", container); + table.setSelectable(true); + table.setMultiSelect(true); + table.setImmediate(true); + addComponent(table); + + Button showButton = new Button("Show selection"); + showButton.addListener(new Button.ClickListener() { + @Override + public void buttonClick(Button.ClickEvent clickEvent) { + Collection<?> selection = (Collection<?>) table.getValue(); + log.log("Selection: " + selection); + } + }); + addComponent(showButton); + + Button removeButton = new Button("Remove selection"); + removeButton.addListener(new Button.ClickListener() { + @Override + public void buttonClick(Button.ClickEvent clickEvent) { + Collection<?> selection = (Collection<?>) table.getValue(); + for (Object selected : selection) { + container.removeItem(selected); + } + } + }); + addComponent(removeButton); + + addComponent(new Button("Remove first selected row", + new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + Collection<?> selection = (Collection<?>) table + .getValue(); + if (!selection.isEmpty()) { + Object firstSelected = selection.iterator().next(); + container.removeItem(firstSelected); + } + } + })); + } + + @Override + protected String getDescription() { + return "Multi select using shift should work after removing the currently selected row"; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(8584); + } +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java b/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java index 758fa4bf1a..0b5b1d139c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java +++ b/tests/testbench/com/vaadin/tests/components/table/ProgrammaticUnselectInRange.java @@ -29,6 +29,7 @@ public class ProgrammaticUnselectInRange extends TestBase { table.addItem(new Object[] { value }, value); } table.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateSelectionLabel(); } @@ -37,6 +38,7 @@ public class ProgrammaticUnselectInRange extends TestBase { addComponent(table); addComponent(selectionLabel); addComponent(new Button("Deselect item 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.unselect(Integer.valueOf(2)); } diff --git a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java index 311c3cf3c1..1bc9cf525d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java +++ b/tests/testbench/com/vaadin/tests/components/table/PropertyValueChange.java @@ -44,6 +44,7 @@ public class PropertyValueChange extends TestBase { return i * 3; } + @Override public Component generateCell(Table source, Object itemId, Object columnId) { final Label l = new Label(); @@ -57,6 +58,7 @@ public class PropertyValueChange extends TestBase { if (integer instanceof Property.ValueChangeNotifier) { Property.ValueChangeNotifier notifier = (Property.ValueChangeNotifier) integer; notifier.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { l.setValue(String.valueOf(getMultipliedValue(integer))); } @@ -144,6 +146,7 @@ class MyFieldFactory extends DefaultFieldFactory { cb.setContainerDataSource(texts); cb.setNewItemsAllowed(true); cb.setNewItemHandler(new NewItemHandler() { + @Override public void addNewItem(String newItemCaption) { texts.addItem(newItemCaption); cb.setValue(newItemCaption); diff --git a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java b/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java index 82d5508c72..c6d071f34c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java +++ b/tests/testbench/com/vaadin/tests/components/table/RowAdditionTest.java @@ -33,6 +33,7 @@ public class RowAdditionTest extends TestBase { HorizontalLayout hl = new HorizontalLayout(); hl.addComponent(new Button("Add first", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(0, new Object()); item.getItemProperty("column1").setValue("0"); @@ -40,6 +41,7 @@ public class RowAdditionTest extends TestBase { })); hl.addComponent(new Button("Add at position 50", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(50, new Object()); item.getItemProperty("column1").setValue("50"); @@ -47,6 +49,7 @@ public class RowAdditionTest extends TestBase { })); hl.addComponent(new Button("Add at position 100", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItemAt(100, new Object()); item.getItemProperty("column1").setValue("100"); diff --git a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java b/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java index 1ddb03c316..c3bf46c12d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java +++ b/tests/testbench/com/vaadin/tests/components/table/RowGenerators.java @@ -34,6 +34,7 @@ public class RowGenerators extends TestBase implements RowGenerator { return c; } + @Override public GeneratedRow generateRow(Table table, Object itemId) { if ((Integer) itemId % 5 == 0) { if ((Integer) itemId % 10 == 0) { diff --git a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java index d3ba232f79..a9d5869e5f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java +++ b/tests/testbench/com/vaadin/tests/components/table/RowUpdateShouldRetainContextMenu.java @@ -18,6 +18,7 @@ public class RowUpdateShouldRetainContextMenu extends TestBase { protected void setup() { indicator.setWidth("200px"); indicator.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { // Do some changes to the table table.setColumnHeader("Column", "Column " + ctr); @@ -49,9 +50,11 @@ public class RowUpdateShouldRetainContextMenu extends TestBase { table.setHeight("200px"); table.addActionHandler(new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new Action("Action 1"), new Action("Action 2"), }; diff --git a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java index 133a5e83a5..dffab6dbad 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java +++ b/tests/testbench/com/vaadin/tests/components/table/SafariRenderingBugWhiteSpace.java @@ -33,6 +33,7 @@ public class SafariRenderingBugWhiteSpace extends TestBase { table.setSizeFull(); table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (table.getValue() == null) { split.setSplitPosition(100, Sizeable.UNITS_PERCENTAGE); diff --git a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java index 44367d0fe1..5cc77f23d9 100644 --- a/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java +++ b/tests/testbench/com/vaadin/tests/components/table/ScrollDetachSynchronization.java @@ -47,6 +47,7 @@ public class ScrollDetachSynchronization extends TestBase { first.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (mainLayout.getComponent(1).equals(secondLayout)) { mainLayout.replaceComponent(secondLayout, firstLayout); @@ -56,6 +57,7 @@ public class ScrollDetachSynchronization extends TestBase { }); second.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (mainLayout.getComponent(1).equals(firstLayout)) { mainLayout.replaceComponent(firstLayout, secondLayout); diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.html b/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.html new file mode 100644 index 0000000000..8d46523c40 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.html @@ -0,0 +1,32 @@ +<?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>SelectableEditable</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">SelectableEditable</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.table.SelectableEditable?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableSelectableEditable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> + <td>70,12</td> +</tr> +<tr> + <td>assertCSSClass</td> + <td>vaadin=runcomvaadintestscomponentstableSelectableEditable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td> + <td>v-selected</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.java b/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.java new file mode 100644 index 0000000000..2b33c71d2a --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/SelectableEditable.java @@ -0,0 +1,37 @@ +package com.vaadin.tests.components.table; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Table; + +public class SelectableEditable extends TestBase { + + @Override + protected void setup() { + // TODO Auto-generated method stub + + final Table table = new Table(); + table.setWidth("500px"); + table.setSelectable(true); + table.setEditable(true); + + table.addContainerProperty("name", String.class, null); + table.addContainerProperty("alive", Boolean.class, false); + for (int i = 0; i < 10; ++i) { + table.addItem(new Object[] { "Person " + i, false }, i); + } + + addComponent(table); + } + + @Override + protected String getDescription() { + // TODO Auto-generated method stub + return "It is difficult to select rows of an editable Table, especially columns with checkboxes."; + } + + @Override + protected Integer getTicketNumber() { + // TODO Auto-generated method stub + return 9064; + } +} diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java b/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java index cfe0301775..d9401c21b4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java +++ b/tests/testbench/com/vaadin/tests/components/table/SelectingItemScrollsRight.java @@ -14,6 +14,7 @@ public class SelectingItemScrollsRight extends TestBase { table.setWidth("300px"); table.setColumnWidth("Column", 500); table.addGeneratedColumn("Column", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Label( diff --git a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java b/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java index 536348a393..aebb494247 100644 --- a/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java +++ b/tests/testbench/com/vaadin/tests/components/table/SetCurrentPageFirstItemId.java @@ -30,6 +30,7 @@ public class SetCurrentPageFirstItemId extends TestBase { Button addrowButton = new Button("Add row"); addrowButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent pEvent) { Object id = addRow(); table.setCurrentPageFirstItemId(id); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java index a616d4dfb3..18eec814bc 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableAndBrowserContextMenu.java @@ -25,6 +25,7 @@ public class TableAndBrowserContextMenu extends TestBase implements cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (((Boolean) event.getProperty().getValue())) { table.addListener(TableAndBrowserContextMenu.this); @@ -40,6 +41,7 @@ public class TableAndBrowserContextMenu extends TestBase implements cbActionHandler.setImmediate(true); cbActionHandler.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (((Boolean) event.getProperty().getValue())) { table.addActionHandler(TableAndBrowserContextMenu.this); @@ -55,6 +57,7 @@ public class TableAndBrowserContextMenu extends TestBase implements cbActionHasActions.setImmediate(true); cbActionHasActions.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { actionHandlerHasActions = ((Boolean) event.getProperty() .getValue()); @@ -80,6 +83,7 @@ public class TableAndBrowserContextMenu extends TestBase implements // Add a generated column with a link to Google table.addGeneratedColumn("Search", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -131,11 +135,13 @@ public class TableAndBrowserContextMenu extends TestBase implements return 5924; } + @Override public void itemClick(ItemClickEvent event) { getMainWindow() .showNotification("Click using " + event.getButtonName()); } + @Override public Action[] getActions(Object target, Object sender) { if (!actionHandlerHasActions) { return null; @@ -144,6 +150,7 @@ public class TableAndBrowserContextMenu extends TestBase implements return new Action[] { new Action("test") }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification("Action: " + action.getCaption()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java index 3c6445349a..75f2679234 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java @@ -45,6 +45,7 @@ public class TableCacheBuildEfficiency extends TestBase { Button b = new Button("Click to add row", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.addItem(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java index ee04813ce6..1a8fc37634 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableClickAndDragOnIconAndComponents.java @@ -43,6 +43,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -53,6 +54,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -66,6 +68,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -80,6 +83,7 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { private static final long serialVersionUID = -5042109683675242407L; + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Embedded embedded = new Embedded(null, new ThemeResource( @@ -91,10 +95,12 @@ public class TableClickAndDragOnIconAndComponents extends TestBase { table.setDragMode(TableDragMode.ROW); table.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { DataBoundTransferable t = (DataBoundTransferable) event .getTransferable(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java index 79a7eca852..00df9fa3c3 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableClickValueChangeInteraction.java @@ -61,6 +61,7 @@ public class TableClickValueChangeInteraction extends TestBase { if (listenClicks) { table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { table.requestRepaint(); clickLabel.setValue("Click " + event.getItemId()); @@ -70,6 +71,7 @@ public class TableClickValueChangeInteraction extends TestBase { if (listenValueChanges) { table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { valueChangeLabel.setValue("Value " + event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java index fbe7ed88ef..1895191cc4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableColumnResizeContentsWidth.java @@ -15,6 +15,7 @@ public class TableColumnResizeContentsWidth extends TestBase { protected void setup() { final Table table = new Table(); table.addGeneratedColumn(COL1, new ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { TextField textField = new TextField(); @@ -30,12 +31,14 @@ public class TableColumnResizeContentsWidth extends TestBase { addComponent(table); addComponent(new Button("Increase width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnWidth(COL1, table.getColumnWidth(COL1) + 20); table.requestRepaint(); } })); addComponent(new Button("Decrease width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnWidth(COL1, table.getColumnWidth(COL1) - 40); table.requestRepaint(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java b/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java index 06afd406ef..9416ffe70c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableContextMenu.java @@ -16,10 +16,12 @@ public class TableContextMenu extends TestBase { table.setMultiSelect(true); table.addActionHandler(new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { Notification.show("Done that :-)"); } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { ACTION_MYACTION }; } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java index 4c6f658a24..3b639be21f 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableContextMenuOnField.java @@ -22,11 +22,13 @@ public class TableContextMenuOnField extends TestBase { table.setMultiSelect(true); table.addActionHandler(new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { // TODO Auto-generated method stub } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { ACTION_MYACTION }; } @@ -34,6 +36,7 @@ public class TableContextMenuOnField extends TestBase { table.addGeneratedColumn("layout", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { @@ -42,6 +45,7 @@ public class TableContextMenuOnField extends TestBase { layout.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { getMainWindow().showNotification("HELLO"); @@ -53,6 +57,7 @@ public class TableContextMenuOnField extends TestBase { }); table.addGeneratedColumn("textfield", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new TextField(); @@ -60,6 +65,7 @@ public class TableContextMenuOnField extends TestBase { }); table.addGeneratedColumn("link", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Link("Link", null); @@ -67,6 +73,7 @@ public class TableContextMenuOnField extends TestBase { }); table.addGeneratedColumn("button", new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Button("Button"); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java index 27b962cddd..0173f928dd 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java @@ -34,6 +34,7 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase { CheckBox showHeaders = new CheckBox("Show headers"); showHeaders.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { // table body height is now 77px, which together diff --git a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java b/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java index 27e624b810..136dcfe9a5 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableInTabsheet.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.table; import java.net.MalformedURLException; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java index 1f15b224dc..0d5d6802d7 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java @@ -23,6 +23,7 @@ public class TableItemDescriptionGeneratorTest extends TestBase { addComponent(table); table.setItemDescriptionGenerator(new ItemDescriptionGenerator() { + @Override public String generateDescription(Component source, Object itemId, Object propertyId) { if (propertyId == null) { @@ -37,6 +38,7 @@ public class TableItemDescriptionGeneratorTest extends TestBase { table.addGeneratedColumn(COLUMN3_PROPERTY_ID, new Table.ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { TextField lbl = new TextField(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java b/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java index 91ca8256c8..74a5089a84 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableModifcationsWhenScrolledRight.java @@ -28,6 +28,7 @@ public class TableModifcationsWhenScrolledRight extends TestBase { btn.addListener(new ClickListener() { Integer row = 2; + @Override public void buttonClick(ClickEvent event) { t.addItem(row).getItemProperty("name").setValue("Row" + row); row++; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java index c33ba30193..88d20b9eb0 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableMultiSelectSimple.java @@ -28,6 +28,7 @@ public class TableMultiSelectSimple extends TestBase { t.setImmediate(true); t.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { TreeSet<?> sorted = new TreeSet<Object>((Set<?>) event .getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java index c7f138ea8f..75b672a277 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/table/TablePageLengthUpdate.java @@ -47,6 +47,7 @@ public class TablePageLengthUpdate extends TestBase { Button updateButton = new Button("Update pageLength", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { updatePageLengthLabel(); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java b/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java index 5354525f1e..2b02e89c80 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableRepaintWhenMadeVisibile.java @@ -17,6 +17,7 @@ public class TableRepaintWhenMadeVisibile extends TestBase { Button show = new Button("show", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setVisible(true); } @@ -24,6 +25,7 @@ public class TableRepaintWhenMadeVisibile extends TestBase { addComponent(show); Button hide = new Button("hide", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setVisible(false); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java index b3864ae0e4..eb5efbc4f3 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableRowHeight.java @@ -89,6 +89,7 @@ public class TableRowHeight extends TestBase { public class LabelColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -104,6 +105,7 @@ public class TableRowHeight extends TestBase { public class LayoutColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html b/tests/testbench/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html new file mode 100644 index 0000000000..35d64c3a0c --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/TableRowNoHeightNoRows.html @@ -0,0 +1,122 @@ +<?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/com.vaadin.tests.components.table.Tables?restartApplication</td> + <td></td> +</tr> +<!--Remove all rows--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>29,11</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td> + <td>40,5</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td> + <td>53,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td> + <td>4,6</td> +</tr> +<!--Add generated column--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>34,8</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td> + <td>40,6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item4</td> + <td>97,5</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td> + <td>55,6</td> +</tr> +<!--Screenshot of initial state--> +<tr> + <td>screenCapture</td> + <td></td> + <td>1-no-rows-small</td> +</tr> +<!--Add a row to make the row height increase--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>23,5</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td> + <td>26,1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td> + <td>68,10</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item1</td> + <td>18,13</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>2-one-row-big</td> +</tr> +<!--Remove the row - height should be retained--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>28,10</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td> + <td>34,6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td> + <td>62,4</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td> + <td>25,4</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>3-no-rows-big</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java index 4053665898..4782ca94f7 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableScrollOnFocus.java @@ -14,6 +14,7 @@ public class TableScrollOnFocus extends TestBase { chkSelectable.setImmediate(true); chkSelectable.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { table.setSelectable((Boolean) chkSelectable.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java index d64bc0035d..030a4ee259 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.java @@ -26,6 +26,7 @@ public class TableShouldNotEatValueChanges extends TestBase { tf.setTabIndex(1); ItemClickListener l = new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { Notification.show("TF Value on the server:" + tf.getValue(), Notification.TYPE_WARNING_MESSAGE); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java index 62d0cce9df..827593cd91 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableSingleSelect.java @@ -22,6 +22,7 @@ public class TableSingleSelect extends TestBase { t.setImmediate(true); t.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Selected value: " + event.getProperty().getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java b/tests/testbench/com/vaadin/tests/components/table/TableSorting.java index a0d9b8e69d..6417e8e853 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableSorting.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableSorting.java @@ -32,6 +32,7 @@ public class TableSorting extends TestBase { // Handle selection change. testTable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.out.println("ValueChanged: " + testTable.getValue().toString()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java index 0cc125acaa..0465d2f886 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableToggleVisibility.java @@ -140,6 +140,7 @@ public class TableToggleVisibility extends AbstractTestCase { addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean wasVisible = ToggleButton.this.table.isVisible(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java index 73b80f62f4..544fe9bb67 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableUndefinedSize.java @@ -39,6 +39,7 @@ public class TableUndefinedSize extends TestBase { controls.addComponent(new Button("Fixed size (200x200)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setWidth("200px"); tbl.setHeight("200px"); @@ -48,6 +49,7 @@ public class TableUndefinedSize extends TestBase { controls.addComponent(new Button("Fixed size (600x200)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setWidth("600px"); tbl.setHeight("200px"); @@ -57,6 +59,7 @@ public class TableUndefinedSize extends TestBase { controls.addComponent(new Button("Undefined size", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tbl.setSizeUndefined(); log.log("Size undefined"); @@ -68,6 +71,7 @@ public class TableUndefinedSize extends TestBase { pageLength.setImmediate(true); pageLength.setNullSelectionAllowed(false); pageLength.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { int pageLength = Integer.valueOf(event.getProperty().getValue() .toString()); @@ -81,6 +85,7 @@ public class TableUndefinedSize extends TestBase { cb.setValue(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Boolean value = (Boolean) event.getProperty().getValue(); tbl.setColumnCollapsed("Column 1", !value); @@ -98,6 +103,7 @@ public class TableUndefinedSize extends TestBase { cb.setValue(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Boolean value = (Boolean) event.getProperty().getValue(); tbl.setColumnCollapsed("Column 2", !value); @@ -116,6 +122,7 @@ public class TableUndefinedSize extends TestBase { cb.setValue(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Boolean value = (Boolean) event.getProperty().getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java index 6fd4a9db52..11f450baf2 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableUnregisterComponent.java @@ -76,12 +76,14 @@ public class TableUnregisterComponent extends TestBase { addComponent(table); addComponent(new Button("Switch column collapse", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed(COL_A, !table.isColumnCollapsed(COL_A)); } })); addComponent(new Button("Switch editable", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setEditable(!table.isEditable()); } diff --git a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java index ad8eacb4b7..98cd4e0aaa 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java @@ -46,6 +46,7 @@ public class TableVisibleColumnsUpdate extends TestBase { Button updateButton = new Button("Change columns", new ClickListener() { private boolean one = true; + @Override public void buttonClick(ClickEvent event) { table.setVisibleColumns((one ? cols2 : cols1)); one = !one; diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java b/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java index 1d1c162cae..7eb9c3239c 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithChildComponents.java @@ -27,6 +27,7 @@ public class TableWithChildComponents extends TestBase implements ClickListener table.addGeneratedColumn(COL2, new ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { return new Button( @@ -58,6 +59,7 @@ public class TableWithChildComponents extends TestBase implements ClickListener return null; } + @Override public void buttonClick(ClickEvent event) { log.log("Click on " + event.getButton().getCaption()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java index 1b0335b673..733f46959a 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java @@ -23,6 +23,7 @@ public class TableWithContainerRequiringEqualsForItemId extends TestBase { super(MyEntity.class); setBeanIdResolver(new BeanIdResolver<Long, TableWithContainerRequiringEqualsForItemId.MyEntity>() { + @Override public Long getIdForBean(MyEntity bean) { // Return a new instance every time to ensure Table can // handle it @@ -46,10 +47,12 @@ public class TableWithContainerRequiringEqualsForItemId extends TestBase { protected void setup() { Table t = new Table("Table with 1000 item"); t.addGeneratedColumn("Actions", new Table.ColumnGenerator() { + @Override public Component generateCell(final Table source, final Object itemId, final Object columnId) { Button tripFolderLink = new Button("Button" + itemId); tripFolderLink.addListener(new Button.ClickListener() { + @Override public void buttonClick(final ClickEvent event) { log.log("Button " + event.getButton().getCaption() + " clicked"); diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java b/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java index 404ba5d779..226fde3b29 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithNoncollapsibleColumns.java @@ -30,6 +30,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { final Button button1 = new Button("Column 1: collapse/show", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed( "Column 1 - noncollapsible", @@ -38,6 +39,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { }); final Button button2 = new Button("Column 2: collapse/show", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed( "Column 2 - collapsible", @@ -47,6 +49,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { final Button button3 = new Button("Column 3: collapse/show", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed( "Column 3 - toggle collapsing", @@ -56,6 +59,7 @@ public class TableWithNoncollapsibleColumns extends TestBase { final Button button4 = new Button( "Column 3: make noncollapsible/collapsible", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsible( "Column 3 - toggle collapsing", diff --git a/tests/testbench/com/vaadin/tests/components/table/Tables.java b/tests/testbench/com/vaadin/tests/components/table/Tables.java index 11ffff0655..79a5fb367d 100644 --- a/tests/testbench/com/vaadin/tests/components/table/Tables.java +++ b/tests/testbench/com/vaadin/tests/components/table/Tables.java @@ -8,8 +8,8 @@ import java.util.List; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.Resource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.ui.AbstractSelect.MultiSelectMode; import com.vaadin.ui.Button; @@ -47,6 +47,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> /* COMMANDS */ private Command<T, Align> columnAlignmentCommand = new Command<T, Align>() { + @Override public void execute(T c, Align alignment, Object propertyId) { c.setColumnAlignment(propertyId, alignment); } @@ -54,6 +55,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Boolean> columnVisibleCommand = new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean visible, Object propertyId) { List<Object> visibleColumns = new ArrayList<Object>(Arrays.asList(c .getVisibleColumns())); @@ -72,6 +74,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Boolean> columnCollapsed = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean collapsed, Object propertyId) { c.setColumnCollapsed(propertyId, collapsed); @@ -80,6 +83,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Boolean> columnCollapsibleCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean collapsible, Object propertyId) { c.setColumnCollapsible(propertyId, collapsible); @@ -88,6 +92,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Boolean> columnResizeListenerCommand = new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean value, Object data) { if (value) { c.addListener((ColumnResizeListener) Tables.this); @@ -99,6 +104,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Boolean> headerClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((HeaderClickListener) Tables.this); @@ -110,6 +116,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Boolean> footerClickListenerCommand = new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean value, Object data) { if (value) { c.addListener((FooterClickListener) Tables.this); @@ -121,6 +128,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, RowHeaderMode> rowHeaderModeCommand = new Command<T, RowHeaderMode>() { + @Override public void execute(Table c, RowHeaderMode value, Object data) { if (value == RowHeaderMode.PROPERTY) { c.setItemCaptionPropertyId("Property 3"); @@ -131,6 +139,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, String> footerTextCommand = new Command<T, String>() { + @Override public void execute(Table c, String value, Object data) { for (Object propertyId : c.getContainerPropertyIds()) { if (value != null) { @@ -145,6 +154,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> protected Command<T, Object> alignColumnLeftCommand = new Command<T, Object>() { + @Override public void execute(T c, Object propertyId, Object data) { c.setColumnAlignment(propertyId, (Align) data); } @@ -152,17 +162,20 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, ContextMenu> contextMenuCommand = new Command<T, ContextMenu>() { + @Override public void execute(T c, final ContextMenu value, Object data) { c.removeAllActionHandlers(); if (value != null) { c.addActionHandler(new Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { log("Action " + action.getCaption() + " performed on " + target); } + @Override public Action[] getActions(Object target, Object sender) { return value.getActions(target, sender); } @@ -172,6 +185,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Integer> columnWidthCommand = new Command<T, Integer>() { + @Override public void execute(T c, Integer width, Object propertyId) { c.setColumnWidth(propertyId, width); @@ -180,6 +194,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Resource> columnIconCommand = new Command<T, Resource>() { + @Override public void execute(T c, Resource icon, Object propertyId) { c.setColumnIcon(propertyId, icon); @@ -187,6 +202,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, ColumnHeaderMode> columnHeaderModeCommand = new Command<T, ColumnHeaderMode>() { + @Override public void execute(T c, ColumnHeaderMode columnHeaderMode, Object data) { c.setColumnHeaderMode(columnHeaderMode); @@ -194,6 +210,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, String> columnHeaderCommand = new Command<T, String>() { + @Override public void execute(T c, String header, Object propertyId) { c.setColumnHeader(propertyId, header); @@ -201,6 +218,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Float> columnExpandRatioCommand = new Command<T, Float>() { + @Override public void execute(T c, Float expandRatio, Object propertyId) { c.setColumnExpandRatio(propertyId, expandRatio); } @@ -224,6 +242,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, GeneratedColumn> addGeneratedColumnCommand = new Command<T, GeneratedColumn>() { + @Override public void execute(T c, final GeneratedColumn col, Object data) { while (c.getColumnGenerator(generatedColumnId + generatedColumnNextNr) != null) { @@ -233,6 +252,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> c.addGeneratedColumn(generatedColumnId + generatedColumnNextNr, new ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { String value = ""; @@ -273,6 +293,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }; private Command<T, Object> removeGeneratedColumnsCommand = new Command<T, Object>() { + @Override public void execute(T c, Object value, Object data) { for (int i = 0; i < generatedColumnNextNr; i++) { String columnId = generatedColumnId + i; @@ -306,12 +327,14 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, CellStyleInfo> cellStyleCommand = new Command<T, CellStyleInfo>() { + @Override public void execute(T c, final CellStyleInfo cellStyleInfo, Object data) { if (cellStyleInfo == null) { c.setCellStyleGenerator(null); } else { c.setCellStyleGenerator(new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (cellStyleInfo.appliesTo(itemId, propertyId)) { return cellStyleInfo.styleName; @@ -349,6 +372,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, GeneratedRowInfo> rowGeneratorCommand = new Command<T, GeneratedRowInfo>() { + @Override public void execute(T c, final GeneratedRowInfo generatedRowInfo, Object data) { if (generatedRowInfo == null) { @@ -356,6 +380,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> } else { c.setRowGenerator(new RowGenerator() { + @Override public GeneratedRow generateRow(Table table, Object itemId) { if (generatedRowInfo.appliesTo(itemId)) { GeneratedRow generatedRow = new GeneratedRow( @@ -373,6 +398,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private Command<T, Boolean> setSortEnabledCommand = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setSortDisabled(!value); @@ -546,6 +572,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private void createColumnReorderingAllowedCheckbox(String category) { createBooleanAction("Column reordering allowed", category, true, new Command<T, Boolean>() { + @Override public void execute(Table c, Boolean value, Object data) { c.setColumnReorderingAllowed(value); } @@ -555,6 +582,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> private void createColumnCollapsingAllowedCheckbox(String category) { createBooleanAction("Column collapsing allowed", category, true, new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setColumnCollapsingAllowed(value); } @@ -697,6 +725,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("Texts in header", category, options, "None", new Command<T, String>() { + @Override public void execute(T c, String value, Object data) { int nr = 0; for (Object propertyId : c.getContainerPropertyIds()) { @@ -746,6 +775,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createBooleanAction("Footer visible", category, true, new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.setFooterVisible(value); } @@ -763,6 +793,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("Header mode", category, options, "Explicit defaults id", new Command<T, ColumnHeaderMode>() { + @Override public void execute(T c, ColumnHeaderMode value, Object data) { c.setColumnHeaderMode(value); @@ -781,6 +812,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("PageLength", category, options, "10", new Command<T, Integer>() { + @Override public void execute(Table t, Integer value, Object data) { t.setPageLength(value); } @@ -801,6 +833,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> createSelectAction("Selection Mode", category, options, "Multi - ctrl/shift", new Command<T, SelectMode>() { + @Override public void execute(Table t, SelectMode value, Object data) { switch (value) { case NONE: @@ -825,16 +858,19 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T> }); } + @Override public void columnResize(ColumnResizeEvent event) { log("ColumnResize on " + event.getPropertyId() + " from " + event.getPreviousWidth() + " to " + event.getCurrentWidth()); } + @Override public void footerClick(FooterClickEvent event) { log("FooterClick on " + event.getPropertyId() + " using " + event.getButtonName()); } + @Override public void headerClick(HeaderClickEvent event) { log("HeaderClick on " + event.getPropertyId() + " using " + event.getButtonName()); diff --git a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java index 7fb096739a..d629c9a917 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java +++ b/tests/testbench/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java @@ -50,6 +50,7 @@ public class TestCurrentPageFirstItem extends TestBase implements ClickListener baseLayout.addComponent(buttonItem); } + @Override public void buttonClick(ClickEvent event) { Item item = container.addItem(++counter); item.getItemProperty("row").setValue(counter + ""); diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java index f3a92d410c..5c7479d060 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java +++ b/tests/testbench/com/vaadin/tests/components/table/TextFieldRelativeWidth.java @@ -54,6 +54,7 @@ public class TextFieldRelativeWidth extends TestBase { addListener(new Property.ValueChangeListener() { private static final long serialVersionUID = 448896474865195605L; + @Override public void valueChange( com.vaadin.data.Property.ValueChangeEvent event) { // IndexedContainer idc = (IndexedContainer) @@ -98,6 +99,7 @@ public class TextFieldRelativeWidth extends TestBase { addButton.setCaption(caption); } + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); if (b == addButton) { diff --git a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java b/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java index f3ff5e983e..9ffad7f1e4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java +++ b/tests/testbench/com/vaadin/tests/components/table/TextFieldValueGoesMissing.java @@ -20,6 +20,7 @@ public class TextFieldValueGoesMissing extends TestBase { Button button = new Button("Replace label"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (verticalLayout.getComponentIndex(label1) > -1) { verticalLayout.replaceComponent(label1, label2); diff --git a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java index 99b954fa63..8e623499cf 100644 --- a/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java +++ b/tests/testbench/com/vaadin/tests/components/table/UncollapsedCollumnWidth.java @@ -23,6 +23,7 @@ public class UncollapsedCollumnWidth extends TestBase { addComponent(table); addComponent(new Button("Uncollapse col2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { table.setColumnCollapsed("Col2", false); } diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java index 3b5166a21e..4b5d216906 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java @@ -20,6 +20,7 @@ public class AddAndRemoveTabs extends TestBase { Button addTabBtn = new Button("Add new tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addTab(); } @@ -34,6 +35,7 @@ public class AddAndRemoveTabs extends TestBase { Button closeTab = new Button("Close tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.removeComponent(layout); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java index f1faecb711..434c73f778 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/PreventTabChange.java @@ -46,6 +46,7 @@ public class PreventTabChange extends TestBase implements addComponent(tabSheet); } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { TabSheet tabsheet = event.getTabSheet(); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java index 1cd96c5c4c..2b37c4358e 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/RemoveTabs.java @@ -49,6 +49,7 @@ public class RemoveTabs extends TestBase { closeCurrent = new Button("Close current tab"); closeCurrent.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTab(); @@ -57,6 +58,7 @@ public class RemoveTabs extends TestBase { closeCurrentWithTab = new Button("Close current tab with Tab"); closeCurrentWithTab.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTabWithTab(); @@ -65,6 +67,7 @@ public class RemoveTabs extends TestBase { closeFirst = new Button("close first tab"); closeFirst.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeFirstTab(); @@ -73,6 +76,7 @@ public class RemoveTabs extends TestBase { closeLast = new Button("close last tab"); closeLast.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeLastTab(); @@ -81,6 +85,7 @@ public class RemoveTabs extends TestBase { reorderTabs = new Button("reorder"); reorderTabs.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { reorder(); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java index c49133dd7c..0d4f1fe562 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabGetAndReplaceComponent.java @@ -25,6 +25,7 @@ public class TabGetAndReplaceComponent extends TestBase { Button replace2 = new Button("Replace Content 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Iterator<Component> iter = tabs.getComponentIterator(); iter.next(); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java index a3886853ff..ba737f1df8 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabKeyboardNavigation.java @@ -32,12 +32,14 @@ public class TabKeyboardNavigation extends TestBase { ts.setHeight("500px"); ts.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { focusblur.log("Tabsheet focused!"); } }); ts.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { focusblur.log("Tabsheet blurred!"); } @@ -48,11 +50,13 @@ public class TabKeyboardNavigation extends TestBase { } Button addTab = new Button("Add a tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addTab(); } }); Button focus = new Button("Focus tabsheet", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { ts.focus(); } diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java index 3d8d02b8b6..e3867cff9f 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java @@ -42,6 +42,7 @@ public class TabSheetCaptions extends TestBase { Button button = new Button("Update tab caption"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.getTab(panel1).setCaption( "This is a new tab caption " @@ -51,6 +52,7 @@ public class TabSheetCaptions extends TestBase { Button button2 = new Button("Update panel caption"); button2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { panel1.setCaption("This is a new panel caption " + dateFormatter.format(date)); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java index bdce3e83d0..dfe37f2e27 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java @@ -20,6 +20,7 @@ public class TabSheetDisabling extends TestBase { buttons[i] = new Button("Disable this tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); tabSheet.getTab(b).setEnabled(false); @@ -30,6 +31,7 @@ public class TabSheetDisabling extends TestBase { } else { buttons[i] = new Button("Hide this tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); tabSheet.getTab(b).setVisible(false); @@ -41,6 +43,7 @@ public class TabSheetDisabling extends TestBase { } Button button = new Button("Enable/disable", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.setEnabled(!tabSheet.isEnabled()); } diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java index 410172ddb0..8d312f0cd8 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetDiscardsMovedComponents.java @@ -32,6 +32,7 @@ public class TabSheetDiscardsMovedComponents extends TestBase { private void addTestComponent(final Component component) { grid.addComponent(component); grid.addComponent(new Button("Move to tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabSheet.addTab(component); grid.removeComponent(event.getButton()); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java index 5ae9e69975..de637bbed7 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetIndexOperations.java @@ -24,6 +24,7 @@ public class TabSheetIndexOperations extends TestBase { Button addTab = new Button("Add tab at index 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabs.addTab(new Label("Content " + tabCounter), "Added Tab " + tabCounter, null, 2); @@ -34,6 +35,7 @@ public class TabSheetIndexOperations extends TestBase { Button setCaption = new Button("Invert tab caption at index 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Tab tab = tabs.getTab(2); tab.setCaption(new StringBuffer(tab.getCaption()) @@ -44,6 +46,7 @@ public class TabSheetIndexOperations extends TestBase { Button move = new Button("Move selected tab to index 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tabs.setTabPosition(tabs.getTab(tabs.getSelectedTab()), 2); @@ -53,6 +56,7 @@ public class TabSheetIndexOperations extends TestBase { Button getIndex = new Button("Get selected tab index", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification( "Index: " diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java index 105b4149a1..b6cf27f6bb 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java @@ -16,6 +16,7 @@ public class TabSheetMinimal extends TestBase { ts.setStyleName("minimal"); Button b = new Button("Add a tab", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ts.addTab(new Label("" + index), "Tab " + index, null); index++; diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java index 3c3dec478c..54a5ed4857 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTabStyleNames.java @@ -25,6 +25,7 @@ public class TabSheetTabStyleNames extends TestBase { new Button.ClickListener() { int counter = 0; + @Override public void buttonClick(ClickEvent event) { if (tab1.getStyleName() == null) { tab1.setStyleName(STYLE_NAME); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java index 3077c1a97b..fea255a98d 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabSheetTest.java @@ -16,6 +16,7 @@ public class TabSheetTest<T extends TabSheet> extends private Command<T, Integer> setTabCaption = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.getTab(value).setCaption((String) data); @@ -23,6 +24,7 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Integer> setTabIcon = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.getTab(value).setIcon((Resource) data); @@ -30,15 +32,18 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Integer> setTabClosable = new Command<T, Integer>() { + @Override public void execute(T c, Integer value, Object data) { c.getTab(value).setClosable((Boolean) data); } }; private Command<T, Boolean> setCloseHandlerListener = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.setCloseHandler(new CloseHandler() { + @Override public void onTabClose(TabSheet tabsheet, Component c) { tabClosed(tabsheet, tabsheet.getTab(c)); tabsheet.removeComponent(c); @@ -47,6 +52,7 @@ public class TabSheetTest<T extends TabSheet> extends }); } else { c.setCloseHandler(new CloseHandler() { + @Override public void onTabClose(TabSheet tabsheet, Component c) { tabsheet.removeComponent(c); } @@ -57,6 +63,7 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Boolean> setSelectedTabListener = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { if (value) { c.addListener((SelectedTabChangeListener) TabSheetTest.this); @@ -68,12 +75,14 @@ public class TabSheetTest<T extends TabSheet> extends }; private Command<T, Integer> selectTab = new Command<T, Integer>() { + @Override public void execute(T c, Integer index, Object data) { c.setSelectedTab(c.getTab(index).getComponent()); } }; private Command<T, Boolean> hideTabs = new Command<T, Boolean>() { + @Override public void execute(T c, Boolean value, Object data) { c.hideTabs(value); @@ -194,6 +203,7 @@ public class TabSheetTest<T extends TabSheet> extends log("Tab " + tabSheet.getTabPosition(tab) + " closed"); } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { TabSheet ts = event.getTabSheet(); log("Tab " + ts.getTabPosition(ts.getTab(ts.getSelectedTab())) diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java index 24077b972c..8e4c4d40fb 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetNPE.java @@ -49,6 +49,7 @@ public class TabsheetNPE extends AbstractTestCase implements ClickListener { return layout; } + @Override public void buttonClick(ClickEvent event) { for (int i = 0; i < TABS_COUNT; i++) { tab[i].setEnabled(true); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java index 5321b51f9c..da449a2461 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java @@ -22,6 +22,7 @@ public class TabsheetScrolling extends TestBase { Button b = new Button("Hide this tab (" + i + ")", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { fixedSizeTabSheet.getTab(event.getButton()) .setVisible(false); @@ -44,6 +45,7 @@ public class TabsheetScrolling extends TestBase { Button b = new Button("Hide this tab (" + i + ")", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { autoWideTabSheet.getTab(event.getButton()) .setVisible(false); diff --git a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java b/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java index 3872f7a8dd..7a676c63fb 100644 --- a/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java +++ b/tests/testbench/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java @@ -17,6 +17,7 @@ public class WrapTabSheetInTabSheet extends TestBase { Button b = new Button("Wrap main layout in a TabSheet"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { TabSheet tabsheet = new TabSheet(); ComponentContainer mainParent = (ComponentContainer) mainLayout diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java index 0fc63860e1..992f20843b 100644 --- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java +++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java @@ -33,6 +33,7 @@ public class TextAreaCursorPosition extends TestBase { newTextField.setTextChangeEventMode(TextChangeEventMode.EAGER); newTextField.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { AbstractTextField component = (AbstractTextField) event .getComponent(); diff --git a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java index 278d14e43d..e071bdd8fb 100644 --- a/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java +++ b/tests/testbench/com/vaadin/tests/components/textarea/TextAreaTest.java @@ -8,12 +8,14 @@ import com.vaadin.ui.TextArea; public class TextAreaTest extends AbstractTextFieldTest<TextArea> { private Command<TextArea, Boolean> wordwrapCommand = new Command<TextArea, Boolean>() { + @Override public void execute(TextArea c, Boolean value, Object data) { c.setWordwrap(value); } }; private Command<TextArea, Integer> rowsCommand = new Command<TextArea, Integer>() { + @Override public void execute(TextArea c, Integer value, Object data) { c.setRows(value); } diff --git a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java b/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java index b33a1a4765..8672d4019e 100644 --- a/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java +++ b/tests/testbench/com/vaadin/tests/components/textarea/Wordwrap.java @@ -31,6 +31,7 @@ public class Wordwrap extends TestBase { CheckBox onoff = new CheckBox("Wrap state for the right field"); onoff.setValue(false); onoff.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean wrap = (Boolean) event.getProperty().getValue(); area2.setWordwrap(wrap); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java b/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java index bf9924cdbb..938ecf60ce 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/EnterShortcutMaySendInputPromptAsValue.java @@ -31,10 +31,12 @@ public class EnterShortcutMaySendInputPromptAsValue extends TestBase { final Action enter = new ShortcutAction("enter", ShortcutAction.KeyCode.ENTER, null); + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { enter }; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == enter) { @@ -43,6 +45,7 @@ public class EnterShortcutMaySendInputPromptAsValue extends TestBase { }); testField.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String value = event.getProperty().getValue().toString(); addComponent(new Label("TextField sent value: " + value)); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java b/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java index 62d3a1679a..58bc4c5383 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/MultipleTextChangeEvents.java @@ -20,6 +20,7 @@ public class MultipleTextChangeEvents extends TestBase { tf.setTextChangeEventMode(TextChangeEventMode.TIMEOUT); tf.setTextChangeTimeout(500); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { log.log("TextChangeEvent: " + event.getText()); } @@ -35,10 +36,12 @@ public class MultipleTextChangeEvents extends TestBase { Action actionenter = new ShortcutAction("Enter", ShortcutAction.KeyCode.ENTER, null); + @Override public Action[] getActions(Object theTarget, Object theSender) { return new Action[] { actionenter }; } + @Override public void handleAction(Action theAction, Object theSender, Object theTarget) { log.log("Enter"); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java b/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java index cf59a9d7f4..89f9ffda40 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/OutOfSyncIssueWithKeyboardShortcut.java @@ -82,6 +82,7 @@ public class OutOfSyncIssueWithKeyboardShortcut extends TestBase { saveButton.setClickShortcut(KeyCode.ENTER); table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); if (value != null) { @@ -96,6 +97,7 @@ public class OutOfSyncIssueWithKeyboardShortcut extends TestBase { }); saveButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.commit(); Topping entity = getEntityForItem(form.getItemDataSource()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java index 962a85ffcb..f6368f0c78 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java @@ -28,6 +28,7 @@ public class SelectionAndCursorPosition extends TestBase { CheckBox ml = new CheckBox("Multiline"); ml.setImmediate(true); ml.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (textField.getApplication() == null) { replaceComponent(textArea, textField); @@ -42,6 +43,7 @@ public class SelectionAndCursorPosition extends TestBase { Button b = new Button("Select all ( selectAll() )"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { activeComponent.selectAll(); } @@ -55,6 +57,7 @@ public class SelectionAndCursorPosition extends TestBase { final TextField length = new TextField("Selection length:"); b = new Button("select"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { int startPos = Integer.parseInt(start.getValue()); int lenght = Integer.parseInt(length.getValue()); @@ -72,6 +75,7 @@ public class SelectionAndCursorPosition extends TestBase { final TextField pos = new TextField("Position:"); b = new Button("set"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { int startPos = Integer.parseInt(pos.getValue()); activeComponent.setCursorPosition(startPos); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java index d81d26591a..da4ea9de0b 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/SetTabIndex.java @@ -28,6 +28,7 @@ public class SetTabIndex extends TestBase { final CheckBox readonly = new CheckBox("Readonly"); readonly.setImmediate(true); readonly.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean readonly = Boolean.valueOf(event.getProperty() .getValue().toString()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java index b3ea5b8186..a12a5a8836 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents.java @@ -19,6 +19,7 @@ public class TextChangeEvents extends TestBase { TextChangeListener inputEventListener = new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.log("Text change event for " + event.getComponent().getCaption() @@ -91,6 +92,7 @@ public class TextChangeEvents extends TestBase { + ".nomatch {background:red;}"); } + @Override public void textChange(TextChangeEvent event) { boolean atTheEndOfText = event.getText().length() == getCursorPosition(); String match = findMatch(event.getText()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java index b40ebb2434..363e9d448d 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEvents2.java @@ -23,12 +23,14 @@ public class TextChangeEvents2 extends TestBase { getLayout().addComponent(tf); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { System.err.println(tf.getCaption() + " textChange"); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -36,12 +38,14 @@ public class TextChangeEvents2 extends TestBase { tf.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { System.err.println(tf.getCaption() + " blur"); } }); tf.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { System.err.println(tf.getCaption() + " focus"); } @@ -55,12 +59,14 @@ public class TextChangeEvents2 extends TestBase { final Label l = new Label(); getLayout().addComponent(l); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.setValue(event.getText()); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -77,12 +83,14 @@ public class TextChangeEvents2 extends TestBase { getLayout().addComponent(l); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.setValue(event.getText()); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -98,12 +106,14 @@ public class TextChangeEvents2 extends TestBase { getLayout().addComponent(l); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { tf.setValue(event.getText().toUpperCase()); } }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { System.err.println(tf.getCaption() + " valueChange"); } @@ -124,6 +134,7 @@ public class TextChangeEvents2 extends TestBase { tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { String txt = event.getText(); int len = txt.length(); @@ -149,6 +160,7 @@ public class TextChangeEvents2 extends TestBase { }); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { TextField tf = (TextField) event.getProperty(); String val = (String) tf.getValue(); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java index 22348bb5b5..1a49729b6f 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java @@ -13,6 +13,7 @@ public class TextChangeEventsEternalLoop extends TestBase { getLayout().addComponent(tf); tf.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { tf.setValue(event.getText()); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java index ab3fd49cd6..ebb8b88411 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java @@ -18,6 +18,7 @@ public class TextChangeEventsWithNonImmediateValueChange extends TestBase { TextChangeListener inputEventListener = new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { l.log("Text change event, text content currently:'" + event.getText() + "' Cursor at index:" @@ -31,6 +32,7 @@ public class TextChangeEventsWithNonImmediateValueChange extends TestBase { tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { l.log("Value change: '" + event.getProperty().getValue() + "'"); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java index 8a3678ab62..5b84ff20f2 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java @@ -31,6 +31,7 @@ public class TextChangeListenerChangingNonTextProperties extends TestBase { }; tf2.setTextChangeEventMode(TextChangeEventMode.EAGER); tf2.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { tf2.setStyleName(getNextStyle()); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java index 2f0c54ee39..00783e0106 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java @@ -18,6 +18,7 @@ public class TextChangeTimeoutAfterDetach extends TestBase { field.setTextChangeTimeout(2000); field.setTextChangeEventMode(TextChangeEventMode.TIMEOUT); field.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { // Need to add a listener for events to occur } @@ -26,6 +27,7 @@ public class TextChangeTimeoutAfterDetach extends TestBase { Button detachBtn = new Button("detach field", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeComponent(field); getLayout().addComponentAsFirst( diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java index 08751a59fd..e103afbe62 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java @@ -14,6 +14,7 @@ public class TextFieldEagerRepaint extends TestBase { final TextField tf1 = new TextField("Updates value"); tf1.setTextChangeEventMode(TextChangeEventMode.EAGER); tf1.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { String text = event.getText(); if (!text.matches("[a-z]*")) { @@ -26,6 +27,7 @@ public class TextFieldEagerRepaint extends TestBase { final TextField tf2 = new TextField("Updates width"); tf2.setTextChangeEventMode(TextChangeEventMode.EAGER); tf2.addListener(new TextChangeListener() { + @Override public void textChange(TextChangeEvent event) { String text = event.getText(); if (!text.matches("[a-z]*")) { diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java index e2f5c45b72..21dba6a196 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java @@ -40,12 +40,14 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements tf2.setWidth("300px"); tf2.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { TextFieldFocusAndBlurListeners.this.valueChange(event); } }); tf2.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { TextFieldFocusAndBlurListeners.this.focus(event); } @@ -53,6 +55,7 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements }); tf2.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { TextFieldFocusAndBlurListeners.this.blur(event); } @@ -76,11 +79,13 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements addComponent(tf4); } + @Override public void focus(FocusEvent event) { log.log(event.getComponent().getCaption() + ": Focus"); } + @Override public void blur(BlurEvent event) { TextField tf = (TextField) event.getComponent(); log.log(tf.getCaption() + ": Blur. Value is: " @@ -88,6 +93,7 @@ public class TextFieldFocusAndBlurListeners extends TestBase implements } + @Override public void valueChange(ValueChangeEvent event) { TextField tf = (TextField) event.getProperty(); log.log(tf.getCaption() + ": ValueChange: " + tf.getValue().toString()); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java index c04c9d6c13..d52efa0572 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldInputPromptAndClickShortcut.java @@ -19,6 +19,7 @@ public class TextFieldInputPromptAndClickShortcut extends TestBase { final TextField textField = new TextField(); Button button = new Button("Show Text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Field value: " + textField.getValue()); } @@ -28,6 +29,7 @@ public class TextFieldInputPromptAndClickShortcut extends TestBase { final CheckBox inputPromptSelection = new CheckBox("Input prompt"); inputPromptSelection.setImmediate(true); inputPromptSelection.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (event.getProperty().getValue() == Boolean.TRUE) { textField.setInputPrompt("Input prompt"); diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java index b753978666..747301f4e4 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithProperty.java @@ -24,6 +24,7 @@ public class TextFieldWithProperty extends TestBase { Button b = new Button( "Set BAR to underlaying property (should propagate to UI)"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { op.setValue("BAR"); } diff --git a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java index ea4b572604..4184892545 100644 --- a/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java +++ b/tests/testbench/com/vaadin/tests/components/textfield/TextFieldWithPropertyFormatter.java @@ -28,10 +28,12 @@ public class TextFieldWithPropertyFormatter extends TestBase { property = new Property<BigDecimal>() { private BigDecimal value; + @Override public BigDecimal getValue() { return value; } + @Override public void setValue(Object newValue) throws ReadOnlyException { if (newValue == null) { value = null; @@ -43,14 +45,17 @@ public class TextFieldWithPropertyFormatter extends TestBase { } } + @Override public Class<BigDecimal> getType() { return BigDecimal.class; } + @Override public boolean isReadOnly() { return false; } + @Override public void setReadOnly(boolean newStatus) { // ignore } @@ -98,12 +103,14 @@ public class TextFieldWithPropertyFormatter extends TestBase { Button b = new Button( "Sync (typing 12345.6789 and clicking this should format field)"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { } }); addComponent(b); b = new Button("Set '12345.6789' to textfield on the server side"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { tf1.setValue("12345.6789"); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java b/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java index 69956e4d2c..03645557f2 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java +++ b/tests/testbench/com/vaadin/tests/components/tree/CtrlShiftMultiselect.java @@ -30,6 +30,7 @@ public class CtrlShiftMultiselect extends TestBase { tree.expandItemsRecursively("Item 4"); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (tree.getValue() instanceof Set) { @SuppressWarnings("unchecked") diff --git a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java index e23213fafc..d5c3654b4e 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java +++ b/tests/testbench/com/vaadin/tests/components/tree/ExpandCollapseTree.java @@ -30,6 +30,7 @@ public class ExpandCollapseTree extends TestBase { tree.expandItemsRecursively("Item 4"); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (tree.getValue() instanceof Set) { @SuppressWarnings("unchecked") diff --git a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java index f2ca2a85bd..33bd4cef65 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java +++ b/tests/testbench/com/vaadin/tests/components/tree/ItemStyleGenerator.java @@ -32,6 +32,7 @@ public class ItemStyleGenerator extends TestBase { Tree tree = new Tree(); tree.setItemStyleGenerator(new Tree.ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { // simple return itemId as css style name return itemId.toString(); diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java index b37d371b17..4072610996 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java @@ -27,6 +27,7 @@ public class TreeConnectors extends TestBase { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { tree.addStyleName(BaseTheme.TREE_CONNECTORS); @@ -50,11 +51,13 @@ public class TreeConnectors extends TestBase { tree.setDragMode(TreeDragMode.NODE); tree.setDropHandler(new DropHandler() { + @Override public void drop(DragAndDropEvent event) { // TODO Auto-generated method stub } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java index df2682a14c..f4374ca2ee 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeContainerChange.java @@ -57,6 +57,7 @@ public class TreeContainerChange extends TestBase { Button b = new Button("Use ds1"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tree.setContainerDataSource(ds1); currentDS.setValue("ds1"); @@ -72,6 +73,7 @@ public class TreeContainerChange extends TestBase { b = new Button("Use ds2"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tree.setContainerDataSource(ds2); currentDS.setValue("ds2"); @@ -82,6 +84,7 @@ public class TreeContainerChange extends TestBase { addComponent(hl); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { currentValue.setValue(event.getProperty().getValue()); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java b/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java index dca2d96628..7aa3933752 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeDragAndDropFromTable.java @@ -38,10 +38,12 @@ public class TreeDragAndDropFromTable extends TestBase { final Tree tree = new Tree(); tree.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return TargetItemAllowsChildren.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { // criteria verify that this is safe DataBoundTransferable t = (DataBoundTransferable) dropEvent diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java index 20d1eacb97..bd7984cdeb 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFiltering.java @@ -47,6 +47,7 @@ public class TreeFiltering extends TestBase { filterType.setImmediate(true); filterType.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { cont.setIncludeParentsWhenFiltering((Boolean) ((CheckBox) event .getProperty()).getValue()); @@ -56,6 +57,7 @@ public class TreeFiltering extends TestBase { addComponent(filterType); final Button b = new Button("Add filter 'foo'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "foo", true, false); @@ -63,6 +65,7 @@ public class TreeFiltering extends TestBase { }); addComponent(b); final Button b2 = new Button("Add filter 'Num'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "Num", true, false); @@ -71,6 +74,7 @@ public class TreeFiltering extends TestBase { addComponent(b2); final Button num = new Button("Add filter '0'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "0", true, false); @@ -79,6 +83,7 @@ public class TreeFiltering extends TestBase { addComponent(num); final Button num2 = new Button("Add filter '0-'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "0-", true, false); @@ -88,6 +93,7 @@ public class TreeFiltering extends TestBase { addComponent(num2); final Button num3 = new Button("Add filter 'Number 4'", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.addContainerFilter("caption", "Number 4", true, false); @@ -98,6 +104,7 @@ public class TreeFiltering extends TestBase { addComponent(num3); final Button p1 = new Button("Set Number 3 parent to Number 0", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.setParent(3, 0); @@ -105,6 +112,7 @@ public class TreeFiltering extends TestBase { }); addComponent(p1); final Button r = new Button("Remove filters", new ClickListener() { + @Override public void buttonClick(final ClickEvent event) { cont.removeAllContainerFilters(); diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java index 87170214ca..dd407fd62a 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeFocusGaining.java @@ -20,6 +20,7 @@ public class TreeFocusGaining extends TestBase { addComponent(textField); textField.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("TF value now:" + event.getProperty().getValue()); } @@ -30,6 +31,7 @@ public class TreeFocusGaining extends TestBase { addComponent(tree); tree.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Tree value now:" + event.getProperty().getValue()); } @@ -39,6 +41,7 @@ public class TreeFocusGaining extends TestBase { tree = new Tree("Simple tree with itemm click listener"); tree.addItem("Item1"); tree.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { log.log("Item click event"); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java index e772be7cde..182bc97c44 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeItemClickListening.java @@ -28,6 +28,7 @@ public class TreeItemClickListening extends TestBase { tree.setItemCaptionPropertyId("caption"); tree.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { clickCounter++; switch (event.getButton()) { diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java index a6079160ab..b3ab5c2b01 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeScrollingOnSelection.java @@ -29,6 +29,7 @@ public class TreeScrollingOnSelection extends TestBase { private static final long serialVersionUID = 5955518276555388126L; + @Override public void itemClick(ItemClickEvent event) { charLabel.setValue(event.getItemId().toString()); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java b/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java index c6e29bc3b8..4b892c2150 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeToolTips.java @@ -13,6 +13,7 @@ public class TreeToolTips extends TestBase { protected void setup() { final Tree tree = new Tree(null, createContainer()); tree.setItemDescriptionGenerator(new AbstractSelect.ItemDescriptionGenerator() { + @Override public String generateDescription(Component source, Object itemId, Object propertyId) { return "This is a tooltip for item id '" + itemId + "'"; diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java b/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java index 92c82a6ccf..8da6759b20 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java +++ b/tests/testbench/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java @@ -11,6 +11,7 @@ public class TreeWithPreselectedItemNotShown extends TestBase { protected void setup() { Button open = new Button("Open modal window with tree", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { getMainWindow().addWindow(new SubwindowWithTree()); } diff --git a/tests/testbench/com/vaadin/tests/components/tree/Trees.java b/tests/testbench/com/vaadin/tests/components/tree/Trees.java index 79de4de412..3ee1d7b0de 100644 --- a/tests/testbench/com/vaadin/tests/components/tree/Trees.java +++ b/tests/testbench/com/vaadin/tests/components/tree/Trees.java @@ -26,6 +26,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private ItemStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Tree.ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { Hierarchical c = (Container.Hierarchical) getComponent() .getContainerDataSource(); @@ -50,6 +51,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private ItemStyleGenerator evenItemsBold = new com.vaadin.ui.Tree.ItemStyleGenerator() { + @Override public String getStyle(Object itemId) { Hierarchical c = (Container.Hierarchical) getComponent() .getContainerDataSource(); @@ -80,17 +82,20 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, ContextMenu> contextMenuCommand = new Command<Tree, ContextMenu>() { + @Override public void execute(Tree c, final ContextMenu value, Object data) { c.removeAllActionHandlers(); if (value != null) { c.addActionHandler(new Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { log("Action " + action.getCaption() + " performed on " + target); } + @Override public Action[] getActions(Object target, Object sender) { return value.getActions(target, sender); } @@ -176,6 +181,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements createSelectAction("Selection Mode", category, options, "Multi - ctrl/shift", new Command<Tree, SelectMode>() { + @Override public void execute(Tree t, SelectMode value, Object data) { switch (value) { case NONE: @@ -318,6 +324,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements */ private Command<Tree, Integer> rootItemIdsCommand = new Command<Tree, Integer>() { + @Override public void execute(Tree c, Integer value, Object data) { rootItemIds = value; updateContainer(); @@ -326,12 +333,14 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, Object> expandItemCommand = new Command<Tree, Object>() { + @Override public void execute(Tree c, Object itemId, Object data) { c.expandItem(itemId); } }; private Command<Tree, Object> expandItemRecursivelyCommand = new Command<Tree, Object>() { + @Override public void execute(Tree c, Object itemId, Object data) { c.expandItemsRecursively(itemId); } @@ -339,6 +348,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, Object> collapseItemCommand = new Command<Tree, Object>() { + @Override public void execute(Tree c, Object itemId, Object data) { c.collapseItem(itemId); } @@ -346,12 +356,14 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, Boolean> setChildrenAllowedCommand = new Command<Tree, Boolean>() { + @Override public void execute(Tree c, Boolean areChildrenAllowed, Object itemId) { c.setChildrenAllowed(itemId, areChildrenAllowed); } }; private Command<Tree, Boolean> expandListenerCommand = new Command<Tree, Boolean>() { + @Override public void execute(Tree c, Boolean value, Object data) { if (value) { c.addListener((ExpandListener) Trees.this); @@ -362,6 +374,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements }; private Command<Tree, Boolean> collapseListenerCommand = new Command<Tree, Boolean>() { + @Override public void execute(Tree c, Boolean value, Object data) { if (value) { c.addListener((CollapseListener) Trees.this); @@ -373,6 +386,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements private Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator> itemStyleGeneratorCommand = new Command<Tree, com.vaadin.ui.Tree.ItemStyleGenerator>() { + @Override public void execute(Tree c, com.vaadin.ui.Tree.ItemStyleGenerator value, Object data) { c.setItemStyleGenerator(value); @@ -380,10 +394,12 @@ public class Trees extends AbstractSelectTestCase<Tree> implements } }; + @Override public void nodeCollapse(CollapseEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } + @Override public void nodeExpand(ExpandEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java b/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java index 5bf0370bab..f6b32aa4a9 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/AddNodesOnExpand.java @@ -18,11 +18,13 @@ public class AddNodesOnExpand extends TestBase { treetable.setPageLength(0); treetable.addContainerProperty("foo", String.class, ""); treetable.addListener(new Tree.ExpandListener() { + @Override public void nodeExpand(ExpandEvent event) { Object openedItemId = event.getItemId(); if (!treetable.hasChildren(openedItemId)) { for (int j = 0; j < 3; j++) { - treetable.addItem(openedItemId + "-" + j); + treetable.addItem(new String[] { "Subitem " + j }, + openedItemId + "-" + j); treetable.setParent(openedItemId + "-" + j, openedItemId); } @@ -30,6 +32,7 @@ public class AddNodesOnExpand extends TestBase { } }); treetable.addListener(new Tree.CollapseListener() { + @Override public void nodeCollapse(CollapseEvent event) { /* Uncomment this to "fix" the TreeTable */ // orgTree.refreshRowCache(); @@ -37,7 +40,7 @@ public class AddNodesOnExpand extends TestBase { }); for (int i = 0; i < 3; i++) { - treetable.addItem(Integer.valueOf(i)); + treetable.addItem(new String[] { "Item " + i }, Integer.valueOf(i)); } addComponent(treetable); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java b/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java index 9cb60efd74..0fe8a3d1b9 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ChangeDataSourcePageLengthZero.java @@ -21,12 +21,14 @@ public class ChangeDataSourcePageLengthZero extends TestBase { addComponent(tt); Button page1 = new Button("Set new data source (20 items)"); page1.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { setupContainer(tt, 20); } }); Button page2 = new Button("Set new data source (10 items)"); page2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { setupContainer(tt, 10); } @@ -35,6 +37,7 @@ public class ChangeDataSourcePageLengthZero extends TestBase { addButton.addListener(new Button.ClickListener() { private int i = 1; + @Override public void buttonClick(ClickEvent event) { HierarchicalContainer container = (HierarchicalContainer) tt .getContainerDataSource(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html new file mode 100644 index 0000000000..05c5986e6b --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html @@ -0,0 +1,32 @@ +<?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>ComponentsInTreeTable</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">ComponentsInTreeTable</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.treetable.ComponentsInTreeTable?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstreetableComponentsInTreeTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTreeTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td> + <td>15,7</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java index 5b7700bc6e..8ff80204cc 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java @@ -7,6 +7,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.TreeTable; +import com.vaadin.ui.VerticalLayout; public class ComponentsInTreeTable extends TestBase { @@ -14,28 +15,28 @@ public class ComponentsInTreeTable extends TestBase { protected void setup() { TreeTable tt = new TreeTable(); tt.setWidth("300px"); + tt.setHeight("300px"); addComponent(tt); - Object id, id2; + tt.addContainerProperty("component", Component.class, ""); + tt.addContainerProperty("type", String.class, "bar"); - tt.addContainerProperty("foo", Component.class, ""); - tt.addContainerProperty("bar", String.class, "bar"); - tt.addContainerProperty("baz", String.class, "baz"); - - id = tt.addItem(); Layout l = new HorizontalLayout(); l.addComponent(new Label("bar")); l.addComponent(new Label("bar")); - tt.getContainerProperty(id, "foo").setValue(l); + tt.addItem(new Object[] { l, "HorizontalLayout" }, 1); + + l = new VerticalLayout(); + l.addComponent(new Label("baz")); + l.addComponent(new Label("baz")); + tt.addItem(new Object[] { l, "VerticalLayout" }, 2); - id = tt.addItem(); Label lbl = new Label("<b>foo</b><br/><i>bar</i>"); lbl.setContentMode(Label.CONTENT_XHTML); - tt.getContainerProperty(id, "foo").setValue(lbl); + tt.addItem(new Object[] { lbl, "Label" }, 3); - id2 = tt.addItem(); - tt.setParent(id2, id); - tt.getContainerProperty(id2, "foo").setValue(new Button("Test")); + tt.addItem(new Object[] { new Button("Test"), "Button" }, 4); + tt.setParent(4, 3); } @Override diff --git a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java b/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java index 89211dbecc..6dc5417d28 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/DynamicallyModified.java @@ -87,6 +87,7 @@ public class DynamicallyModified extends TestBase implements private int newChild = 1; + @Override public void nodeExpand(ExpandEvent event) { Object expandedItemId = event.getItemId(); // 7 == "Customer Project 1" @@ -100,6 +101,7 @@ public class DynamicallyModified extends TestBase implements treetable.setChildrenAllowed(newChildId, false); } + @Override public void nodeCollapse(CollapseEvent event) { Object collapsedItemId = event.getItemId(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java index ad0255a2da..799537f923 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/KeepAllItemsVisible.java @@ -37,6 +37,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, tt.addListener((CollapseListener) this); tt.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { recalculatePageLength(tt); tt.requestRepaint(); @@ -49,6 +50,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, Button b = new Button("Set pagelength to 10", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tt.setPageLength(10); } @@ -56,6 +58,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, addComponent(b); b = new Button("Set pagelength to 20", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tt.setPageLength(20); } @@ -63,6 +66,7 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, addComponent(b); b = new Button("Set pagelength to 0", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tt.setPageLength(0); } @@ -121,11 +125,13 @@ public class KeepAllItemsVisible extends TestBase implements ExpandListener, return 7292; } + @Override public void nodeCollapse(CollapseEvent event) { recalculatePageLength((TreeTable) event.getSource()); } + @Override public void nodeExpand(ExpandEvent event) { recalculatePageLength((TreeTable) event.getSource()); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java index 447ce6c465..ea76a9639a 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticCollapse.java @@ -30,6 +30,7 @@ public class ProgrammaticCollapse extends TestBase { layout.addComponent(table); layout.addComponent(new Button("Expand / Collapse", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean collapsed = !table.isCollapsed(1); Notification.show("set collapsed: " + collapsed); @@ -38,6 +39,7 @@ public class ProgrammaticCollapse extends TestBase { })); layout.addComponent(new Button("Expand / Collapse last", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean collapsed = !table.isCollapsed(100); Notification.show("set collapsed: " + collapsed); @@ -48,6 +50,7 @@ public class ProgrammaticCollapse extends TestBase { new ClickListener() { private boolean collapsed = true; + @Override public void buttonClick(ClickEvent event) { collapsed = !collapsed; Notification.show("set collapsed: " + collapsed); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java index fc68d0be15..7088497b4e 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/ProgrammaticSelect.java @@ -23,6 +23,7 @@ public class ProgrammaticSelect extends TestBase { Button selectItem = new Button("Select first row", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object id = tt.getItemIds().iterator().next(); tt.select(id); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java b/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java index 69198ca006..a92a9e045e 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/RemoveAllItemsRefresh.java @@ -39,6 +39,7 @@ public class RemoveAllItemsRefresh extends TestBase { Button cleanUp = new Button("clear"); cleanUp.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { treeContainer.removeAllItems(); } @@ -47,6 +48,7 @@ public class RemoveAllItemsRefresh extends TestBase { Button refresh = new Button("fill"); refresh.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { fill(); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java index ae6a9d0c0b..c2bd3da860 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableCacheOnPartialUpdates.java @@ -68,6 +68,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { } public class Col3ColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(final com.vaadin.ui.Table source, final Object itemId, Object columnId) { TestBean tb = (TestBean) itemId; @@ -78,6 +79,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { System.out.println("Generating new Button for " + identifier); Button btnCol3 = new NativeButton(identifier); btnCol3.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button " + event.getButton().getCaption() + " clicked. Row index: " @@ -117,6 +119,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { addComponent(b); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("First visible item id is: " + treeTable.getCurrentPageFirstItemId()); @@ -131,6 +134,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { cacheRateSelect.setValue(2); cacheRateSelect.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { treeTable .setCacheRate((Integer) event.getProperty().getValue()); @@ -154,6 +158,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { treeTable.addGeneratedColumn("col3", new Col3ColumnGenerator()); treeTable.addListener(new ExpandListener() { + @Override public void nodeExpand(ExpandEvent event) { logExpandCollapse(event.getItemId(), "expanded"); @@ -161,6 +166,7 @@ public class TreeTableCacheOnPartialUpdates extends TestBase { }); treeTable.addListener(new CollapseListener() { + @Override public void nodeCollapse(CollapseEvent event) { logExpandCollapse(event.getItemId(), "collapsed"); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java index 336ffb5a52..02ce397a05 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableModifyAndSetCollapsed.java @@ -26,6 +26,7 @@ public class TreeTableModifyAndSetCollapsed extends TestBase { addComponent(tt); Button repopulate = new Button("Repopulate", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { // repopulate the container and expand root item container.removeAllItems(); diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html index 2e69052162..b57c5f978e 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableNegativeArraySize.html @@ -40,6 +40,11 @@ </tr> <!--collapse root2--> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>mouseClick</td> <td>vaadin=runcomvaadintestscomponentstreetableTreeTablePartialUpdates::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTreeTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[42]/domChild[0]/domChild[0]/domChild[0]</td> <td>11,-182</td> @@ -49,7 +54,6 @@ <td></td> <td>root1-expanded-scrolled-to-end</td> </tr> - </tbody></table> </body> </html> diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java index 0c1fcdbfd8..e688e039eb 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableOutOfSync.java @@ -16,6 +16,7 @@ public class TreeTableOutOfSync extends TestBase { TreeTable tt = new TreeTable(); tt.addContainerProperty("i", Integer.class, null); tt.addGeneratedColumn("text", new Table.ColumnGenerator() { + @Override public Object generateCell(Table source, Object itemId, Object columnId) { if ("text".equals(columnId)) { @@ -23,6 +24,7 @@ public class TreeTableOutOfSync extends TestBase { + source.getContainerDataSource().getItem(itemId) .getItemProperty("i").getValue()); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("click"); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java index 2a14c946f3..7159addb5b 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableSetCollapsed.java @@ -12,6 +12,7 @@ public class TreeTableSetCollapsed extends TestBase { createTreeTableAndPopulate(); addComponent(new Button("Create another TreeTable", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { createTreeTableAndPopulate(); } diff --git a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java index d7d9c18d7e..f27a47f12b 100644 --- a/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java +++ b/tests/testbench/com/vaadin/tests/components/treetable/TreeTableTest.java @@ -27,6 +27,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private int rootItemIds = 3; private CellStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Table.CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (propertyId != null) { return null; @@ -54,6 +55,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private CellStyleGenerator evenItemsBold = new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (propertyId != null) { return null; @@ -235,6 +237,7 @@ public class TreeTableTest extends Tables<TreeTable> implements */ private Command<TreeTable, Integer> rootItemIdsCommand = new Command<TreeTable, Integer>() { + @Override public void execute(TreeTable c, Integer value, Object data) { rootItemIds = value; updateContainer(); @@ -243,6 +246,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private Command<TreeTable, Object> expandItemCommand = new Command<TreeTable, Object>() { + @Override public void execute(TreeTable c, Object itemId, Object data) { c.setCollapsed(itemId, false); } @@ -250,6 +254,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private Command<TreeTable, Object> collapseItemCommand = new Command<TreeTable, Object>() { + @Override public void execute(TreeTable c, Object itemId, Object data) { c.setCollapsed(itemId, true); } @@ -257,6 +262,7 @@ public class TreeTableTest extends Tables<TreeTable> implements private Command<TreeTable, Boolean> setChildrenAllowedCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean areChildrenAllowed, Object itemId) { c.setChildrenAllowed(itemId, areChildrenAllowed); @@ -264,6 +270,7 @@ public class TreeTableTest extends Tables<TreeTable> implements }; private Command<TreeTable, Boolean> expandListenerCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean value, Object data) { if (value) { c.addListener((ExpandListener) TreeTableTest.this); @@ -274,6 +281,7 @@ public class TreeTableTest extends Tables<TreeTable> implements }; private Command<TreeTable, Boolean> collapseListenerCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean value, Object data) { if (value) { c.addListener((CollapseListener) TreeTableTest.this); @@ -285,15 +293,18 @@ public class TreeTableTest extends Tables<TreeTable> implements protected Command<TreeTable, Boolean> animationCommand = new Command<TreeTable, Boolean>() { + @Override public void execute(TreeTable c, Boolean enabled, Object data) { c.setAnimationsEnabled(enabled); } }; + @Override public void nodeCollapse(CollapseEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } + @Override public void nodeExpand(ExpandEvent event) { log(event.getClass().getSimpleName() + ": " + event.getItemId()); } diff --git a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java index ddb418dab3..fc1b11bb94 100644 --- a/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java +++ b/tests/testbench/com/vaadin/tests/components/twincolselect/TwinColSelects.java @@ -51,12 +51,14 @@ public class TwinColSelects extends AbstractSelectTestCase<TwinColSelect> { private Command<TwinColSelect, Integer> columnsAction = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setColumns(value); } }; private Command<TwinColSelect, Integer> rowsAction = new Command<TwinColSelect, Integer>() { + @Override public void execute(TwinColSelect c, Integer value, Object data) { c.setRows(value); } diff --git a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java b/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java index 84e266dea2..47aad46348 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java +++ b/tests/testbench/com/vaadin/tests/components/upload/ForceSubmit.java @@ -21,6 +21,7 @@ public class ForceSubmit extends TestBase implements Receiver { return 6630; } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { return new ByteArrayOutputStream(); } @@ -40,6 +41,7 @@ public class ForceSubmit extends TestBase implements Receiver { addComponent(u); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { String filename = event.getFilename(); long length = event.getLength(); @@ -49,12 +51,14 @@ public class ForceSubmit extends TestBase implements Receiver { }); u.addListener(new Upload.FailedListener() { + @Override public void uploadFailed(FailedEvent event) { getMainWindow().showNotification("Failed. No file selected?"); } }); u.addListener(new Upload.StartedListener() { + @Override public void uploadStarted(StartedEvent event) { getMainWindow().showNotification( "Started upload. TF value :" + textField.getValue()); @@ -64,6 +68,7 @@ public class ForceSubmit extends TestBase implements Receiver { Button button = new Button( "I'm an external button (not the uploads builtin), hit me to start upload."); button.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { u.submitUpload(); } diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java b/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java index 4f1e8358f4..529a977ede 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestFileUpload.java @@ -21,6 +21,7 @@ public class TestFileUpload extends TestBase implements Receiver { protected void setup() { Upload u = new Upload("Upload", new Upload.Receiver() { + @Override public OutputStream receiveUpload(String filename, String mimeType) { return baos; } @@ -28,6 +29,7 @@ public class TestFileUpload extends TestBase implements Receiver { u.setDebugId("UPL"); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { String hash = DigestUtils.md5Hex(baos.toByteArray()); log.log("Upload finished. Name: " + event.getFilename() @@ -40,6 +42,7 @@ public class TestFileUpload extends TestBase implements Receiver { addComponent(u); } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { getMainWindow().showNotification("Receiving upload"); return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java b/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java index b6126f41da..7607536357 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestImmediateUploadInFormLayout.java @@ -46,6 +46,7 @@ public class TestImmediateUploadInFormLayout extends return Collections.emptyList(); } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { getMainWindow().showNotification("Receiving upload"); return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java b/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java index 535372f710..9ca0cb9c38 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestUpload.java @@ -32,6 +32,7 @@ public class TestUpload extends ComponentTestCase<Upload> implements Receiver { addTestComponent(u); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { getMainWindow().showNotification("Done"); } @@ -51,6 +52,7 @@ public class TestUpload extends ComponentTestCase<Upload> implements Receiver { return actions; } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { getMainWindow().showNotification("Receiving upload"); return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java index 0aa8e809c4..516ca2d7c9 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java @@ -51,6 +51,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> u.addListener(new Upload.StartedListener() { + @Override public void uploadStarted(StartedEvent event) { /* * Remove component before upload from the same vertical layout. @@ -63,6 +64,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> }); u.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { getMainWindow().showNotification("Done"); l.setValue(getUploadcount()); @@ -81,6 +83,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> actions.add(createButtonAction("Toggle Enabled", new Command<Upload, Boolean>() { + @Override public void execute(Upload c, Boolean value, Object data) { c.setEnabled(!c.isEnabled()); } @@ -89,6 +92,7 @@ public class TestUploadAndDisableOnSuccess extends ComponentTestCase<Upload> return actions; } + @Override public OutputStream receiveUpload(String filename, String MIMEType) { // sleep to ensure change before upload is complete try { diff --git a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java b/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java index 12006412f2..de0cca5009 100644 --- a/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java +++ b/tests/testbench/com/vaadin/tests/components/upload/TestUploadFilename.java @@ -23,6 +23,7 @@ public class TestUploadFilename extends TestBase { addComponent(result); upload.addListener(new Upload.FinishedListener() { + @Override public void uploadFinished(FinishedEvent event) { result.setValue("Got file (should not contain path): " + receiver.getFilename()); @@ -35,6 +36,7 @@ public class TestUploadFilename extends TestBase { private String filename; + @Override public OutputStream receiveUpload(String filename, String MIMEType) { this.filename = filename; return new ByteArrayOutputStream(); diff --git a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java index ae3d4bc053..52a94daec7 100644 --- a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java +++ b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java @@ -84,6 +84,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase }; okButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log("Button clicked"); @@ -114,6 +115,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase return 8170; } + @Override public void onRequestStart(HttpServletRequest request, HttpServletResponse response) { if (request.getParameter("attachMainFirst") != null) { @@ -122,6 +124,7 @@ public class AttachShouldBeCalledForSubWindows extends AbstractTestCase } + @Override public void onRequestEnd(HttpServletRequest request, HttpServletResponse response) { // TODO Auto-generated method stub diff --git a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java index bcfbc7f55a..e618cd38b5 100644 --- a/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java +++ b/tests/testbench/com/vaadin/tests/components/window/CloseSubWindow.java @@ -18,6 +18,7 @@ public class CloseSubWindow extends TestBase { Button openWindowButton = new Button("Open sub-window"); openWindowButton.setDebugId("opensub"); openWindowButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Window sub = createClosableSubWindow("Sub-window"); getMainWindow().addWindow(sub); @@ -36,6 +37,7 @@ public class CloseSubWindow extends TestBase { Button closeButton = new Button("Close"); closeButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { event.getButton().findAncestor(Window.class).close(); } @@ -44,6 +46,7 @@ public class CloseSubWindow extends TestBase { Button removeButton = new Button("Remove from parent"); removeButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.close(); } @@ -51,6 +54,7 @@ public class CloseSubWindow extends TestBase { window.addComponent(closeButton); window.addListener(new CloseListener() { + @Override public void windowClose(CloseEvent e) { log.log("Window '" + title + "' closed"); } diff --git a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java b/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java index ca9c31513f..76b93cae56 100644 --- a/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java +++ b/tests/testbench/com/vaadin/tests/components/window/DownloadAndUpdate.java @@ -12,6 +12,7 @@ public class DownloadAndUpdate extends TestBase { protected void setup() { addComponent(new Button("Download and update", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { downloadAndUpdate(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java index bf979b1aa3..a9744b2c06 100644 --- a/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java +++ b/tests/testbench/com/vaadin/tests/components/window/ExecuteJavaScript.java @@ -26,6 +26,7 @@ public class ExecuteJavaScript extends AbstractTestCase { Button b = new Button(script); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().executeJavaScript(script); } diff --git a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java index e81e02b22b..fc8d7474af 100644 --- a/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java +++ b/tests/testbench/com/vaadin/tests/components/window/ExtraWindowShown.java @@ -13,12 +13,14 @@ public class ExtraWindowShown extends TestBase { protected void setup() { Button b = new Button("Open window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window w = new Window("Sub window"); w.center(); w.addComponent(new Button("Close", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.close(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java index 9eaabf7340..eb4803630f 100644 --- a/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/tests/testbench/com/vaadin/tests/components/window/LazyWindowResize.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.window; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.Page.BrowserWindowResizeEvent; import com.vaadin.terminal.Page.BrowserWindowResizeListener; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Log; import com.vaadin.tests.util.LoremIpsum; @@ -25,12 +25,14 @@ public class LazyWindowResize extends AbstractTestCase { protected ResizeListener resizeListener = new ResizeListener() { + @Override public void windowResized(ResizeEvent e) { log.log("Sub window resized"); } }; protected BrowserWindowResizeListener browserWindowResizeListener = new BrowserWindowResizeListener() { + @Override public void browserWindowResized(BrowserWindowResizeEvent event) { log.log("Main window resized"); } @@ -63,6 +65,7 @@ public class LazyWindowResize extends AbstractTestCase { lazyMode.setImmediate(true); lazyMode.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setLazy(lazyMode.getValue()); } @@ -72,6 +75,7 @@ public class LazyWindowResize extends AbstractTestCase { resizeListenerCheckBox.setImmediate(true); resizeListenerCheckBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (resizeListenerCheckBox.getValue()) { subWindow.addListener(resizeListener); @@ -88,6 +92,7 @@ public class LazyWindowResize extends AbstractTestCase { immediateCheckBox.setImmediate(true); immediateCheckBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { mainWindow.setImmediate(immediateCheckBox.getValue()); subWindow.setImmediate(immediateCheckBox.getValue()); diff --git a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java b/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java index c916973713..be67cfe9a0 100644 --- a/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java +++ b/tests/testbench/com/vaadin/tests/components/window/LongNotifications.java @@ -25,6 +25,7 @@ public class LongNotifications extends TestBase { Button b = new Button("Show loooong notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification( @@ -38,6 +39,7 @@ public class LongNotifications extends TestBase { b = new Button("Show notifications", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Example failed", @@ -51,6 +53,7 @@ public class LongNotifications extends TestBase { b = new Button("Show loooong notification (error)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow() @@ -65,6 +68,7 @@ public class LongNotifications extends TestBase { b = new Button("Show notification (error)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().showNotification("Example failed", diff --git a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java index 353eb535ca..59cd35c2cb 100644 --- a/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java +++ b/tests/testbench/com/vaadin/tests/components/window/RepaintWindowContents.java @@ -30,6 +30,7 @@ public class RepaintWindowContents extends AbstractTestRoot { button1.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.setContent(layout2); } @@ -37,6 +38,7 @@ public class RepaintWindowContents extends AbstractTestRoot { button2.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.setContent(layout1); } diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java index f0dccda66c..389c926986 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocus.java @@ -41,6 +41,7 @@ public class SubWindowFocus extends TestBase { addComponent(tf); Button b = new Button("new", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window win = new Window("Subwin"); win.getContent().setWidth(null); @@ -56,10 +57,12 @@ public class SubWindowFocus extends TestBase { ShortcutAction spc = new ShortcutAction("Space", ShortcutAction.KeyCode.SPACEBAR, null); + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { esc, spc }; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == esc) { diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java index 1e342abe01..061ee7900f 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowFocusAndBlurListeners.java @@ -36,12 +36,14 @@ public class SubWindowFocusAndBlurListeners extends TestBase { window.addComponent(new TextField()); window.addListener(new FocusListener() { + @Override public void focus(FocusEvent event) { Notification.show("Focused window"); } }); window.addListener(new BlurListener() { + @Override public void blur(BlurEvent event) { Notification.show("Blurred window"); } @@ -51,10 +53,12 @@ public class SubWindowFocusAndBlurListeners extends TestBase { private Action[] s = new Action[] { new ShortcutAction("^Save") }; + @Override public Action[] getActions(Object target, Object sender) { return s; } + @Override public void handleAction(Action action, Object sender, Object target) { Notification.show("Action!"); } @@ -68,6 +72,7 @@ public class SubWindowFocusAndBlurListeners extends TestBase { Button button = new Button("Bring to front (should focus too)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { window.bringToFront(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java index 9b4fcea22b..02241476d5 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowOrder.java @@ -64,6 +64,7 @@ public class SubWindowOrder extends TestBase { toggleModality.addListener(this); } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == bf) { getCurWindow().bringToFront(); diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java b/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java index fc99309b50..5bda762d3f 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindowWithUndefinedHeight.java @@ -38,6 +38,7 @@ public class SubWindowWithUndefinedHeight extends TestBase { tabsheet.addComponent(tabButton); tabsheet.addComponent(table); tabsheet.addListener(new TabSheet.SelectedTabChangeListener() { + @Override public void selectedTabChange(TabSheet.SelectedTabChangeEvent event) { if (tabsheet.getSelectedTab() == tabButton) { tabsheet.setSizeUndefined(); @@ -54,6 +55,7 @@ public class SubWindowWithUndefinedHeight extends TestBase { subwindow.addComponent(tabsheet); Button button = new Button("click me", new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { getMainWindow().addWindow(subwindow); } diff --git a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java b/tests/testbench/com/vaadin/tests/components/window/SubWindows.java index e939f0b9a4..c39bfdb713 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubWindows.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubWindows.java @@ -32,6 +32,7 @@ public class SubWindows extends TestBase { Button b = new Button("Remove"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); ComponentContainer cc = (ComponentContainer) b.getParent(); @@ -51,6 +52,7 @@ public class SubWindows extends TestBase { autoWideWindow.addComponent(new TextField("Field 2")); autoWideWindow.addComponent(new Button("Add", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { autoWideWindow.addComponent(createRemoveButton()); diff --git a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java b/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java index e1927982cd..45fb343b45 100644 --- a/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java +++ b/tests/testbench/com/vaadin/tests/components/window/SubwindowDraggability.java @@ -21,6 +21,7 @@ public class SubwindowDraggability extends TestBase { Button b = new Button("Swap", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean b = draggableSubWindow.isDraggable(); diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html new file mode 100644 index 0000000000..d734cab9ea --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html @@ -0,0 +1,69 @@ +<?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>TooltipInWindow</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">TooltipInWindow</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.window.TooltipInWindow?restartApplication</td> + <td></td> +</tr> +<!--Show tooltip in Root--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentswindowTooltipInWindow::/VVerticalLayout[0]/VVerticalLayout[0]/VTextField[0]</td> + <td>5,5</td> +</tr> +<tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentswindowTooltipInWindow::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>My tooltip</td> +</tr> +<!--Hide the tooltip--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentswindowTooltipInWindow::/VVerticalLayout[0]</td> + <td>0,0</td> +</tr> +<tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>assertElementNotPresent</td> + <td>vaadin=runcomvaadintestscomponentswindowTooltipInWindow::Root/VTooltip[0]</td> + <td></td> +</tr> +<!--Show tooltip in Window--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentswindowTooltipInWindow::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VTextField[0]</td> + <td>5,5</td> +</tr> +<tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentswindowTooltipInWindow::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>My tooltip</td> +</tr> +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java new file mode 100644 index 0000000000..184bde9b14 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java @@ -0,0 +1,41 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.components.window; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.tests.components.AbstractTestRoot; +import com.vaadin.ui.TextField; +import com.vaadin.ui.Window; + +public class TooltipInWindow extends AbstractTestRoot { + + @Override + protected void setup(WrappedRequest request) { + Window window = new Window("Window"); + window.getContent().setSizeUndefined(); + window.center(); + window.addComponent(createTextField()); + + addWindow(window); + addComponent(createTextField()); + } + + private TextField createTextField() { + TextField tf = new TextField("TextField with a tooltip"); + tf.setDescription("My tooltip"); + return tf; + } + + @Override + protected String getTestDescription() { + return "Tooltips should also work in a Window (as well as in other overlays)"; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(9172); + } + +} diff --git a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java index ed259b2f4c..715d089f57 100644 --- a/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java +++ b/tests/testbench/com/vaadin/tests/components/window/UndefinedHeightSubWindowAndContent.java @@ -28,6 +28,7 @@ public class UndefinedHeightSubWindowAndContent extends TestBase { field1.setImmediate(true); field1.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { if (!isValid(value)) { throw new InvalidValueException("FAIL!"); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java index 041ccaaf30..a4120b7d42 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowClickEvents.java @@ -29,6 +29,7 @@ public class WindowClickEvents extends TestBase { protected void setup() { VerticalLayout layout = new VerticalLayout(); layout.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { WindowClickEvents.this.click("Sub window layout", event); } @@ -36,6 +37,7 @@ public class WindowClickEvents extends TestBase { ((VerticalLayout) getMainWindow().getContent()) .addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { WindowClickEvents.this.click("Main window layout", event); @@ -45,6 +47,7 @@ public class WindowClickEvents extends TestBase { Window centered = new Window("A window with a click listener", layout); centered.addListener(new ClickListener() { + @Override public void click(ClickEvent event) { WindowClickEvents.this.click("Sub window", event); } @@ -60,6 +63,7 @@ public class WindowClickEvents extends TestBase { "Clicking here should not produce a layout click event"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(com.vaadin.ui.Button.ClickEvent event) { log.log("Click on button"); } @@ -73,6 +77,7 @@ public class WindowClickEvents extends TestBase { addComponent(log); getMainWindow().addListener(new ClickListener() { + @Override public void click(ClickEvent event) { WindowClickEvents.this.click("Main window", event); } diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java index ac6c313d29..74d7b564db 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowResizeListener.java @@ -34,6 +34,7 @@ public class WindowResizeListener extends TestBase { getLayout().addComponent(l); getMainWindow().addListener(new Page.BrowserWindowResizeListener() { + @Override public void browserWindowResized(BrowserWindowResizeEvent event) { l.setValue("Current browser window size: " + getMainWindow().getBrowserWindowWidth() + " x " @@ -45,6 +46,7 @@ public class WindowResizeListener extends TestBase { subwindow.setImmediate(true); subwindow.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { getMainWindow().addWindow(subwin); @@ -58,6 +60,7 @@ public class WindowResizeListener extends TestBase { CheckBox immediate = new CheckBox("immediate"); immediate.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { boolean booleanValue = (Boolean) event.getProperty().getValue(); getMainWindow().setImmediate(booleanValue); @@ -87,6 +90,7 @@ class ResizeListenerWindow extends Window { hl.addComponent(sizeLabel); addListener(new ResizeListener() { + @Override public void windowResized(ResizeEvent e) { updateLabel(); } diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java index 9f3f27cf6a..fdeb21d29c 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java @@ -60,6 +60,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { window.addComponent(new Button("Scroll mainwin to X9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().scrollIntoView(x9); @@ -67,6 +68,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { })); window.addComponent(new Button("Scroll mainwin to Y9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().scrollIntoView(y9); @@ -100,6 +102,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { ((VerticalLayout) getMainWindow().getContent()).addComponent( new Button("Scroll win to X9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new RuntimeException("Currently not implemented"); // window.scrollIntoView(x29); @@ -107,6 +110,7 @@ public class WindowScrollingComponentIntoView extends AbstractTestCase { }), 0); ((VerticalLayout) getMainWindow().getContent()).addComponent( new Button("Scroll win to Y9", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { throw new RuntimeException("Currently not implemented"); // window.scrollIntoView(y29); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java index 2054b751ef..43f8297a5d 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowScrollingUp.java @@ -26,6 +26,7 @@ public class WindowScrollingUp extends AbstractTestCase { final Button up = new Button("up"); up.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { up.getRoot().setScrollTop(0); } diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java index 88fb014690..fa01706c56 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java @@ -30,6 +30,7 @@ public class WindowShouldRemoveActionHandler extends TestBase { Button add = new Button("Add an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { add(); } @@ -38,6 +39,7 @@ public class WindowShouldRemoveActionHandler extends TestBase { Button addAnother = new Button("Add another action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addAnother(); } @@ -46,6 +48,7 @@ public class WindowShouldRemoveActionHandler extends TestBase { Button remove = new Button("Remove an action handler", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { remove(); } @@ -71,12 +74,14 @@ public class WindowShouldRemoveActionHandler extends TestBase { getMainWindow().getCaption() + " - Added handler"); Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Left", ShortcutAction.KeyCode.ARROW_LEFT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); @@ -90,12 +95,14 @@ public class WindowShouldRemoveActionHandler extends TestBase { public void addAnother() { Handler actionHandler = new Handler() { + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new ShortcutAction("Ctrl+Right", ShortcutAction.KeyCode.ARROW_RIGHT, new int[] { ModifierKey.CTRL }) }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification( "Handling action " + action.getCaption()); diff --git a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java b/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java index 3a36926b42..615f391613 100644 --- a/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java +++ b/tests/testbench/com/vaadin/tests/components/window/WindowStyleNames.java @@ -22,6 +22,7 @@ public class WindowStyleNames extends TestBase { setWindowStyle("old"); addComponent(new Button("Set style to 'new'", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { setWindowStyle("new"); } @@ -30,6 +31,7 @@ public class WindowStyleNames extends TestBase { addComponent(new Button("Set style to 'custom'", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { setWindowStyle("custom"); } @@ -38,6 +40,7 @@ public class WindowStyleNames extends TestBase { addComponent(new Button("Add 'foo' style", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addStyleName("foo"); } diff --git a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java index 77a3efa6ad..4f41410ba3 100644 --- a/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java +++ b/tests/testbench/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java @@ -89,6 +89,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final CheckBox cb = new CheckBox("Filter on value"); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { container.removeAllContainerFilters(); if (((CheckBox) event.getProperty()).getValue()) { @@ -108,6 +109,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final Button addItemButton = new Button("addItem()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { container.addItem(new TestBean("addItem() " + nextToAdd, "value " + nextToAdd)); @@ -120,6 +122,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final Button addItemAfterButton = new Button("addItemAfter()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object selection = table.getValue(); if (selection == null) { @@ -145,6 +148,7 @@ public class BeanItemContainerFilteringTest extends TestBase { final Button addItemAtButton = new Button("addItemAt()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int index = Integer.parseInt(position.getValue() .toString()); diff --git a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java index f60e0c74e7..eba8ded705 100644 --- a/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java +++ b/tests/testbench/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java @@ -94,6 +94,7 @@ public class HierarchicalWrapperOrdering extends TestBase { new ClickListener() { private static final long serialVersionUID = 1L; + @Override public void buttonClick(ClickEvent event) { // Get first item Object itemId = indexedContainer.getIdByIndex(0); diff --git a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java index 2ed5de3bfa..b30ef3e616 100644 --- a/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java +++ b/tests/testbench/com/vaadin/tests/containers/IndexedContainerFilteringTest.java @@ -56,6 +56,7 @@ public class IndexedContainerFilteringTest extends TestBase { final CheckBox cb = new CheckBox("Filter"); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { container.removeAllContainerFilters(); if (((CheckBox) event.getProperty()).getValue()) { @@ -75,6 +76,7 @@ public class IndexedContainerFilteringTest extends TestBase { final Button addItemButton = new Button("addItem()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Item item = container.addItem("addItem() " + nextToAdd); if (item != null) { @@ -90,6 +92,7 @@ public class IndexedContainerFilteringTest extends TestBase { final Button addItemAfterButton = new Button("addItemAfter()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Object selection = table.getValue(); if (selection == null) { @@ -117,6 +120,7 @@ public class IndexedContainerFilteringTest extends TestBase { final Button addItemAtButton = new Button("addItemAt()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int index = Integer.parseInt(position.getValue() .toString()); diff --git a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java index 0a1c592876..46c4e004c1 100644 --- a/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java +++ b/tests/testbench/com/vaadin/tests/containers/TestItemSorter.java @@ -27,6 +27,7 @@ public class TestItemSorter extends TestBase { populateContainer(container); container.setItemSorter(new DefaultItemSorter(new Comparator<Object>() { + @Override public int compare(Object o1, Object o2) { if (o1 instanceof CheckBox && o2 instanceof CheckBox) { Boolean b1 = (Boolean) ((CheckBox) o1).getValue(); diff --git a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java b/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java index 91403f54d6..0afaf2c15f 100644 --- a/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java +++ b/tests/testbench/com/vaadin/tests/containers/filesystemcontainer/FileSystemContainerInTreeTable.java @@ -51,6 +51,7 @@ public class FileSystemContainerInTreeTable extends TestBase { treeTable.setColumnWidth("Name", 400); treeTable.addListener(new ExpandListener() { + @Override public void nodeExpand(ExpandEvent event) { logExpandCollapse(event.getItemId(), "expanded"); @@ -58,6 +59,7 @@ public class FileSystemContainerInTreeTable extends TestBase { }); treeTable.addListener(new CollapseListener() { + @Override public void nodeCollapse(CollapseEvent event) { logExpandCollapse(event.getItemId(), "collapsed"); @@ -71,6 +73,7 @@ public class FileSystemContainerInTreeTable extends TestBase { buttonLayout.setSpacing(true); buttonLayout.addComponent(new Button("Create dir11", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new File(folder, "dir11").mkdir(); log.log("Row dir11 created"); @@ -78,6 +81,7 @@ public class FileSystemContainerInTreeTable extends TestBase { })); buttonLayout.addComponent(new Button("Delete dir11", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new File(folder, "dir11").delete(); log.log("Row dir11 deleted"); @@ -86,6 +90,7 @@ public class FileSystemContainerInTreeTable extends TestBase { // to clean up explicitly before ending an automated test buttonLayout.addComponent(new Button("Clean all files", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { folder.delete(); } diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java index 674f610ed7..f34c12607a 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/CheckboxUpdateProblem.java @@ -1,8 +1,6 @@ package com.vaadin.tests.containers.sqlcontainer; -import java.sql.Connection; import java.sql.SQLException; -import java.sql.Statement; import com.vaadin.Application; import com.vaadin.data.Container.ItemSetChangeEvent; @@ -10,11 +8,6 @@ import com.vaadin.data.Container.ItemSetChangeListener; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; -import com.vaadin.data.util.sqlcontainer.AllTests; -import com.vaadin.data.util.sqlcontainer.SQLContainer; -import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; -import com.vaadin.data.util.sqlcontainer.query.TableQuery; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Form; @@ -45,6 +38,7 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication databaseHelper.getTestContainer().addListener( new ItemSetChangeListener() { + @Override public void containerItemSetChange(ItemSetChangeEvent event) { Object selected = testList.getValue(); if (selected != null) { @@ -62,6 +56,7 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication getMainWindow().setContent(horizontalSplit); } + @Override public void valueChange(ValueChangeEvent event) { Property<?> property = event.getProperty(); @@ -89,6 +84,7 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication getFooter().setVisible(false); } + @Override public void buttonClick(ClickEvent event) { if (event.getSource() == save) { super.commit(); @@ -115,75 +111,4 @@ public class CheckboxUpdateProblem extends Application.LegacyApplication } - private class DatabaseHelper { - - private JDBCConnectionPool connectionPool = null; - private SQLContainer testContainer = null; - private static final String TABLENAME = "testtable"; - - public DatabaseHelper() { - initConnectionPool(); - initDatabase(); - initContainers(); - } - - private void initDatabase() { - try { - Connection conn = connectionPool.reserveConnection(); - Statement statement = conn.createStatement(); - try { - statement.execute("drop table " + TABLENAME); - } catch (SQLException e) { - // Will fail if table doesn't exist, which is OK. - conn.rollback(); - } - switch (AllTests.db) { - case MYSQL: - statement - .execute("create table " - + TABLENAME - + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))"); - break; - case POSTGRESQL: - statement - .execute("create table " - + TABLENAME - + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)"); - break; - } - statement.executeUpdate("insert into " + TABLENAME - + " values(default, 'Kalle', 'true')"); - statement.close(); - conn.commit(); - connectionPool.releaseConnection(conn); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - private void initContainers() { - try { - TableQuery q1 = new TableQuery(TABLENAME, connectionPool); - q1.setVersionColumn("id"); - testContainer = new SQLContainer(q1); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - private void initConnectionPool() { - try { - connectionPool = new SimpleJDBCConnectionPool( - AllTests.dbDriver, AllTests.dbURL, AllTests.dbUser, - AllTests.dbPwd, 2, 5); - } catch (SQLException e) { - e.printStackTrace(); - } - } - - public SQLContainer getTestContainer() { - return testContainer; - } - } - } diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java new file mode 100644 index 0000000000..b7d1b8c37e --- /dev/null +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/ComboBoxUpdateProblem.java @@ -0,0 +1,27 @@ +package com.vaadin.tests.containers.sqlcontainer; + +import com.vaadin.Application; +import com.vaadin.ui.AbstractSelect.Filtering; +import com.vaadin.ui.ComboBox; +import com.vaadin.ui.Root; + +/** + * See http://dev.vaadin.com/ticket/9155 . + */ +public class ComboBoxUpdateProblem extends Application.LegacyApplication { + private final DatabaseHelper databaseHelper = new DatabaseHelper(); + + @Override + public void init() { + setMainWindow(new Root.LegacyWindow("Test window")); + + ComboBox combo = new ComboBox("Names", + databaseHelper.getTestContainer()); + combo.setItemCaptionPropertyId("FIELD1"); + combo.setFilteringMode(Filtering.FILTERINGMODE_CONTAINS); + combo.setImmediate(true); + + getMainWindow().addComponent(combo); + } + +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java new file mode 100644 index 0000000000..b7b1e74eb0 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/DatabaseHelper.java @@ -0,0 +1,91 @@ +package com.vaadin.tests.containers.sqlcontainer; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; + +import com.vaadin.data.util.sqlcontainer.AllTests; +import com.vaadin.data.util.sqlcontainer.SQLContainer; +import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; +import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; +import com.vaadin.data.util.sqlcontainer.query.TableQuery; + +class DatabaseHelper { + + private JDBCConnectionPool connectionPool = null; + private SQLContainer testContainer = null; + private static final String TABLENAME = "testtable"; + + public DatabaseHelper() { + initConnectionPool(); + initDatabase(); + initContainers(); + } + + private void initDatabase() { + try { + Connection conn = connectionPool.reserveConnection(); + Statement statement = conn.createStatement(); + try { + statement.execute("drop table " + TABLENAME); + } catch (SQLException e) { + // Will fail if table doesn't exist, which is OK. + conn.rollback(); + } + switch (AllTests.db) { + case HSQLDB: + statement + .execute("create table " + + TABLENAME + + " (id integer GENERATED BY DEFAULT AS IDENTITY, field1 varchar(100), field2 boolean, primary key(id))"); + break; + case MYSQL: + statement + .execute("create table " + + TABLENAME + + " (id integer auto_increment not null, field1 varchar(100), field2 boolean, primary key(id))"); + break; + case POSTGRESQL: + statement + .execute("create table " + + TABLENAME + + " (\"id\" serial primary key, \"field1\" varchar(100), \"field2\" boolean)"); + break; + } + statement.executeUpdate("insert into " + TABLENAME + + " values(default, 'Kalle', 'true')"); + statement.executeUpdate("insert into " + TABLENAME + + " values(default, 'Ville', 'true')"); + statement.executeUpdate("insert into " + TABLENAME + + " values(default, 'Jussi', 'true')"); + statement.close(); + conn.commit(); + connectionPool.releaseConnection(conn); + } catch (SQLException e) { + e.printStackTrace(); + } + } + + private void initContainers() { + try { + TableQuery q1 = new TableQuery(TABLENAME, connectionPool); + q1.setVersionColumn("id"); + testContainer = new SQLContainer(q1); + } catch (SQLException e) { + e.printStackTrace(); + } + } + + private void initConnectionPool() { + try { + connectionPool = new SimpleJDBCConnectionPool(AllTests.dbDriver, + AllTests.dbURL, AllTests.dbUser, AllTests.dbPwd, 2, 5); + } catch (SQLException e) { + e.printStackTrace(); + } + } + + public SQLContainer getTestContainer() { + return testContainer; + } +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java index 2b76612c35..dc919fdb12 100644 --- a/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java +++ b/tests/testbench/com/vaadin/tests/containers/sqlcontainer/MassInsertMemoryLeakTestApp.java @@ -35,6 +35,7 @@ public class MassInsertMemoryLeakTestApp extends Application.LegacyApplication { setMainWindow(new LegacyWindow("SQLContainer Test", buildLayout())); process.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { MassInsert mi = new MassInsert(); mi.start(); diff --git a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java b/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java index 8b17cb3f48..59aa45dc36 100644 --- a/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java +++ b/tests/testbench/com/vaadin/tests/converter/ConverterThatEnforcesAFormat.java @@ -16,6 +16,7 @@ public class ConverterThatEnforcesAFormat extends TestBase { "This field should always be formatted with 3 digits"); tf.setConverter(new StringToDoubleConverterWithThreeFractionDigits()); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { log.log("Value changed to " + event.getProperty().getValue() diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java b/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java index 308f002e4f..5d57de388c 100644 --- a/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java +++ b/tests/testbench/com/vaadin/tests/dd/AcceptAnythingWindow.java @@ -7,7 +7,7 @@ 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.terminal.gwt.client.MouseEventDetails; +import com.vaadin.shared.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; @@ -28,10 +28,12 @@ public class AcceptAnythingWindow extends Window { final DragAndDropWrapper wrapper = new DragAndDropWrapper(layout); wrapper.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { WrapperTargetDetails ed = (WrapperTargetDetails) event .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java index 43bdce2ad4..99dd069142 100644 --- a/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java +++ b/tests/testbench/com/vaadin/tests/dd/AcceptFromComponent.java @@ -7,7 +7,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; -import com.vaadin.terminal.gwt.client.MouseEventDetails; +import com.vaadin.shared.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; @@ -37,6 +37,7 @@ public class AcceptFromComponent extends Window { final ServerSideCriterion serverSideCriterion = new ServerSideCriterion() { + @Override public boolean accept(DragAndDropEvent dragEvent) { Transferable transferable = dragEvent.getTransferable(); if (transferable instanceof TransferableImpl) { @@ -51,10 +52,12 @@ public class AcceptFromComponent extends Window { wrapper.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return serverSideCriterion; } + @Override public void drop(DragAndDropEvent event) { WrapperTargetDetails ed = (WrapperTargetDetails) event diff --git a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java index 93e99274bb..9ef1b4029b 100644 --- a/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java +++ b/tests/testbench/com/vaadin/tests/dd/ActiveDragSourceClassName.java @@ -23,6 +23,7 @@ public class ActiveDragSourceClassName extends TestBase { private static final String GREENBOXES = ".greenblock {float:left; width:60px;height:60px;background: green !important; padding:0; margin:2px;-webkit-transition: width 0.3s ease-in-out;}"; private static final String HIDEDRAGSOURCE = ".v-active-drag-source { overflow:hidden; width:0px !important;}"; + @Override protected void setup() { TestUtils.injectCSS(getMainWindow(), GREENBOXES + HIDEDRAGSOURCE); @@ -69,10 +70,12 @@ public class ActiveDragSourceClassName extends TestBase { private DropHandler dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java b/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java index 2b38a3438e..f6e196761e 100644 --- a/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java +++ b/tests/testbench/com/vaadin/tests/dd/CustomDDImplementation.java @@ -38,14 +38,17 @@ public class CustomDDImplementation extends CustomComponent { * */ class MyDropTarget extends AbstractComponent implements DropTarget { + @Override public DropHandler getDropHandler() { return new DropHandler() { + @Override public void drop(DragAndDropEvent event) { // Do something with data return; } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } @@ -53,6 +56,7 @@ public class CustomDDImplementation extends CustomComponent { }; } + @Override public TargetDetails translateDropTargetDetails( Map<String, Object> clientVariables) { // If component has some special drop details that it needs to diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest1.java b/tests/testbench/com/vaadin/tests/dd/DDTest1.java index 0d709844e9..2067d559d7 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest1.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest1.java @@ -10,8 +10,8 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; +import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractSelect.AcceptItem; import com.vaadin.ui.Component; @@ -62,6 +62,7 @@ public class DDTest1 extends TestBase { */ private static final long serialVersionUID = 1L; + @Override public boolean accept(DragAndDropEvent dragEvent) { Transferable transferable = dragEvent.getTransferable(); // System.out.println("Simulating 500ms processing..."); @@ -188,6 +189,7 @@ public class DDTest1 extends TestBase { } + @Override public void drop(DragAndDropEvent event) { TreeTargetDetails details = (TreeTargetDetails) event .getTargetDetails(); @@ -224,6 +226,7 @@ public class DDTest1 extends TestBase { return; } + @Override public AcceptCriterion getAcceptCriterion() { // TODO should actually check that source is same as target return AcceptItem.ALL; diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest2.java b/tests/testbench/com/vaadin/tests/dd/DDTest2.java index 0dda0d693c..272be53034 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest2.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest2.java @@ -88,6 +88,7 @@ public class DDTest2 extends TestBase { }; tree3.setDropHandler(new DropHandler() { + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); @@ -110,6 +111,7 @@ public class DDTest2 extends TestBase { } + @Override public AcceptCriterion getAcceptCriterion() { return crit; } @@ -136,6 +138,7 @@ public class DDTest2 extends TestBase { DropHandler dropHandler = new DropHandler() { + @Override public void drop(DragAndDropEvent event) { /* * We know transferrable is from table, so it is of type @@ -177,6 +180,7 @@ public class DDTest2 extends TestBase { } + @Override public AcceptCriterion getAcceptCriterion() { return and; } @@ -194,6 +198,7 @@ public class DDTest2 extends TestBase { */ dropHandler = new DropHandler() { + @Override public void drop(DragAndDropEvent event) { AbstractSelectTargetDetails details = (AbstractSelectTargetDetails) event .getTargetDetails(); @@ -233,6 +238,7 @@ public class DDTest2 extends TestBase { } } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptItem.ALL; } diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest4.java b/tests/testbench/com/vaadin/tests/dd/DDTest4.java index 654a30486a..c7f0c6960b 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest4.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest4.java @@ -9,7 +9,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.SourceIs; -import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Person; import com.vaadin.tests.util.PersonContainer; @@ -64,10 +64,12 @@ public class DDTest4 extends TestBase { // accept only drags from this table AcceptCriterion crit = new SourceIs(table); + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest5.java b/tests/testbench/com/vaadin/tests/dd/DDTest5.java index a5d97f4473..63d1e9e3c2 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest5.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest5.java @@ -86,10 +86,12 @@ public class DDTest5 extends TestBase { dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { /* diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest6.java b/tests/testbench/com/vaadin/tests/dd/DDTest6.java index c6c6689bcb..c6ac0b1859 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest6.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest6.java @@ -25,12 +25,12 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.Not; import com.vaadin.event.dd.acceptcriteria.SourceIsTarget; +import com.vaadin.shared.MouseEventDetails; import com.vaadin.terminal.Resource; import com.vaadin.terminal.StreamResource; import com.vaadin.terminal.StreamResource.StreamSource; import com.vaadin.terminal.StreamVariable; import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbsoluteLayout; @@ -97,10 +97,12 @@ public class DDTest6 extends TestBase { tree1.setDragMode(TreeDragMode.NODE); DropHandler dropHandler = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { File file = null; Folder folder = null; @@ -127,12 +129,14 @@ public class DDTest6 extends TestBase { private Action[] actions = new Action[] { new Action("Remove") }; + @Override public void handleAction(Action action, Object sender, Object target) { ContainerHierarchicalWrapper containerDataSource = (ContainerHierarchicalWrapper) tree1 .getContainerDataSource(); containerDataSource.removeItemRecursively(target); } + @Override public Action[] getActions(Object target, Object sender) { return actions; } @@ -140,6 +144,7 @@ public class DDTest6 extends TestBase { tree1.addActionHandler(actionHandler); tree1.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = event.getProperty().getValue(); if (value != null && !(value instanceof Folder)) { @@ -215,6 +220,7 @@ public class DDTest6 extends TestBase { public Resource getResource() { StreamSource streamSource = new StreamSource() { + @Override public InputStream getStream() { if (bas != null) { byte[] byteArray = bas.toByteArray(); @@ -355,6 +361,7 @@ public class DDTest6 extends TestBase { } + @Override @SuppressWarnings("static-access") public void drop(DragAndDropEvent dropEvent) { @@ -402,29 +409,36 @@ public class DDTest6 extends TestBase { StreamVariable streamVariable = new StreamVariable() { + @Override public OutputStream getOutputStream() { return bas; } + @Override public boolean listenProgress() { return false; } + @Override public void onProgress(StreamingProgressEvent event) { } + @Override public void streamingStarted( StreamingStartEvent event) { } + @Override public void streamingFinished( StreamingEndEvent event) { } + @Override public void streamingFailed( StreamingErrorEvent event) { } + @Override public boolean isInterrupted() { return false; } @@ -448,6 +462,7 @@ public class DDTest6 extends TestBase { } } + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } @@ -473,6 +488,7 @@ public class DDTest6 extends TestBase { l.addComponent(new Label(name)); l.addListener(new LayoutClickListener() { + @Override @SuppressWarnings("static-access") public void layoutClick(LayoutClickEvent event) { if (event.isDoubleClick()) { @@ -506,10 +522,12 @@ public class DDTest6 extends TestBase { setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new Not(SourceIsTarget.get()); } + @Override public void drop(DragAndDropEvent dropEvent) { File f = null; diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest7.java b/tests/testbench/com/vaadin/tests/dd/DDTest7.java index 26521f5a57..f9be935b23 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest7.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest7.java @@ -95,10 +95,12 @@ public class DDTest7 extends TestBase { } }; + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dropEvent .getTargetDetails(); diff --git a/tests/testbench/com/vaadin/tests/dd/DDTest8.java b/tests/testbench/com/vaadin/tests/dd/DDTest8.java index fed889b5c1..ee7d8d9dc5 100644 --- a/tests/testbench/com/vaadin/tests/dd/DDTest8.java +++ b/tests/testbench/com/vaadin/tests/dd/DDTest8.java @@ -10,7 +10,7 @@ import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.Or; -import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Tree; @@ -113,6 +113,7 @@ public class DDTest8 extends TestBase { } + @Override public void drop(DragAndDropEvent event) { TreeTargetDetails details = (TreeTargetDetails) event .getTargetDetails(); @@ -149,6 +150,7 @@ public class DDTest8 extends TestBase { return; } + @Override public AcceptCriterion getAcceptCriterion() { return new Or(new AbstractSelect.TargetItemIs(t, "Foo", "Bar"), new AbstractSelect.AcceptItem(t, "Foo"), diff --git a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java index 4b4ec75f0e..bea00ae0ad 100644 --- a/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java +++ b/tests/testbench/com/vaadin/tests/dd/DragAndDropFiles.java @@ -35,10 +35,12 @@ public class DragAndDropFiles extends TestBase { dragAndDropWrapper.setSizeUndefined(); dragAndDropWrapper.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { WrapperTransferable transferable = (WrapperTransferable) event .getTransferable(); @@ -59,19 +61,23 @@ public class DragAndDropFiles extends TestBase { StreamVariable streamVariable = new StreamVariable() { + @Override public OutputStream getOutputStream() { return new NullOutputStream(); } + @Override public boolean listenProgress() { return true; } + @Override public void onProgress(StreamingProgressEvent event) { System.err.println("Progress" + event.getBytesReceived()); } + @Override public void streamingStarted( StreamingStartEvent event) { getMainWindow().showNotification( @@ -79,6 +85,7 @@ public class DragAndDropFiles extends TestBase { + event.getFileName()); } + @Override public void streamingFinished( StreamingEndEvent event) { getMainWindow().showNotification( @@ -86,6 +93,7 @@ public class DragAndDropFiles extends TestBase { + event.getFileName()); } + @Override public void streamingFailed( StreamingErrorEvent event) { getMainWindow().showNotification( @@ -93,6 +101,7 @@ public class DragAndDropFiles extends TestBase { + event.getFileName()); } + @Override public boolean isInterrupted() { return false; } diff --git a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java index 1b7b7b997b..a94b676f2c 100644 --- a/tests/testbench/com/vaadin/tests/dd/DragDropPane.java +++ b/tests/testbench/com/vaadin/tests/dd/DragDropPane.java @@ -9,8 +9,8 @@ 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.shared.MouseEventDetails; import com.vaadin.terminal.StreamVariable; -import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; @@ -51,6 +51,7 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { this.crit = crit; } + @Override public void drop(DragAndDropEvent event) { WrapperTargetDetails ed = (WrapperTargetDetails) event @@ -135,28 +136,35 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { html5File.setStreamVariable(new StreamVariable() { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + @Override public OutputStream getOutputStream() { return byteArrayOutputStream; } + @Override public boolean listenProgress() { return false; } + @Override public void onProgress(StreamingProgressEvent event) { } + @Override public void streamingStarted(StreamingStartEvent event) { } + @Override public void streamingFinished(StreamingEndEvent event) { l.setValue((new String(byteArrayOutputStream .toByteArray()).substring(0, 80) + "...")); } + @Override public void streamingFailed(StreamingErrorEvent event) { } + @Override public boolean isInterrupted() { return false; } @@ -172,6 +180,7 @@ public class DragDropPane extends DragAndDropWrapper implements DropHandler { return; } + @Override public AcceptCriterion getAcceptCriterion() { return crit != null ? crit : AcceptAll.get(); } diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java index aa51dd539d..fe33bce76b 100644 --- a/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java +++ b/tests/testbench/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java @@ -54,10 +54,12 @@ public class HorizontalLayoutSortableWithWrappers extends Window { AcceptCriterion crit = new And(new TargetDetailIs("horizontalLocation", "LEFT"), new Not(SourceIsTarget.get())); + @Override public AcceptCriterion getAcceptCriterion() { return crit; } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java b/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java index a77faffd2e..4e9e89add5 100644 --- a/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java +++ b/tests/testbench/com/vaadin/tests/dd/HorizontalSortableCssLayoutWithWrappers.java @@ -48,10 +48,12 @@ public class HorizontalSortableCssLayoutWithWrappers extends Window { private DropHandler dh = new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent dropEvent) { Transferable transferable = dropEvent.getTransferable(); if (transferable instanceof TransferableImpl) { diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java index 2b01bad2cf..8a1921cd50 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java @@ -3,17 +3,18 @@ */ package com.vaadin.tests.dd; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource; @Connect(MyDragSource.class) public class MyDragSourceConnector extends AbstractComponentConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java index 5671efa236..6f7dc820ee 100644 --- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java +++ b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java @@ -3,17 +3,18 @@ */ package com.vaadin.tests.dd; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget; @Connect(MyDropTarget.class) public class MyDropTargetConnector extends AbstractComponentConnector implements Paintable { + @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { if (!isRealUpdate(uidl)) { return; diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java index 74774f09ab..abe8553267 100644 --- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java +++ b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSource.java @@ -26,10 +26,12 @@ public class NotPaintedAcceptSource extends TestBase { source2.setDragMode(TableDragMode.ROW); target.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new SourceIs(source1, source2); } + @Override public void drop(DragAndDropEvent event) { TableTransferable transferable = (TableTransferable) event .getTransferable(); @@ -55,6 +57,7 @@ public class NotPaintedAcceptSource extends TestBase { addComponent(horizontalLayout); addComponent(new Button("Swap sources", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (source1.getParent() != null) { horizontalLayout.replaceComponent(source1, source2); diff --git a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java index ac92193764..e19bbaf2c5 100644 --- a/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java +++ b/tests/testbench/com/vaadin/tests/dd/NotPaintedAcceptSourceInTabSheet.java @@ -24,10 +24,12 @@ public class NotPaintedAcceptSourceInTabSheet extends TestBase { source2.setDragMode(TableDragMode.ROW); target.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new SourceIs(source1, source2); } + @Override public void drop(DragAndDropEvent event) { TableTransferable transferable = (TableTransferable) event .getTransferable(); diff --git a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java b/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java index 093e12f84a..951b9a4a57 100644 --- a/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java +++ b/tests/testbench/com/vaadin/tests/dd/ScrolledDropTarget.java @@ -3,7 +3,7 @@ package com.vaadin.tests.dd; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; -import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; @@ -28,10 +28,12 @@ public class ScrolledDropTarget extends TestBase { table.setDragMode(TableDragMode.ROW); table.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return VerticalLocationIs.MIDDLE; } + @Override public void drop(DragAndDropEvent event) { AbstractSelectTargetDetails targetDetails = (AbstractSelectTargetDetails) event .getTargetDetails(); @@ -44,6 +46,7 @@ public class ScrolledDropTarget extends TestBase { addComponent(table); addComponent(new Button("Scroll body", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().executeJavaScript( "document.body.style.overflow = 'auto';" diff --git a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java index 2cdef65d31..1a01564220 100644 --- a/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java +++ b/tests/testbench/com/vaadin/tests/dd/StartHtml5Drag.java @@ -27,10 +27,12 @@ public class StartHtml5Drag extends TestBase { "over here")); dropTarget.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return AcceptAll.get(); } + @Override public void drop(DragAndDropEvent event) { getWindows() .iterator() diff --git a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java index 4ef7023aa6..27ac8b6586 100644 --- a/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java +++ b/tests/testbench/com/vaadin/tests/dd/TreeDragStart.java @@ -17,7 +17,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.Not; import com.vaadin.event.dd.acceptcriteria.Or; -import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.AbstractSelect.VerticalLocationIs; @@ -38,6 +38,7 @@ public class TreeDragStart extends TestBase { checkBox.setImmediate(true); checkBox.setValue(true); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tree.setEnabled(!tree.isEnabled()); } @@ -47,6 +48,7 @@ public class TreeDragStart extends TestBase { checkBox.setImmediate(true); checkBox.setValue(true); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) ((CheckBox) event.getProperty()).getValue()) { tree.setDragMode(TreeDragMode.NODE); @@ -75,6 +77,7 @@ public class TreeDragStart extends TestBase { // Allow the tree to receive drag drops and handle them tree.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { // Accept drops in the middle of container items // and below and above all items. @@ -82,6 +85,7 @@ public class TreeDragStart extends TestBase { VerticalLocationIs.MIDDLE)); } + @Override public void drop(DragAndDropEvent event) { // Wrapper for the object that is dragged DataBoundTransferable t = (DataBoundTransferable) event @@ -152,10 +156,12 @@ public class TreeDragStart extends TestBase { // Allow the table to receive drops and handle them table.setDropHandler(new DropHandler() { + @Override public AcceptCriterion getAcceptCriterion() { return new Not(VerticalLocationIs.MIDDLE); } + @Override public void drop(DragAndDropEvent event) { // Wrapper for the object that is dragged DataBoundTransferable t = (DataBoundTransferable) event diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java index 7e91d2b9aa..e6c7078e8e 100644 --- a/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java +++ b/tests/testbench/com/vaadin/tests/dd/VMyDragSource.java @@ -43,6 +43,7 @@ public class VMyDragSource extends Composite implements MouseDownHandler, * mouse is moved 5 pixels with left mouse key down. */ + @Override public void onMouseDown(MouseDownEvent event) { if (event.getNativeButton() == NativeEvent.BUTTON_LEFT) { mouseDown = true; @@ -50,6 +51,7 @@ public class VMyDragSource extends Composite implements MouseDownHandler, } } + @Override public void onMouseMove(MouseMoveEvent event) { if (mouseDown) { int deltaX = Math.abs(mDownEvent.getClientX() - event.getClientX()); @@ -74,6 +76,7 @@ public class VMyDragSource extends Composite implements MouseDownHandler, } + @Override public void onMouseOut(MouseOutEvent event) { mouseDown = false; mDownEvent = null; diff --git a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java index 582c951251..627f0554f6 100644 --- a/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java +++ b/tests/testbench/com/vaadin/tests/dd/VMyDropTarget.java @@ -12,33 +12,40 @@ public class VMyDropTarget extends Composite implements VHasDropHandler, ApplicationConnection client; + @Override public void dragEnter(VDragEvent drag) { } + @Override public void dragLeave(VDragEvent drag) { // TODO Auto-generated method stub } + @Override public void dragOver(VDragEvent currentDrag) { // TODO Auto-generated method stub } + @Override public boolean drop(VDragEvent drag) { // TODO Auto-generated method stub // return true to tell DDManager do server visit return false; } + @Override public VDropHandler getDropHandler() { // Drophandler implemented by widget itself return this; } + @Override public ComponentConnector getConnector() { // TODO Auto-generated method stub return null; } + @Override public ApplicationConnection getApplicationConnection() { return client; } diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java b/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java new file mode 100644 index 0000000000..551d24735a --- /dev/null +++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtension.java @@ -0,0 +1,15 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.extensions; + +import com.vaadin.terminal.AbstractClientConnector; +import com.vaadin.terminal.AbstractExtension; + +public class BasicExtension extends AbstractExtension { + @Override + public void extend(AbstractClientConnector target) { + super.extend(target); + } +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.html b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.html new file mode 100644 index 0000000000..6e8a0bf97f --- /dev/null +++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.html @@ -0,0 +1,32 @@ +<?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="http://192.168.2.41:8888/" /> +<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/com.vaadin.tests.extensions.BasicExtensionTest?restartApplication</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>//div[1]</td> + <td>BasicExtensionTestConnector extending LabelConnector</td> +</tr> +<tr> + <td>assertText</td> + <td>//div[2]</td> + <td>BasicExtensionTestConnector extending RootConnector</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java new file mode 100644 index 0000000000..02bdadca34 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/extensions/BasicExtensionTest.java @@ -0,0 +1,34 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.extensions; + +import com.vaadin.annotations.Widgetset; +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.tests.components.AbstractTestRoot; +import com.vaadin.ui.Label; + +@Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") +public class BasicExtensionTest extends AbstractTestRoot { + + @Override + protected void setup(WrappedRequest request) { + Label label = new Label(); + addComponent(label); + + new BasicExtension().extend(this); + new BasicExtension().extend(label); + } + + @Override + protected String getTestDescription() { + return "Simple test for extending components"; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(6690); + } + +} diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java new file mode 100644 index 0000000000..cb26cd7a83 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtension.java @@ -0,0 +1,40 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tests.extensions; + +import com.vaadin.terminal.AbstractExtension; +import com.vaadin.tests.widgetset.client.helloworldfeature.GreetAgainRpc; +import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldRpc; +import com.vaadin.tests.widgetset.client.helloworldfeature.HelloWorldState; +import com.vaadin.ui.Notification; + +public class HelloWorldExtension extends AbstractExtension { + + public HelloWorldExtension() { + registerRpc(new HelloWorldRpc() { + @Override + public void onMessageSent(String message) { + Notification.show(message); + } + }); + } + + @Override + public HelloWorldState getState() { + return (HelloWorldState) super.getState(); + } + + public void setGreeting(String greeting) { + getState().setGreeting(greeting); + requestRepaint(); + } + + public String getGreeting() { + return getState().getGreeting(); + } + + public void greetAgain() { + getRpcProxy(GreetAgainRpc.class).greetAgain(); + } +} diff --git a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java index b56e05b2a0..001e913734 100644 --- a/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/HelloWorldExtensionTest.java @@ -3,12 +3,13 @@ */ package com.vaadin.tests.extensions; +import com.vaadin.annotations.Widgetset; import com.vaadin.terminal.WrappedRequest; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.HelloWorldExtension; +@Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet") public class HelloWorldExtensionTest extends AbstractTestRoot { @Override @@ -18,6 +19,7 @@ public class HelloWorldExtensionTest extends AbstractTestRoot { addExtension(extension); addComponent(new Button("Greet again", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { extension.greetAgain(); } diff --git a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java index 65f0735ab5..a16f131475 100644 --- a/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/JavascriptManagerTest.java @@ -22,6 +22,7 @@ public class JavascriptManagerTest extends AbstractTestRoot { addComponent(log); final JavaScript js = JavaScript.getCurrent(); js.addCallback("testing.doTest", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { log.log("Got " + arguments.length() + " arguments"); log.log("Argument 1 as a number: " + arguments.getInt(0)); diff --git a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java index bbfe3f0f46..cb05bde493 100644 --- a/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java +++ b/tests/testbench/com/vaadin/tests/extensions/SimpleJavaScriptExtensionTest.java @@ -4,21 +4,21 @@ package com.vaadin.tests.extensions; -import com.vaadin.annotations.LoadScripts; +import com.vaadin.annotations.JavaScript; +import com.vaadin.annotations.StyleSheet; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; +import com.vaadin.shared.JavaScriptExtensionState; +import com.vaadin.shared.communication.ClientRpc; +import com.vaadin.shared.communication.ServerRpc; import com.vaadin.terminal.AbstractJavaScriptExtension; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.JavaScriptExtensionState; -import com.vaadin.terminal.gwt.client.communication.ClientRpc; -import com.vaadin.terminal.gwt.client.communication.ServerRpc; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.JavaScriptCallback; import com.vaadin.ui.Notification; -@LoadScripts({ "/statictestfiles/jsextension.js" }) public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { public static class SimpleJavaScriptExtensionState extends @@ -44,16 +44,20 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { public void greet(String message); } + @JavaScript("/statictestfiles/jsextension.js") + @StyleSheet("/VAADIN/external1.css") public static class SimpleJavascriptExtension extends AbstractJavaScriptExtension { public SimpleJavascriptExtension() { registerRpc(new SimpleJavaScriptExtensionServerRpc() { + @Override public void greet(String message) { Notification.show(getState().getPrefix() + message); } }); registerCallback("greetToServer", new JavaScriptCallback() { + @Override public void call(JSONArray arguments) throws JSONException { Notification.show(getState().getPrefix() + arguments.getString(0)); @@ -88,12 +92,14 @@ public class SimpleJavaScriptExtensionTest extends AbstractTestRoot { addExtension(simpleJavascriptExtension); addComponent(new Button("Send rpc greeting", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { simpleJavascriptExtension.greetRpc("Rpc greeting"); } })); addComponent(new Button("Send callback greeting", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { simpleJavascriptExtension .greetCallback("Callback greeting"); diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java b/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java index b73a29efea..894944d186 100644 --- a/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java +++ b/tests/testbench/com/vaadin/tests/fieldgroup/AbstractBeanFieldGroupTest.java @@ -27,6 +27,7 @@ public abstract class AbstractBeanFieldGroupTest extends TestBase { if (discardButton == null) { discardButton = new Button("Discard", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getFieldBinder().discard(); log.log("Discarded changes"); @@ -42,6 +43,7 @@ public abstract class AbstractBeanFieldGroupTest extends TestBase { showBeanButton = new Button("Show bean values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log(getFieldBinder().getItemDataSource() .getBean().toString()); @@ -57,6 +59,7 @@ public abstract class AbstractBeanFieldGroupTest extends TestBase { commitButton = new Button("Commit"); commitButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Commit succesful"; try { diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java b/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java index c86cb6f5e8..b399857b3b 100644 --- a/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java +++ b/tests/testbench/com/vaadin/tests/fieldgroup/BasicPersonForm.java @@ -84,6 +84,7 @@ public class BasicPersonForm extends TestBase { final FieldGroup fieldGroup = new BeanFieldGroup<Person>(Person.class); fieldGroup.addCommitHandler(new CommitHandler() { + @Override public void preCommit(CommitEvent commitEvent) throws CommitException { if (configuration.preCommitFails) { @@ -95,6 +96,7 @@ public class BasicPersonForm extends TestBase { } + @Override public void postCommit(CommitEvent commitEvent) throws CommitException { if (configuration.postCommitFails) { @@ -118,6 +120,7 @@ public class BasicPersonForm extends TestBase { Button commitButton = new Button("Commit", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Commit succesful"; try { @@ -133,6 +136,7 @@ public class BasicPersonForm extends TestBase { Button discardButton = new Button("Discard", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { fieldGroup.discard(); log.log("Discarded changes"); @@ -142,6 +146,7 @@ public class BasicPersonForm extends TestBase { Button showBean = new Button("Show bean values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log(getPerson(fieldGroup).toString()); diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java b/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java index 6c6cd8024b..4f83f5d0fd 100644 --- a/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java +++ b/tests/testbench/com/vaadin/tests/fieldgroup/FieldBinderWithBeanValidation.java @@ -45,6 +45,7 @@ public class FieldBinderWithBeanValidation extends TestBase { Button commitButton = new Button("Commit", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Commit succesful"; try { @@ -60,6 +61,7 @@ public class FieldBinderWithBeanValidation extends TestBase { Button discardButton = new Button("Discard", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { fieldGroup.discard(); log.log("Discarded changes"); @@ -69,6 +71,7 @@ public class FieldBinderWithBeanValidation extends TestBase { Button showBean = new Button("Show bean values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { log.log(getPerson(fieldGroup).toString()); diff --git a/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html b/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html index 078aede82f..b7c40b4d9e 100644 --- a/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html +++ b/tests/testbench/com/vaadin/tests/fieldgroup/IntegerRangeValidator.html @@ -47,6 +47,12 @@ <td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::/VVerticalLayout[0]/VVerticalLayout[0]/domChild[5]/domChild[0]/domChild[1]</td> <td>v-errorindicator</td> </tr> +<!--Hide tooltip--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::/VVerticalLayout[0]/VVerticalLayout[0]</td> + <td></td> +</tr> <!--10 -> age--> <tr> <td>enterCharacter</td> diff --git a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java index 1b6d384e70..f1345bca13 100644 --- a/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java +++ b/tests/testbench/com/vaadin/tests/integration/EmbedSizeTest.java @@ -22,6 +22,7 @@ public class EmbedSizeTest extends TestBase { CheckBox lazyCheckBox = new CheckBox("Lazy resize"); lazyCheckBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { CheckBox cb = (CheckBox) event.getProperty(); Boolean resizeLazy = cb.getValue(); @@ -35,6 +36,7 @@ public class EmbedSizeTest extends TestBase { addComponent(log); mainWindow.addListener(new Page.BrowserWindowResizeListener() { + @Override public void browserWindowResized(BrowserWindowResizeEvent event) { log.log("Resize event: " + event.getWidth() + " x " + event.getHeight()); diff --git a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java index b2001bdd7e..c464409153 100644 --- a/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/IntegrationTestApplication.java @@ -37,6 +37,7 @@ public class IntegrationTestApplication extends Application.LegacyApplication { final Label selectedLabel = new Label(); table.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { selectedLabel.setValue(table.getValue()); } diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java index b4de4fd3da..3374342947 100644 --- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletRoot.java +++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java @@ -18,9 +18,10 @@ import javax.portlet.ResourceRequest; import javax.portlet.ResourceResponse; import javax.portlet.WindowState; +import com.vaadin.Application; +import com.vaadin.annotations.StyleSheet; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.terminal.gwt.server.PortletApplicationContext2; import com.vaadin.terminal.gwt.server.PortletApplicationContext2.PortletListener; import com.vaadin.ui.Embedded; @@ -28,16 +29,22 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.Notification; import com.vaadin.ui.Root; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.TextField; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.Receiver; -import com.vaadin.ui.VerticalLayout; /** * Adapted from old PortletDemo to support integration testing. */ -public class JSR286PortletRoot extends Root { +public class JSR286PortletApplication extends Application.LegacyApplication { + @StyleSheet("PortletConnectorResource.css") + public final class LegacyWindowWithStylesheet extends LegacyWindow { + + } + + LegacyWindow main = new LegacyWindowWithStylesheet(); TextField tf = new TextField("Some value"); Label userInfo = new Label(); Link portletEdit = new Link(); @@ -45,19 +52,17 @@ public class JSR286PortletRoot extends Root { Link someAction = null; @Override - protected void init(WrappedRequest request) { - VerticalLayout main = new VerticalLayout(); - tf.setDebugId("tf"); - userInfo.setDebugId("userInfo"); - portletEdit.setDebugId("portletEdit"); - portletMax.setDebugId("portletMax"); + public void init() { + setMainWindow(main); + Embedded appResourceTest = new Embedded( "Test of ApplicationResources with full path", - new FlagSeResource(getApplication())); + new FlagSeResource(this)); main.addComponent(appResourceTest); Embedded specialNameResourceTest = new Embedded( "Test ApplicationResources with special names", - new SpecialNameResource(getApplication())); + new SpecialNameResource(this)); + specialNameResourceTest.addStyleName("hugeBorder"); main.addComponent(specialNameResourceTest); userInfo.setCaption("User info"); @@ -75,18 +80,18 @@ public class JSR286PortletRoot extends Root { Upload upload = new Upload("Upload a file", new Receiver() { + @Override public OutputStream receiveUpload(String filename, String mimeType) { return new ByteArrayOutputStream(); } }); main.addComponent(upload); - if (getApplication().getContext() instanceof PortletApplicationContext2) { - PortletApplicationContext2 ctx = (PortletApplicationContext2) getApplication() - .getContext(); - ctx.addPortletListener(getApplication(), new DemoPortletListener()); + if (getContext() instanceof PortletApplicationContext2) { + PortletApplicationContext2 ctx = (PortletApplicationContext2) getContext(); + ctx.addPortletListener(this, new DemoPortletListener()); } else { - Notification.show("Not inited via Portal!", + getMainWindow().showNotification("Not inited via Portal!", Notification.TYPE_ERROR_MESSAGE); } @@ -94,11 +99,13 @@ public class JSR286PortletRoot extends Root { private class DemoPortletListener implements PortletListener { + @Override public void handleActionRequest(ActionRequest request, ActionResponse response, Root window) { - getContent().addComponent(new Label("Action received")); + main.addComponent(new Label("Action received")); } + @Override public void handleRenderRequest(RenderRequest request, RenderResponse response, Root window) { // Portlet up-and-running, enable stuff @@ -109,10 +116,11 @@ public class JSR286PortletRoot extends Root { tf.setEnabled((request.getPortletMode() == PortletMode.EDIT)); // Show notification about current mode and state - new Notification("Portlet status", "Mode: " - + request.getPortletMode() + " State: " - + request.getWindowState(), - Notification.TYPE_WARNING_MESSAGE).show(getPage()); + getMainWindow().showNotification( + "Portlet status", + "Mode: " + request.getPortletMode() + " State: " + + request.getWindowState(), + Notification.TYPE_WARNING_MESSAGE); // Display current user info Map<?, ?> uinfo = (Map<?, ?>) request @@ -162,9 +170,7 @@ public class JSR286PortletRoot extends Root { try { someAction = new Link("An action", new ExternalResource( url.toString())); - someAction.setDebugId("someAction"); - - addComponent(someAction); + main.addComponent(someAction); } catch (Exception e) { // Oops System.err.println("Could not create someAction: " + e); @@ -173,11 +179,13 @@ public class JSR286PortletRoot extends Root { } } + @Override public void handleEventRequest(EventRequest request, EventResponse response, Root window) { // events not used by this test } + @Override public void handleResourceRequest(ResourceRequest request, ResourceResponse response, Root window) { // nothing special to do here diff --git a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java index 9397206f1e..1ea800821b 100644 --- a/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java +++ b/tests/testbench/com/vaadin/tests/integration/LiferayThemeDemo.java @@ -8,11 +8,11 @@ import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.event.Action; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.Page; import com.vaadin.terminal.Resource; import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Accordion; @@ -71,10 +71,12 @@ public class LiferayThemeDemo extends Application.LegacyApplication { private Action.Handler handler = new Action.Handler() { + @Override public void handleAction(Action action, Object sender, Object target) { // NOP } + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { new Action("Open"), @@ -318,6 +320,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { closable.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Iterator<Component> it = ts.getComponentIterator(); for (; it.hasNext();) { @@ -415,6 +418,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { ContentMode.XHTML)); tabs.addListener(new TabSheet.SelectedTabChangeListener() { + @Override public void selectedTabChange(SelectedTabChangeEvent event) { if (event.getTabSheet().getSelectedTab() == l) { getMainWindow().addWindow(w); @@ -472,6 +476,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { lockCheckBox.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { sp.setLocked((Boolean) event.getProperty().getValue()); sp2.setLocked((Boolean) event.getProperty().getValue()); @@ -595,18 +600,22 @@ public class LiferayThemeDemo extends Application.LegacyApplication { l.addComponent(new Label("Humanized", ContentMode.XHTML)); Button show = new Button("Humanized Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { - new Notification(title.getValue(), message.getValue()) - .show(Page.getCurrent()); + Notification notification = new Notification( + title.getValue(), message.getValue()); + notification.setHtmlContentAllowed(true); + notification.show(Page.getCurrent()); } }); l.addComponent(show); l.addComponent(new Label("Warning", ContentMode.XHTML)); show = new Button("Warning Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new Notification(title.getValue(), message.getValue(), - Notification.TYPE_WARNING_MESSAGE).show(Page + Notification.TYPE_WARNING_MESSAGE, true).show(Page .getCurrent()); } @@ -615,9 +624,11 @@ public class LiferayThemeDemo extends Application.LegacyApplication { l.addComponent(new Label("Error", ContentMode.XHTML)); show = new Button("Error Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new Notification(title.getValue(), message.getValue(), - Notification.TYPE_ERROR_MESSAGE).show(Page.getCurrent()); + Notification.TYPE_ERROR_MESSAGE, true).show(Page + .getCurrent()); } }); @@ -625,9 +636,10 @@ public class LiferayThemeDemo extends Application.LegacyApplication { l.addComponent(new Label("Tray", ContentMode.XHTML)); show = new Button("Tray Notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { new Notification(title.getValue(), message.getValue(), - Notification.TYPE_TRAY_NOTIFICATION).show(Page + Notification.TYPE_TRAY_NOTIFICATION, true).show(Page .getCurrent()); } @@ -691,6 +703,7 @@ public class LiferayThemeDemo extends Application.LegacyApplication { final MenuBar.MenuItem find = edit.addItem("Find/Replace", null); find.addItem("Google Search", new Command() { + @Override public void menuSelected(MenuItem selectedItem) { getMainWindow().open( new ExternalResource("http://www.google.com")); diff --git a/tests/testbench/com/vaadin/tests/integration/PortletConnectorResource.css b/tests/testbench/com/vaadin/tests/integration/PortletConnectorResource.css new file mode 100644 index 0000000000..7338e4708a --- /dev/null +++ b/tests/testbench/com/vaadin/tests/integration/PortletConnectorResource.css @@ -0,0 +1,3 @@ +.hugeBorder { + border: 10px solid green; +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java b/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java index 6193fd238e..b2cadebd02 100644 --- a/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java +++ b/tests/testbench/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java @@ -31,6 +31,7 @@ public class AbsoluteLayoutAddRemove extends TestBase { final Button b = new Button("Add", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (l.getParent() == null) { al.addComponent(l); diff --git a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java index 4388639893..77b8e249ba 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java +++ b/tests/testbench/com/vaadin/tests/layouts/CaptionsInLayouts.java @@ -61,6 +61,7 @@ public class CaptionsInLayouts extends TestBase { Button b = new Button("Add caption text"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { prependCaptions("a"); } @@ -81,6 +82,7 @@ public class CaptionsInLayouts extends TestBase { requiredToggle.setCaption("Required"); requiredToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setRequired((Boolean) event.getProperty().getValue()); } @@ -94,6 +96,7 @@ public class CaptionsInLayouts extends TestBase { iconToggle.setCaption("Icons"); iconToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setIcon((Boolean) event.getProperty().getValue()); } @@ -125,6 +128,7 @@ public class CaptionsInLayouts extends TestBase { errorToggle.setCaption("Error"); errorToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { setError((Boolean) event.getProperty().getValue()); } @@ -250,6 +254,7 @@ public class CaptionsInLayouts extends TestBase { layoutSelect.setImmediate(true); layoutSelect.addListener(new ValueChangeListener() { + @Override @SuppressWarnings("unchecked") public void valueChange(ValueChangeEvent event) { Item i = layoutSelect.getItem(event.getProperty().getValue()); diff --git a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java index f1e05b6fee..51f9e2d88e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java +++ b/tests/testbench/com/vaadin/tests/layouts/ComplexGLColumnExpansionWithColSpan.java @@ -45,6 +45,7 @@ public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase { b1.setWidth(270, Sizeable.UNITS_PIXELS); b2.setWidth(270, Sizeable.UNITS_PIXELS); b1.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { cols++; gl.setColumns(cols); @@ -70,6 +71,7 @@ public class ComplexGLColumnExpansionWithColSpan extends AbstractTestCase { Button restart = new Button("restart"); mainLayout.addComponent(restart); restart.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { mainLayout.getRoot().getApplication().close(); } diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java index 0e2d570101..792bcb1aab 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutCustomCss.java @@ -46,6 +46,7 @@ public class CssLayoutCustomCss extends TestBase implements ClickListener { cb.setImmediate(true); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { layout.setMargin(cb.getValue()); } @@ -73,6 +74,7 @@ public class CssLayoutCustomCss extends TestBase implements ClickListener { return null; } + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); if (b.getCaption().contains("not ")) { diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java index ef07b2c5f5..093dc782fb 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponent.java @@ -16,6 +16,7 @@ public class CssLayoutRemoveComponent extends TestBase { final TextField tf = new TextField("Caption1"); Button b = new Button("Remove field ", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.removeComponent(tf); } diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java index 4f081af347..df4fc8615d 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java @@ -15,6 +15,7 @@ public class CssLayoutRemoveComponentWithCaption extends TestBase { final TextField tf = new TextField("Caption"); Button b = new Button("Remove field and add new", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.removeComponent(tf); addComponent(new TextField("new field")); diff --git a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java b/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java index 0be605c795..ed3c5e66d3 100644 --- a/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java +++ b/tests/testbench/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java @@ -35,6 +35,7 @@ public class CssLayoutSizeChangePropagation extends TestBase { button.addListener(new ClickListener() { boolean bool = true; + @Override public void buttonClick(ClickEvent event) { sp.setExpandRatio(cssLayout, bool ? 1 : 0); bool = !bool; diff --git a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java b/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java index 47cb095efa..e119b91b82 100644 --- a/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java +++ b/tests/testbench/com/vaadin/tests/layouts/DeepComponentTrees.java @@ -44,6 +44,7 @@ public class DeepComponentTrees extends TestBase { final Button b = new Button("Go try your luck with " + i + " layouts!"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { FF2KILLER(i++); b.setCaption("Go try your luck with " + i + " layouts!"); @@ -60,6 +61,7 @@ public class DeepComponentTrees extends TestBase { s.addItem(GridLayout.class); s.addListener(new ComboBox.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Object value = s.getValue(); if (!value.equals("-- Choose value --")) { diff --git a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java index 7fc33edfc7..f596fdb77e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java +++ b/tests/testbench/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java @@ -27,6 +27,7 @@ public class FormLayoutWithInvisibleComponent extends TestBase { CheckBox control = new CheckBox("Messages On/Off"); control.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { messages.setVisible((Boolean) event.getProperty().getValue()); messages.setRequired(true); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java index 9ad9adb43a..8713208dc6 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutCaptions.java @@ -29,6 +29,7 @@ public class GridLayoutCaptions extends TestBase { private FormFieldFactory fff = new FormFieldFactory() { + @Override public Field<?> createField(Item item, Object propertyId, Component uiContext) { @@ -195,6 +196,7 @@ public class GridLayoutCaptions extends TestBase { Button b = new Button("Give me an error!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { aFormWithGl.createErrors(); @@ -205,6 +207,7 @@ public class GridLayoutCaptions extends TestBase { Button b2 = new Button("Get rid of an error!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { aFormWithGl.clearErrors(); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 314a8d7b03..84f27e5f03 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -59,6 +59,7 @@ public class GridLayoutExpandRatioModification extends TestBase implements vl2.setSizeFull(); } + @Override public void buttonClick(ClickEvent event) { if (isVisible) { mainLayout.setRowExpandRatio(2, 0); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java index 1442dc3421..efd1277653 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutMoveComponent.java @@ -29,6 +29,7 @@ public class GridLayoutMoveComponent extends TestBase { addComponent(new Button("Shift label right", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { // Moving component from 0,0 -> 1,0 grid.removeComponent(l); @@ -38,6 +39,7 @@ public class GridLayoutMoveComponent extends TestBase { addComponent(new Button("Shift button right", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { grid.removeComponent(b); grid.addComponent(b, 1, 1); @@ -46,6 +48,7 @@ public class GridLayoutMoveComponent extends TestBase { addComponent(new Button("Shift text field right", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { grid.removeComponent(tf); grid.addComponent(tf, 1, 2); diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java index 6424177fe1..3531a4e13c 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutNPE.java @@ -31,6 +31,7 @@ public class GridLayoutNPE extends TestBase { b.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { gl.removeComponent(toRemove); @@ -50,6 +51,7 @@ public class GridLayoutNPE extends TestBase { b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toEdit.setValue("Second (edited)"); } diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java index 8689503332..5d45f72142 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java @@ -26,6 +26,7 @@ public class GridLayoutRemoveFinalRow extends TestBase { Button removeRowBtn = new Button("Remove row", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { layout.removeRow(0); } diff --git a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java index 78984d33a2..c0e6b27c7d 100644 --- a/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java +++ b/tests/testbench/com/vaadin/tests/layouts/GridLayoutWidthChange.java @@ -43,6 +43,7 @@ public class GridLayoutWidthChange extends TestBase { Button testButton = new Button("Reduce GridLayout parent width", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cc.setWidth((cc.getWidth() - 10) + "px"); } diff --git a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java index 8c05df6ca9..dc0c8958ea 100644 --- a/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java +++ b/tests/testbench/com/vaadin/tests/layouts/HiddenHorizontalLayout.java @@ -1,6 +1,6 @@ package com.vaadin.tests.layouts; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -47,6 +47,7 @@ public class HiddenHorizontalLayout extends TestBase { Button b = new Button("toggle layout visibility", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { hl.setVisible(!hl.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java b/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java index 23cf868085..57c6173895 100644 --- a/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/LayoutPerformanceTests.java @@ -213,12 +213,14 @@ public class LayoutPerformanceTests extends TestBase { controls.addComponent(childAmount); controls.addComponent(new Button("Clear", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { setTestLayout(new Label("")); } })); controls.addComponent(new Button("Apply", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { SampleType leafType = (SampleType) leafSelector.getValue(); if (leafType == null) { diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java index bf5de2976f..5f91786571 100644 --- a/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java +++ b/tests/testbench/com/vaadin/tests/layouts/MovingComponentsWhileOldParentInvisible.java @@ -53,6 +53,7 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase { } componentContainerSelect.addListener(new ValueChangeListener() { + @Override @SuppressWarnings("unchecked") public void valueChange(ValueChangeEvent event) { ComponentContainer oldCC = cc; @@ -69,6 +70,7 @@ public class MovingComponentsWhileOldParentInvisible extends TestBase { Button but1 = new Button("Move in and out of component container", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { cc.setVisible(!cc.isVisible()); if (!cc.isVisible()) { diff --git a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java index 23ae31d786..1285e5b52e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java +++ b/tests/testbench/com/vaadin/tests/layouts/MovingInvisibleField.java @@ -23,6 +23,7 @@ public class MovingInvisibleField extends TestBase { Button b = new Button("Move hidden textfield to other layout"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (layout1.getComponentIndex(tfHidden) != -1) { layout2.addComponent(tfVisible); diff --git a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java index 9f18ef7887..2ceb6428ed 100644 --- a/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java +++ b/tests/testbench/com/vaadin/tests/layouts/OrderedLayoutBasics.java @@ -1005,6 +1005,7 @@ public class OrderedLayoutBasics extends TestBase { private Button createAddButton(AbstractOrderedLayout ol) { Button b = new Button("Add before", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addBefore((AbstractOrderedLayout) event.getButton().getData(), event.getButton().getParent(), ""); @@ -1019,6 +1020,7 @@ public class OrderedLayoutBasics extends TestBase { private Button createWideAddButton(AbstractOrderedLayout ol) { Button b = new Button("Add 100% before", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { addBefore((AbstractOrderedLayout) event.getButton().getData(), event.getButton().getParent(), "100%"); @@ -1033,6 +1035,7 @@ public class OrderedLayoutBasics extends TestBase { private Button createRemoveButton(AbstractOrderedLayout ol, String suffix) { Button b = new Button("Remove this " + suffix, new ClickListener() { + @Override public void buttonClick(ClickEvent event) { remove((AbstractOrderedLayout) event.getButton().getData(), event.getButton().getParent()); diff --git a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java index 2f0f16b4a5..d2f14c114e 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestAbsoluteLayout.java @@ -130,6 +130,7 @@ public class TestAbsoluteLayout extends TestBase { Button componentChooser = new Button("choose component to edit"); componentChooser.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window chooser = new Window("Choose component"); chooser.getContent().setSizeUndefined(); @@ -166,6 +167,7 @@ public class TestAbsoluteLayout extends TestBase { select.setImmediate(true); select.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { editcomponent((Component) event.getProperty() .getValue()); @@ -185,6 +187,7 @@ public class TestAbsoluteLayout extends TestBase { Button addComp = new Button("add component"); addComp.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final Window chooser = new Window( "Choose component type to add"); @@ -235,6 +238,7 @@ public class TestAbsoluteLayout extends TestBase { select.setImmediate(true); select.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Class<?> c = (Class<?>) event.getProperty() .getValue(); @@ -279,6 +283,7 @@ public class TestAbsoluteLayout extends TestBase { addComponent(positionEditor); Button b = new Button("Commit changes", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { positionEditor.commit(); componentEditor.commit(); diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java index 619e4581fa..b998abeb02 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutClickListeners.java @@ -60,6 +60,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { al.addComponent(new Button("A button with its own click listener", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { log.log("Button " + event.getButton().getCaption() @@ -69,6 +70,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { })); al.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("AbsoluteLayout", event); } @@ -92,6 +94,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { cl.addComponent(new Button("A button with its own click listener", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { log.log("Button " + event.getButton().getCaption() @@ -101,6 +104,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { })); cl.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("CSSLayout", event); } @@ -125,6 +129,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { gl.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("GridLayout", event); } @@ -166,6 +171,7 @@ public class TestLayoutClickListeners extends AbstractTestCase { gl.addListener(new LayoutClickListener() { + @Override public void layoutClick(LayoutClickEvent event) { logLayoutClick("VerticalLayout", event); diff --git a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java index 3d496fa446..85ecf2897b 100644 --- a/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java +++ b/tests/testbench/com/vaadin/tests/layouts/TestLayoutPerformance.java @@ -1,6 +1,6 @@ package com.vaadin.tests.layouts; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; @@ -65,6 +65,7 @@ public class TestLayoutPerformance extends TestBase { b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { int components = Integer.parseInt(n.getValue()); Layout layout = getCurrentLayout(); diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 44a1e27cb8..916a82bb85 100644 --- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -55,6 +55,7 @@ public class VerticalLayoutExpandRatioModification extends TestBase implements vl2.setSizeFull(); } + @Override public void buttonClick(ClickEvent event) { if (isVisible) { mainLayout.setExpandRatio(vl2, 0); diff --git a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java index 98c5425bc6..f3d4029663 100644 --- a/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java +++ b/tests/testbench/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java @@ -43,6 +43,7 @@ public class VerticalLayoutWithRelativeSizeComponentsInitiallyHidden extends "Click to set bar visible. Button should stay visible."); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { bar.setVisible(true); foobar.setVisible(true); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java index 467705a103..d53fda1748 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java @@ -150,6 +150,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.addComponent(cc1); button1.setEnabled(false); @@ -159,6 +160,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.replaceComponent(x22, cc2); button2.setEnabled(false); @@ -168,6 +170,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.moveComponentsFrom(source); button3.setEnabled(false); @@ -177,6 +180,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.removeComponent(1, 1); button4.setEnabled(false); @@ -187,6 +191,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button5.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.removeRow(0); button5.setEnabled(false); @@ -196,6 +201,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button6.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.removeComponent(row3); button6.setEnabled(false); @@ -230,6 +236,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x3.setSizeFull(); button1.setEnabled(false); @@ -239,6 +246,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x3.setWidth("200px"); button2.setEnabled(false); @@ -248,6 +256,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x22.setWidth("200px"); button3.setEnabled(false); @@ -257,6 +266,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { x22.setSizeUndefined(); ((Table) x22).addItem(new Object[] { "NEW ROW1" }, 3); @@ -292,6 +302,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setColumnExpandRatio(3, 1); button1.setEnabled(false); @@ -301,6 +312,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setColumnExpandRatio(0, 0.25f); glo.setColumnExpandRatio(1, 0.25f); @@ -313,6 +325,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setRowExpandRatio(0, 0.5f); button3.setEnabled(false); @@ -322,6 +335,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setRowExpandRatio(3, 0.3f); button4.setEnabled(false); @@ -394,6 +408,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setHeight("350px"); button1.setEnabled(false); @@ -403,6 +418,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSizeUndefined(); glo.addComponent(new Label("--- NEW LABEL ---")); @@ -413,6 +429,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setWidth("75%"); glo.setHeight("75%"); @@ -423,6 +440,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSizeFull(); button4.setEnabled(false); @@ -457,6 +475,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setMargin(true); button1.setEnabled(false); @@ -466,6 +485,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSpacing(true); button2.setEnabled(false); @@ -475,6 +495,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setMargin(false); button3.setEnabled(false); @@ -484,6 +505,7 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { glo.setSpacing(false); button4.setEnabled(false); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index bd60e9ff21..ab4bb265c5 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -1,11 +1,11 @@ package com.vaadin.tests.layouts.layouttester; import com.vaadin.Application; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.Resource; import com.vaadin.terminal.SystemError; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.UserError; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Alignment; @@ -132,6 +132,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { addButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.addComponent(new TextField()); addButton.setEnabled(false); @@ -141,6 +142,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { replaceButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.replaceComponent(c1, c3); replaceButton.setEnabled(false); @@ -150,6 +152,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { moveButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.moveComponentsFrom(source); moveButton.setEnabled(false); @@ -159,6 +162,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { removeButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.removeComponent(c1); vlo.removeComponent(c2); @@ -203,6 +207,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { biggerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setSizeFull(); biggerButton.setEnabled(false); @@ -212,6 +217,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { smallerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setWidth("200px"); smallerButton.setEnabled(false); @@ -221,6 +227,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { originalButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { originalButton.setEnabled(false); c.setSizeUndefined(); @@ -270,6 +277,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setHeight("350px"); button1.setEnabled(false); @@ -279,6 +287,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSizeUndefined(); vlo.addComponent(new Label("--- NEW LABEL ---")); @@ -289,6 +298,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setWidth("75%"); vlo.setHeight("75%"); @@ -299,6 +309,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSizeFull(); button4.setEnabled(false); @@ -335,6 +346,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setExpandRatio(c1, 1.0f); button1.setEnabled(false); @@ -344,6 +356,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setExpandRatio(c1, 0.5f); vlo.setExpandRatio(c2, 0.5f); @@ -354,6 +367,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setExpandRatio(c1, 0.75f); vlo.setExpandRatio(c2, 0.25f); @@ -442,6 +456,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setMargin(true); button1.setEnabled(false); @@ -451,6 +466,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSpacing(true); button2.setEnabled(false); @@ -460,6 +476,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setMargin(false); button3.setEnabled(false); @@ -469,6 +486,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo.setSpacing(false); button4.setEnabled(false); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java index 6a524cd024..90193be7cc 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java @@ -35,6 +35,7 @@ public class LayoutTesterApplication extends AbstractTestCase { nextButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = -1577298910202253538L; + @Override public void buttonClick(ClickEvent event) { nextLaytout(); } @@ -106,6 +107,7 @@ public class LayoutTesterApplication extends AbstractTestCase { layoutSelector.addListener(new Property.ValueChangeListener() { private static final long serialVersionUID = -605319614765838359L; + @Override public void valueChange(ValueChangeEvent event) { layoutIndex = -1; nextLaytout(); diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index 2861acabdd..be32ca513b 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -1,11 +1,11 @@ package com.vaadin.tests.layouts.layouttester; import com.vaadin.Application; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.Resource; import com.vaadin.terminal.SystemError; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.UserError; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Alignment; @@ -133,6 +133,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { addButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.addComponent(new TextField()); addButton.setEnabled(false); @@ -142,6 +143,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { replaceButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.replaceComponent(c1, c3); replaceButton.setEnabled(false); @@ -151,6 +153,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { moveButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.moveComponentsFrom(source); moveButton.setEnabled(false); @@ -160,6 +163,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { removeButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.removeComponent(c1); vlo2.removeComponent(c2); @@ -206,6 +210,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { biggerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setSizeFull(); biggerButton.setEnabled(false); @@ -215,6 +220,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { smallerButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { c.setWidth("200px"); smallerButton.setEnabled(false); @@ -224,6 +230,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { originalButton.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { originalButton.setEnabled(false); c.setSizeUndefined(); @@ -280,6 +287,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setHeight("350px"); button1.setEnabled(false); @@ -289,6 +297,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSizeUndefined(); Label newLabel = new Label("--- NEW LABEL ---"); @@ -301,6 +310,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setWidth("75%"); vlo2.setHeight("75%"); @@ -311,6 +321,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSizeFull(); button4.setEnabled(false); @@ -351,6 +362,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setExpandRatio(c1, 1.0f); button1.setEnabled(false); @@ -360,6 +372,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setExpandRatio(c1, 0.5f); vlo2.setExpandRatio(c2, 0.5f); @@ -370,6 +383,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setExpandRatio(c1, 0.75f); vlo2.setExpandRatio(c2, 0.25f); @@ -470,6 +484,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setMargin(true); button1.setEnabled(false); @@ -479,6 +494,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSpacing(true); button2.setEnabled(false); @@ -488,6 +504,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setMargin(false); button3.setEnabled(false); @@ -497,6 +514,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() { private static final long serialVersionUID = 7716267156088629379L; + @Override public void buttonClick(ClickEvent event) { vlo2.setSpacing(false); button4.setEnabled(false); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java index 9ed2bd2c75..81f225bc63 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DynamicImageRoot.java @@ -55,6 +55,7 @@ class DynamicImageRequestHandler implements RequestHandler { public static final String IMAGE_URL = "myimage.png"; + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java index b237666caa..ed0a5ba955 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/FindCurrentRootAndApplication.java @@ -27,17 +27,23 @@ public class FindCurrentRootAndApplication extends Root { protected void init(WrappedRequest request) { Button helloButton = new Button("Say Hello"); helloButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String msg = "Running in "; msg += Application.getCurrent().isProductionMode() ? "production" : "debug"; - msg += " mode in a Root with the caption " - + Root.getCurrent().getCaption(); - Notification.show(msg); } }); + helloButton.addListener(new ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + Notification.show("This Root is " + + Root.getCurrent().getClass().getSimpleName()); + } + }); + addComponent(helloButton); } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java index dd32242062..af60b0e9e3 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldDataSource.java @@ -35,14 +35,15 @@ public class IntegerTextFieldDataSource extends AbstractTestRoot { final TextField textField = new TextField("Text field", integerProperty); Button submitButton = new Button("Submit value", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String uiValue = textField.getValue(); Integer propertyValue = integerProperty.getValue(); int dataModelValue = myBean.getValue(); Notification.show("UI value (String): " + uiValue - + "<br />Property value (Integer): " + propertyValue - + "<br />Data model value (int): " + dataModelValue); + + "\nProperty value (Integer): " + propertyValue + + "\nData model value (int): " + dataModelValue); } }); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java index 9c720e45a5..f733b5df40 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/IntegerTextFieldStandalone.java @@ -19,6 +19,7 @@ public class IntegerTextFieldStandalone extends AbstractTestRoot { textField.setConverter(new StringToIntegerConverter()); Button submitButton = new Button("Submit value", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String uiValue = textField.getValue(); try { diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java index 4ccd73b2b3..c2393300f2 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/StringMyTypeConverter.java @@ -24,6 +24,7 @@ public class StringMyTypeConverter extends AbstractTestRoot { addComponent(textField); addComponent(new Button("Submit value", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { Name name = (Name) textField.getConvertedValue(); @@ -50,6 +51,7 @@ public class StringMyTypeConverter extends AbstractTestRoot { } class StringToNameConverter implements Converter<String, Name> { + @Override public Name convertToModel(String text, Locale locale) throws ConversionException { if (text == null) { @@ -63,6 +65,7 @@ class StringToNameConverter implements Converter<String, Name> { return new Name(parts[0], parts[1]); } + @Override public String convertToPresentation(Name name, Locale locale) throws ConversionException { if (name == null) { @@ -72,10 +75,12 @@ class StringToNameConverter implements Converter<String, Name> { } } + @Override public Class<Name> getModelType() { return Name.class; } + @Override public Class<String> getPresentationType() { return String.class; } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java index e98b698c07..bf497a7b86 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/UsingUriFragments.java @@ -30,6 +30,7 @@ public class UsingUriFragments extends Root { // React to fragment changes getPage().addListener(new FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent source) { handleFragment(source.getFragment()); } @@ -40,6 +41,7 @@ public class UsingUriFragments extends Root { addComponent(new Button("Show and set fragment", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { handleFragment(getPage().getFragment()); getPage().setFragment("customFragment"); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java index 5c4fa9d10b..b4dab09807 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyComponent.java @@ -4,7 +4,7 @@ package com.vaadin.tests.minitutorials.v7a2; -import com.vaadin.terminal.gwt.client.MouseEventDetails; +import com.vaadin.shared.MouseEventDetails; import com.vaadin.tests.widgetset.client.minitutorials.v7a2.MyComponentClientRpc; import com.vaadin.tests.widgetset.client.minitutorials.v7a2.MyComponentServerRpc; import com.vaadin.tests.widgetset.client.minitutorials.v7a2.MyComponentState; @@ -14,6 +14,7 @@ public class MyComponent extends AbstractComponent { private int clickCount = 0; private MyComponentServerRpc rpc = new MyComponentServerRpc() { + @Override public void clicked(MouseEventDetails mouseDetails) { clickCount++; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java index ea278da218..98ff0386b3 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerConnector.java @@ -29,6 +29,7 @@ public class MyPickerConnector extends AbstractComponentConnector implements } private final ElementResizeListener listener = new ElementResizeListener() { + @Override public void onElementResize(ElementResizeEvent e) { int buttonWidth = getLayoutManager().getOuterWidth(e.getElement()); buttonWidth -= getLayoutManager().getMarginRight(e.getElement()); @@ -52,6 +53,7 @@ public class MyPickerConnector extends AbstractComponentConnector implements getLayoutManager().unregisterDependency(this, button); } + @Override public void layout() { Element button = getWidget().getWidget(1).getElement(); int buttonWidth = getLayoutManager().getOuterWidth(button); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java index 213a1b9e6b..7818ac4f99 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/MyPickerWidget.java @@ -27,6 +27,7 @@ public class MyPickerWidget extends ComplexPanel { add(button, getElement()); button.addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { Window.alert("Calendar picker not yet supported!"); } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java index f9d4cb38e6..b47f555640 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java @@ -20,11 +20,6 @@ public class ResourceInStateComponent extends AbstractComponent { } public Resource getMyIcon() { - ResourceReference ref = ((ResourceReference) getState().getMyIcon()); - if (ref != null) { - return ref.getResource(); - } else { - return null; - } + return ResourceReference.getResource(getState().getMyIcon()); } } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java index 3c2f9a68b4..40bb7b68b8 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetContainer.java @@ -25,6 +25,7 @@ public class WidgetContainer extends AbstractComponentContainer { requestRepaint(); } + @Override public void replaceComponent(Component oldComponent, Component newComponent) { int index = children.indexOf(oldComponent); if (index != -1) { @@ -36,10 +37,12 @@ public class WidgetContainer extends AbstractComponentContainer { } } + @Override public int getComponentCount() { return children.size(); } + @Override public Iterator<Component> getComponentIterator() { return children.iterator(); } diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java index 3b24ec400e..fae4265750 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/WidgetcontainerRoot.java @@ -24,6 +24,7 @@ public class WidgetcontainerRoot extends Root { "Click the button to add components to the WidgetContainer.")); Button button = new Button("Add more components", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Random randomGenerator = new Random(); int random = randomGenerator.nextInt(3); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java new file mode 100644 index 0000000000..bd4cfd5839 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java @@ -0,0 +1,37 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.annotations.JavaScript; +import com.vaadin.terminal.AbstractJavaScriptExtension; +import com.vaadin.terminal.gwt.server.ClientConnector; +import com.vaadin.ui.Root; + +@JavaScript("analytics_connector.js") +public class Analytics extends AbstractJavaScriptExtension { + + public Analytics(String account) { + pushCommand("_setAccount", account); + } + + public void trackPageview(String name) { + pushCommand("_trackPageview", name); + } + + private void pushCommand(Object... commandAndArguments) { + // Cast to Object to use Object[] commandAndArguments as the first + // varargs argument instead of as the full varargs argument array. + invokeCallback("pushCommand", (Object) commandAndArguments); + } + + protected void extend(Root root) { + super.extend(root); + } + + @Override + protected Class<? extends ClientConnector> getSupportedParentType() { + return Root.class; + } +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java new file mode 100644 index 0000000000..6f59aa765e --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/AnalyticsRoot.java @@ -0,0 +1,27 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Root; + +public class AnalyticsRoot extends Root { + + @Override + protected void init(WrappedRequest request) { + final Analytics analytics = new Analytics("UA-33036133-12"); + analytics.extend(this); + + addComponent(new Button("Track pageview", new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + analytics.trackPageview("/fake/url"); + } + })); + } + +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java new file mode 100644 index 0000000000..2dc6dea432 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesBean.java @@ -0,0 +1,27 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +public class ComplexTypesBean { + private int integer; + private ComplexTypesBean bean; + + public int getInteger() { + return integer; + } + + public void setInteger(int integer) { + this.integer = integer; + } + + public ComplexTypesBean getBean() { + return bean; + } + + public void setBean(ComplexTypesBean bean) { + this.bean = bean; + } + +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java new file mode 100644 index 0000000000..9f452c61b0 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesComponent.java @@ -0,0 +1,53 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.vaadin.annotations.JavaScript; +import com.vaadin.shared.Connector; +import com.vaadin.ui.AbstractJavaScriptComponent; +import com.vaadin.ui.Root; + +@JavaScript("complex_types_connector.js") +public class ComplexTypesComponent extends AbstractJavaScriptComponent { + public void sendComplexTypes() { + List<String> list = new ArrayList<String>(); + list.add("First string"); + list.add(null); + list.add("Another string"); + + Map<String, Integer> stringMap = new HashMap<String, Integer>(); + stringMap.put("one", 1); + stringMap.put("two", 2); + + Map<Integer, String> otherMap = new HashMap<Integer, String>(); + otherMap.put(3, "3"); + otherMap.put(4, "4"); + + Map<Connector, String> connectorMap = new HashMap<Connector, String>(); + connectorMap.put(this, "this"); + connectorMap.put(Root.getCurrent(), "root"); + + boolean[] bits = { true, true, false, true }; + + List<List<Double>> matrix = Arrays.asList(Arrays.asList(1d, 2d), + Arrays.asList(3d, 4d)); + + ComplexTypesBean innerBean = new ComplexTypesBean(); + innerBean.setInteger(-42); + + ComplexTypesBean bean = new ComplexTypesBean(); + bean.setInteger(42); + bean.setBean(innerBean); + + getRpcProxy(ComplexTypesRpc.class).sendComplexTypes(list, stringMap, + otherMap, connectorMap, bits, matrix, bean); + } +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java new file mode 100644 index 0000000000..dc46fe0c29 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRoot.java @@ -0,0 +1,19 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.ui.Root; + +public class ComplexTypesRoot extends Root { + + @Override + protected void init(WrappedRequest request) { + ComplexTypesComponent complexTypesComponent = new ComplexTypesComponent(); + complexTypesComponent.sendComplexTypes(); + addComponent(complexTypesComponent); + } + +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java new file mode 100644 index 0000000000..f763f51118 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/ComplexTypesRpc.java @@ -0,0 +1,18 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import java.util.List; +import java.util.Map; + +import com.vaadin.shared.Connector; +import com.vaadin.shared.communication.ClientRpc; + +public interface ComplexTypesRpc extends ClientRpc { + public void sendComplexTypes(List<String> list, + Map<String, Integer> stringMap, Map<Integer, String> otherMap, + Map<Connector, String> connectorMap, boolean[] bits, + List<List<Double>> matrix, ComplexTypesBean bean); +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java new file mode 100644 index 0000000000..946a67d7fd --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Flot.java @@ -0,0 +1,62 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import com.vaadin.annotations.JavaScript; +import com.vaadin.external.json.JSONArray; +import com.vaadin.external.json.JSONException; +import com.vaadin.ui.AbstractJavaScriptComponent; +import com.vaadin.ui.JavaScriptCallback; +import com.vaadin.ui.Notification; + +@JavaScript({ + "https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js", + "jquery.flot.js", "flot_connector.js" }) +public class Flot extends AbstractJavaScriptComponent { + public Flot() { + registerRpc(new FlotClickRpc() { + @Override + public void onPlotClick(int seriesIndex, int dataIndex) { + Notification.show("Clicked on [" + seriesIndex + ", " + + dataIndex + "]"); + } + }); + registerCallback("onPlotClick", new JavaScriptCallback() { + @Override + public void call(JSONArray arguments) throws JSONException { + int seriesIndex = arguments.getInt(0); + int dataIndex = arguments.getInt(1); + Notification.show("Clicked on [" + seriesIndex + ", " + + dataIndex + "]"); + } + }); + } + + public void addSeries(double... points) { + List<List<Double>> pointList = new ArrayList<List<Double>>(); + for (int i = 0; i < points.length; i++) { + pointList.add(Arrays.asList(Double.valueOf(i), + Double.valueOf(points[i]))); + } + + getState().getSeries().add(pointList); + + requestRepaint(); + } + + public void highlight(int seriesIndex, int dataIndex) { + getRpcProxy(FlotHighlightRpc.class).highlight(seriesIndex, dataIndex); + invokeCallback("highlight", seriesIndex, dataIndex); + } + + @Override + public FlotState getState() { + return (FlotState) super.getState(); + } +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java new file mode 100644 index 0000000000..3802fe6e3f --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotClickRpc.java @@ -0,0 +1,7 @@ +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.shared.communication.ServerRpc; + +public interface FlotClickRpc extends ServerRpc { + public void onPlotClick(int seriesIndex, int dataIndex); +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java new file mode 100644 index 0000000000..93730a8640 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotHighlightRpc.java @@ -0,0 +1,11 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.shared.communication.ClientRpc; + +public interface FlotHighlightRpc extends ClientRpc { + public void highlight(int seriesIndex, int dataIndex); +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java new file mode 100644 index 0000000000..2b5e7337c8 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotJavaScriptRoot.java @@ -0,0 +1,31 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Root; + +public class FlotJavaScriptRoot extends Root { + + @Override + protected void init(WrappedRequest request) { + final Flot flot = new Flot(); + flot.setHeight("300px"); + flot.setWidth("400px"); + + flot.addSeries(1, 2, 4, 8, 16); + addComponent(flot); + + addComponent(new Button("Highlight point", new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + flot.highlight(0, 3); + } + })); + } + +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotState.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotState.java new file mode 100644 index 0000000000..eb9e2f64ce --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/FlotState.java @@ -0,0 +1,18 @@ +package com.vaadin.tests.minitutorials.v7a3; + +import java.util.ArrayList; +import java.util.List; + +import com.vaadin.shared.ui.JavaScriptComponentState; + +public class FlotState extends JavaScriptComponentState { + public List<List<List<Double>>> series = new ArrayList<List<List<Double>>>(); + + public List<List<List<Double>>> getSeries() { + return series; + } + + public void setSeries(List<List<List<Double>>> series) { + this.series = series; + } +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java new file mode 100644 index 0000000000..003eab7e9c --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButton.java @@ -0,0 +1,16 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.annotations.StyleSheet; +import com.vaadin.ui.NativeButton; + +@StyleSheet("redbutton.css") +public class RedButton extends NativeButton { + public RedButton(String caption) { + super(caption); + addStyleName("redButton"); + } +} diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java new file mode 100644 index 0000000000..9cffdc9e63 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/RedButtonRoot.java @@ -0,0 +1,15 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.minitutorials.v7a3; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.ui.Root; + +public class RedButtonRoot extends Root { + @Override + protected void init(WrappedRequest request) { + addComponent(new RedButton("My red button")); + } +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js new file mode 100644 index 0000000000..4eadff5803 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/analytics_connector.js @@ -0,0 +1,13 @@ +window._gaq = window._gaq || []; + +(function() { + var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; + ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); +})(); + +window.com_vaadin_tests_minitutorials_v7a3_Analytics = function() { + this.pushCommand = function(command) { + _gaq.push(command); + } +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js new file mode 100644 index 0000000000..85dfb1369b --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/complex_types_connector.js @@ -0,0 +1,17 @@ +window.com_vaadin_tests_minitutorials_v7a3_ComplexTypesComponent = function() { + this.registerRpc({ + sendComplexTypes: function(list, stringMap, otherMap, connectorMap, bits, matrix, bean) { + var connectorId = this.getConnectorId(); + + var message = 'list[2] = "' + list[2] + '"<br />'; + message += 'stringMap.two = ' + stringMap.two + '<br />'; + message += 'otherMap[1][1] = "' + otherMap[1][1] + '"<br />'; + message += 'connectorMap[connectorId] = "' + connectorMap[connectorId] +'"<br />'; + message += 'bits[3] = ' + bits[3] + '<br />'; + message += 'matrix[0][1] = ' + matrix[0][1] + '<br />'; + message += 'bean.bean.integer = ' + bean.bean.integer + '<br />'; + + this.getElement().innerHTML = message; + } + }); +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/flot_connector.js b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/flot_connector.js new file mode 100644 index 0000000000..5e572a4c72 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/flot_connector.js @@ -0,0 +1,31 @@ +window.com_vaadin_tests_minitutorials_v7a3_Flot = function() { + var element = $(this.getElement()); + var rpcProxy = this.getRpcProxy(); + var self = this; + var flot; + + this.onStateChange = function() { + flot = $.plot(element, this.getState().series, {grid: {clickable: true}}); + } + + element.bind('plotclick', function(event, point, item) { + if (item) { + rpcProxy.onPlotClick(item.seriesIndex, item.dataIndex); + self.onPlotClick(item.seriesIndex, item.dataIndex); + } + }); + + this.registerRpc({ + highlight: function(seriesIndex, dataIndex) { + if (flot) { + flot.highlight(seriesIndex, dataIndex); + } + } + }); + + this.highlight = function(seriesIndex, dataIndex) { + if (flot) { + flot.highlight(seriesIndex, dataIndex); + } + }; +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js new file mode 100644 index 0000000000..f38561ba10 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/jquery.flot.js @@ -0,0 +1,2599 @@ +/*! Javascript plotting library for jQuery, v. 0.7. + * + * Released under the MIT license by IOLA, December 2007. + * + */ + +// first an inline dependency, jquery.colorhelpers.js, we inline it here +// for convenience + +/* Plugin for jQuery for working with colors. + * + * Version 1.1. + * + * Inspiration from jQuery color animation plugin by John Resig. + * + * Released under the MIT license by Ole Laursen, October 2009. + * + * Examples: + * + * $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString() + * var c = $.color.extract($("#mydiv"), 'background-color'); + * console.log(c.r, c.g, c.b, c.a); + * $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)" + * + * Note that .scale() and .add() return the same modified object + * instead of making a new one. + * + * V. 1.1: Fix error handling so e.g. parsing an empty string does + * produce a color rather than just crashing. + */ +(function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]+=I}return G.normalize()};G.scale=function(J,I){for(var H=0;H<J.length;++H){G[J.charAt(H)]*=I}return G.normalize()};G.toString=function(){if(G.a>=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return K<J?J:(K>I?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}var D=B.trim(F).toLowerCase();if(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery); + +// the actual Flot code +(function($) { + function Plot(placeholder, data_, options_, plugins) { + // data is on the form: + // [ series1, series2 ... ] + // where series is either just the data as [ [x1, y1], [x2, y2], ... ] + // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... } + + var series = [], + options = { + // the color theme used for graphs + colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"], + legend: { + show: true, + noColumns: 1, // number of colums in legend table + labelFormatter: null, // fn: string -> string + labelBoxBorderColor: "#ccc", // border color for the little label boxes + container: null, // container (as jQuery object) to put legend in, null means default on top of graph + position: "ne", // position of default legend container within plot + margin: 5, // distance from grid edge to default legend container within plot + backgroundColor: null, // null means auto-detect + backgroundOpacity: 0.85 // set to 0 to avoid background + }, + xaxis: { + show: null, // null = auto-detect, true = always, false = never + position: "bottom", // or "top" + mode: null, // null or "time" + color: null, // base color, labels, ticks + tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)" + transform: null, // null or f: number -> number to transform axis + inverseTransform: null, // if transform is set, this should be the inverse function + min: null, // min. value to show, null means set automatically + max: null, // max. value to show, null means set automatically + autoscaleMargin: null, // margin in % to add if auto-setting min/max + ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks + tickFormatter: null, // fn: number -> string + labelWidth: null, // size of tick labels in pixels + labelHeight: null, + reserveSpace: null, // whether to reserve space even if axis isn't shown + tickLength: null, // size in pixels of ticks, or "full" for whole line + alignTicksWithAxis: null, // axis number or null for no sync + + // mode specific options + tickDecimals: null, // no. of decimals, null means auto + tickSize: null, // number or [number, "unit"] + minTickSize: null, // number or [number, "unit"] + monthNames: null, // list of names of months + timeformat: null, // format string to use + twelveHourClock: false // 12 or 24 time in time mode + }, + yaxis: { + autoscaleMargin: 0.02, + position: "left" // or "right" + }, + xaxes: [], + yaxes: [], + series: { + points: { + show: false, + radius: 3, + lineWidth: 2, // in pixels + fill: true, + fillColor: "#ffffff", + symbol: "circle" // or callback + }, + lines: { + // we don't put in show: false so we can see + // whether lines were actively disabled + lineWidth: 2, // in pixels + fill: false, + fillColor: null, + steps: false + }, + bars: { + show: false, + lineWidth: 2, // in pixels + barWidth: 1, // in units of the x axis + fill: true, + fillColor: null, + align: "left", // or "center" + horizontal: false + }, + shadowSize: 3 + }, + grid: { + show: true, + aboveData: false, + color: "#545454", // primary color used for outline and labels + backgroundColor: null, // null for transparent, else color + borderColor: null, // set if different from the grid color + tickColor: null, // color for the ticks, e.g. "rgba(0,0,0,0.15)" + labelMargin: 5, // in pixels + axisMargin: 8, // in pixels + borderWidth: 2, // in pixels + minBorderMargin: null, // in pixels, null means taken from points radius + markings: null, // array of ranges or fn: axes -> array of ranges + markingsColor: "#f4f4f4", + markingsLineWidth: 2, + // interactive stuff + clickable: false, + hoverable: false, + autoHighlight: true, // highlight in case mouse is near + mouseActiveRadius: 10 // how far the mouse can be away to activate an item + }, + hooks: {} + }, + canvas = null, // the canvas for the plot itself + overlay = null, // canvas for interactive stuff on top of plot + eventHolder = null, // jQuery object that events should be bound to + ctx = null, octx = null, + xaxes = [], yaxes = [], + plotOffset = { left: 0, right: 0, top: 0, bottom: 0}, + canvasWidth = 0, canvasHeight = 0, + plotWidth = 0, plotHeight = 0, + hooks = { + processOptions: [], + processRawData: [], + processDatapoints: [], + drawSeries: [], + draw: [], + bindEvents: [], + drawOverlay: [], + shutdown: [] + }, + plot = this; + + // public functions + plot.setData = setData; + plot.setupGrid = setupGrid; + plot.draw = draw; + plot.getPlaceholder = function() { return placeholder; }; + plot.getCanvas = function() { return canvas; }; + plot.getPlotOffset = function() { return plotOffset; }; + plot.width = function () { return plotWidth; }; + plot.height = function () { return plotHeight; }; + plot.offset = function () { + var o = eventHolder.offset(); + o.left += plotOffset.left; + o.top += plotOffset.top; + return o; + }; + plot.getData = function () { return series; }; + plot.getAxes = function () { + var res = {}, i; + $.each(xaxes.concat(yaxes), function (_, axis) { + if (axis) + res[axis.direction + (axis.n != 1 ? axis.n : "") + "axis"] = axis; + }); + return res; + }; + plot.getXAxes = function () { return xaxes; }; + plot.getYAxes = function () { return yaxes; }; + plot.c2p = canvasToAxisCoords; + plot.p2c = axisToCanvasCoords; + plot.getOptions = function () { return options; }; + plot.highlight = highlight; + plot.unhighlight = unhighlight; + plot.triggerRedrawOverlay = triggerRedrawOverlay; + plot.pointOffset = function(point) { + return { + left: parseInt(xaxes[axisNumber(point, "x") - 1].p2c(+point.x) + plotOffset.left), + top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top) + }; + }; + plot.shutdown = shutdown; + plot.resize = function () { + getCanvasDimensions(); + resizeCanvas(canvas); + resizeCanvas(overlay); + }; + + // public attributes + plot.hooks = hooks; + + // initialize + initPlugins(plot); + parseOptions(options_); + setupCanvases(); + setData(data_); + setupGrid(); + draw(); + bindEvents(); + + + function executeHooks(hook, args) { + args = [plot].concat(args); + for (var i = 0; i < hook.length; ++i) + hook[i].apply(this, args); + } + + function initPlugins() { + for (var i = 0; i < plugins.length; ++i) { + var p = plugins[i]; + p.init(plot); + if (p.options) + $.extend(true, options, p.options); + } + } + + function parseOptions(opts) { + var i; + + $.extend(true, options, opts); + + if (options.xaxis.color == null) + options.xaxis.color = options.grid.color; + if (options.yaxis.color == null) + options.yaxis.color = options.grid.color; + + if (options.xaxis.tickColor == null) // backwards-compatibility + options.xaxis.tickColor = options.grid.tickColor; + if (options.yaxis.tickColor == null) // backwards-compatibility + options.yaxis.tickColor = options.grid.tickColor; + + if (options.grid.borderColor == null) + options.grid.borderColor = options.grid.color; + if (options.grid.tickColor == null) + options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString(); + + // fill in defaults in axes, copy at least always the + // first as the rest of the code assumes it'll be there + for (i = 0; i < Math.max(1, options.xaxes.length); ++i) + options.xaxes[i] = $.extend(true, {}, options.xaxis, options.xaxes[i]); + for (i = 0; i < Math.max(1, options.yaxes.length); ++i) + options.yaxes[i] = $.extend(true, {}, options.yaxis, options.yaxes[i]); + + // backwards compatibility, to be removed in future + if (options.xaxis.noTicks && options.xaxis.ticks == null) + options.xaxis.ticks = options.xaxis.noTicks; + if (options.yaxis.noTicks && options.yaxis.ticks == null) + options.yaxis.ticks = options.yaxis.noTicks; + if (options.x2axis) { + options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis); + options.xaxes[1].position = "top"; + } + if (options.y2axis) { + options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis); + options.yaxes[1].position = "right"; + } + if (options.grid.coloredAreas) + options.grid.markings = options.grid.coloredAreas; + if (options.grid.coloredAreasColor) + options.grid.markingsColor = options.grid.coloredAreasColor; + if (options.lines) + $.extend(true, options.series.lines, options.lines); + if (options.points) + $.extend(true, options.series.points, options.points); + if (options.bars) + $.extend(true, options.series.bars, options.bars); + if (options.shadowSize != null) + options.series.shadowSize = options.shadowSize; + + // save options on axes for future reference + for (i = 0; i < options.xaxes.length; ++i) + getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i]; + for (i = 0; i < options.yaxes.length; ++i) + getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i]; + + // add hooks from options + for (var n in hooks) + if (options.hooks[n] && options.hooks[n].length) + hooks[n] = hooks[n].concat(options.hooks[n]); + + executeHooks(hooks.processOptions, [options]); + } + + function setData(d) { + series = parseData(d); + fillInSeriesOptions(); + processData(); + } + + function parseData(d) { + var res = []; + for (var i = 0; i < d.length; ++i) { + var s = $.extend(true, {}, options.series); + + if (d[i].data != null) { + s.data = d[i].data; // move the data instead of deep-copy + delete d[i].data; + + $.extend(true, s, d[i]); + + d[i].data = s.data; + } + else + s.data = d[i]; + res.push(s); + } + + return res; + } + + function axisNumber(obj, coord) { + var a = obj[coord + "axis"]; + if (typeof a == "object") // if we got a real axis, extract number + a = a.n; + if (typeof a != "number") + a = 1; // default to first axis + return a; + } + + function allAxes() { + // return flat array without annoying null entries + return $.grep(xaxes.concat(yaxes), function (a) { return a; }); + } + + function canvasToAxisCoords(pos) { + // return an object with x/y corresponding to all used axes + var res = {}, i, axis; + for (i = 0; i < xaxes.length; ++i) { + axis = xaxes[i]; + if (axis && axis.used) + res["x" + axis.n] = axis.c2p(pos.left); + } + + for (i = 0; i < yaxes.length; ++i) { + axis = yaxes[i]; + if (axis && axis.used) + res["y" + axis.n] = axis.c2p(pos.top); + } + + if (res.x1 !== undefined) + res.x = res.x1; + if (res.y1 !== undefined) + res.y = res.y1; + + return res; + } + + function axisToCanvasCoords(pos) { + // get canvas coords from the first pair of x/y found in pos + var res = {}, i, axis, key; + + for (i = 0; i < xaxes.length; ++i) { + axis = xaxes[i]; + if (axis && axis.used) { + key = "x" + axis.n; + if (pos[key] == null && axis.n == 1) + key = "x"; + + if (pos[key] != null) { + res.left = axis.p2c(pos[key]); + break; + } + } + } + + for (i = 0; i < yaxes.length; ++i) { + axis = yaxes[i]; + if (axis && axis.used) { + key = "y" + axis.n; + if (pos[key] == null && axis.n == 1) + key = "y"; + + if (pos[key] != null) { + res.top = axis.p2c(pos[key]); + break; + } + } + } + + return res; + } + + function getOrCreateAxis(axes, number) { + if (!axes[number - 1]) + axes[number - 1] = { + n: number, // save the number for future reference + direction: axes == xaxes ? "x" : "y", + options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis) + }; + + return axes[number - 1]; + } + + function fillInSeriesOptions() { + var i; + + // collect what we already got of colors + var neededColors = series.length, + usedColors = [], + assignedColors = []; + for (i = 0; i < series.length; ++i) { + var sc = series[i].color; + if (sc != null) { + --neededColors; + if (typeof sc == "number") + assignedColors.push(sc); + else + usedColors.push($.color.parse(series[i].color)); + } + } + + // we might need to generate more colors if higher indices + // are assigned + for (i = 0; i < assignedColors.length; ++i) { + neededColors = Math.max(neededColors, assignedColors[i] + 1); + } + + // produce colors as needed + var colors = [], variation = 0; + i = 0; + while (colors.length < neededColors) { + var c; + if (options.colors.length == i) // check degenerate case + c = $.color.make(100, 100, 100); + else + c = $.color.parse(options.colors[i]); + + // vary color if needed + var sign = variation % 2 == 1 ? -1 : 1; + c.scale('rgb', 1 + sign * Math.ceil(variation / 2) * 0.2) + + // FIXME: if we're getting to close to something else, + // we should probably skip this one + colors.push(c); + + ++i; + if (i >= options.colors.length) { + i = 0; + ++variation; + } + } + + // fill in the options + var colori = 0, s; + for (i = 0; i < series.length; ++i) { + s = series[i]; + + // assign colors + if (s.color == null) { + s.color = colors[colori].toString(); + ++colori; + } + else if (typeof s.color == "number") + s.color = colors[s.color].toString(); + + // turn on lines automatically in case nothing is set + if (s.lines.show == null) { + var v, show = true; + for (v in s) + if (s[v] && s[v].show) { + show = false; + break; + } + if (show) + s.lines.show = true; + } + + // setup axes + s.xaxis = getOrCreateAxis(xaxes, axisNumber(s, "x")); + s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y")); + } + } + + function processData() { + var topSentry = Number.POSITIVE_INFINITY, + bottomSentry = Number.NEGATIVE_INFINITY, + fakeInfinity = Number.MAX_VALUE, + i, j, k, m, length, + s, points, ps, x, y, axis, val, f, p; + + function updateAxis(axis, min, max) { + if (min < axis.datamin && min != -fakeInfinity) + axis.datamin = min; + if (max > axis.datamax && max != fakeInfinity) + axis.datamax = max; + } + + $.each(allAxes(), function (_, axis) { + // init axis + axis.datamin = topSentry; + axis.datamax = bottomSentry; + axis.used = false; + }); + + for (i = 0; i < series.length; ++i) { + s = series[i]; + s.datapoints = { points: [] }; + + executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]); + } + + // first pass: clean and copy data + for (i = 0; i < series.length; ++i) { + s = series[i]; + + var data = s.data, format = s.datapoints.format; + + if (!format) { + format = []; + // find out how to copy + format.push({ x: true, number: true, required: true }); + format.push({ y: true, number: true, required: true }); + + if (s.bars.show || (s.lines.show && s.lines.fill)) { + format.push({ y: true, number: true, required: false, defaultValue: 0 }); + if (s.bars.horizontal) { + delete format[format.length - 1].y; + format[format.length - 1].x = true; + } + } + + s.datapoints.format = format; + } + + if (s.datapoints.pointsize != null) + continue; // already filled in + + s.datapoints.pointsize = format.length; + + ps = s.datapoints.pointsize; + points = s.datapoints.points; + + insertSteps = s.lines.show && s.lines.steps; + s.xaxis.used = s.yaxis.used = true; + + for (j = k = 0; j < data.length; ++j, k += ps) { + p = data[j]; + + var nullify = p == null; + if (!nullify) { + for (m = 0; m < ps; ++m) { + val = p[m]; + f = format[m]; + + if (f) { + if (f.number && val != null) { + val = +val; // convert to number + if (isNaN(val)) + val = null; + else if (val == Infinity) + val = fakeInfinity; + else if (val == -Infinity) + val = -fakeInfinity; + } + + if (val == null) { + if (f.required) + nullify = true; + + if (f.defaultValue != null) + val = f.defaultValue; + } + } + + points[k + m] = val; + } + } + + if (nullify) { + for (m = 0; m < ps; ++m) { + val = points[k + m]; + if (val != null) { + f = format[m]; + // extract min/max info + if (f.x) + updateAxis(s.xaxis, val, val); + if (f.y) + updateAxis(s.yaxis, val, val); + } + points[k + m] = null; + } + } + else { + // a little bit of line specific stuff that + // perhaps shouldn't be here, but lacking + // better means... + if (insertSteps && k > 0 + && points[k - ps] != null + && points[k - ps] != points[k] + && points[k - ps + 1] != points[k + 1]) { + // copy the point to make room for a middle point + for (m = 0; m < ps; ++m) + points[k + ps + m] = points[k + m]; + + // middle point has same y + points[k + 1] = points[k - ps + 1]; + + // we've added a point, better reflect that + k += ps; + } + } + } + } + + // give the hooks a chance to run + for (i = 0; i < series.length; ++i) { + s = series[i]; + + executeHooks(hooks.processDatapoints, [ s, s.datapoints]); + } + + // second pass: find datamax/datamin for auto-scaling + for (i = 0; i < series.length; ++i) { + s = series[i]; + points = s.datapoints.points, + ps = s.datapoints.pointsize; + + var xmin = topSentry, ymin = topSentry, + xmax = bottomSentry, ymax = bottomSentry; + + for (j = 0; j < points.length; j += ps) { + if (points[j] == null) + continue; + + for (m = 0; m < ps; ++m) { + val = points[j + m]; + f = format[m]; + if (!f || val == fakeInfinity || val == -fakeInfinity) + continue; + + if (f.x) { + if (val < xmin) + xmin = val; + if (val > xmax) + xmax = val; + } + if (f.y) { + if (val < ymin) + ymin = val; + if (val > ymax) + ymax = val; + } + } + } + + if (s.bars.show) { + // make sure we got room for the bar on the dancing floor + var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2; + if (s.bars.horizontal) { + ymin += delta; + ymax += delta + s.bars.barWidth; + } + else { + xmin += delta; + xmax += delta + s.bars.barWidth; + } + } + + updateAxis(s.xaxis, xmin, xmax); + updateAxis(s.yaxis, ymin, ymax); + } + + $.each(allAxes(), function (_, axis) { + if (axis.datamin == topSentry) + axis.datamin = null; + if (axis.datamax == bottomSentry) + axis.datamax = null; + }); + } + + function makeCanvas(skipPositioning, cls) { + var c = document.createElement('canvas'); + c.className = cls; + c.width = canvasWidth; + c.height = canvasHeight; + + if (!skipPositioning) + $(c).css({ position: 'absolute', left: 0, top: 0 }); + + $(c).appendTo(placeholder); + + if (!c.getContext) // excanvas hack + c = window.G_vmlCanvasManager.initElement(c); + + // used for resetting in case we get replotted + c.getContext("2d").save(); + + return c; + } + + function getCanvasDimensions() { + canvasWidth = placeholder.width(); + canvasHeight = placeholder.height(); + + if (canvasWidth <= 0 || canvasHeight <= 0) + throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight; + } + + function resizeCanvas(c) { + // resizing should reset the state (excanvas seems to be + // buggy though) + if (c.width != canvasWidth) + c.width = canvasWidth; + + if (c.height != canvasHeight) + c.height = canvasHeight; + + // so try to get back to the initial state (even if it's + // gone now, this should be safe according to the spec) + var cctx = c.getContext("2d"); + cctx.restore(); + + // and save again + cctx.save(); + } + + function setupCanvases() { + var reused, + existingCanvas = placeholder.children("canvas.base"), + existingOverlay = placeholder.children("canvas.overlay"); + + if (existingCanvas.length == 0 || existingOverlay == 0) { + // init everything + + placeholder.html(""); // make sure placeholder is clear + + placeholder.css({ padding: 0 }); // padding messes up the positioning + + if (placeholder.css("position") == 'static') + placeholder.css("position", "relative"); // for positioning labels and overlay + + getCanvasDimensions(); + + canvas = makeCanvas(true, "base"); + overlay = makeCanvas(false, "overlay"); // overlay canvas for interactive features + + reused = false; + } + else { + // reuse existing elements + + canvas = existingCanvas.get(0); + overlay = existingOverlay.get(0); + + reused = true; + } + + ctx = canvas.getContext("2d"); + octx = overlay.getContext("2d"); + + // we include the canvas in the event holder too, because IE 7 + // sometimes has trouble with the stacking order + eventHolder = $([overlay, canvas]); + + if (reused) { + // run shutdown in the old plot object + placeholder.data("plot").shutdown(); + + // reset reused canvases + plot.resize(); + + // make sure overlay pixels are cleared (canvas is cleared when we redraw) + octx.clearRect(0, 0, canvasWidth, canvasHeight); + + // then whack any remaining obvious garbage left + eventHolder.unbind(); + placeholder.children().not([canvas, overlay]).remove(); + } + + // save in case we get replotted + placeholder.data("plot", plot); + } + + function bindEvents() { + // bind events + if (options.grid.hoverable) { + eventHolder.mousemove(onMouseMove); + eventHolder.mouseleave(onMouseLeave); + } + + if (options.grid.clickable) + eventHolder.click(onClick); + + executeHooks(hooks.bindEvents, [eventHolder]); + } + + function shutdown() { + if (redrawTimeout) + clearTimeout(redrawTimeout); + + eventHolder.unbind("mousemove", onMouseMove); + eventHolder.unbind("mouseleave", onMouseLeave); + eventHolder.unbind("click", onClick); + + executeHooks(hooks.shutdown, [eventHolder]); + } + + function setTransformationHelpers(axis) { + // set helper functions on the axis, assumes plot area + // has been computed already + + function identity(x) { return x; } + + var s, m, t = axis.options.transform || identity, + it = axis.options.inverseTransform; + + // precompute how much the axis is scaling a point + // in canvas space + if (axis.direction == "x") { + s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min)); + m = Math.min(t(axis.max), t(axis.min)); + } + else { + s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min)); + s = -s; + m = Math.max(t(axis.max), t(axis.min)); + } + + // data point to canvas coordinate + if (t == identity) // slight optimization + axis.p2c = function (p) { return (p - m) * s; }; + else + axis.p2c = function (p) { return (t(p) - m) * s; }; + // canvas coordinate to data point + if (!it) + axis.c2p = function (c) { return m + c / s; }; + else + axis.c2p = function (c) { return it(m + c / s); }; + } + + function measureTickLabels(axis) { + var opts = axis.options, i, ticks = axis.ticks || [], labels = [], + l, w = opts.labelWidth, h = opts.labelHeight, dummyDiv; + + function makeDummyDiv(labels, width) { + return $('<div style="position:absolute;top:-10000px;' + width + 'font-size:smaller">' + + '<div class="' + axis.direction + 'Axis ' + axis.direction + axis.n + 'Axis">' + + labels.join("") + '</div></div>') + .appendTo(placeholder); + } + + if (axis.direction == "x") { + // to avoid measuring the widths of the labels (it's slow), we + // construct fixed-size boxes and put the labels inside + // them, we don't need the exact figures and the + // fixed-size box content is easy to center + if (w == null) + w = Math.floor(canvasWidth / (ticks.length > 0 ? ticks.length : 1)); + + // measure x label heights + if (h == null) { + labels = []; + for (i = 0; i < ticks.length; ++i) { + l = ticks[i].label; + if (l) + labels.push('<div class="tickLabel" style="float:left;width:' + w + 'px">' + l + '</div>'); + } + + if (labels.length > 0) { + // stick them all in the same div and measure + // collective height + labels.push('<div style="clear:left"></div>'); + dummyDiv = makeDummyDiv(labels, "width:10000px;"); + h = dummyDiv.height(); + dummyDiv.remove(); + } + } + } + else if (w == null || h == null) { + // calculate y label dimensions + for (i = 0; i < ticks.length; ++i) { + l = ticks[i].label; + if (l) + labels.push('<div class="tickLabel">' + l + '</div>'); + } + + if (labels.length > 0) { + dummyDiv = makeDummyDiv(labels, ""); + if (w == null) + w = dummyDiv.children().width(); + if (h == null) + h = dummyDiv.find("div.tickLabel").height(); + dummyDiv.remove(); + } + } + + if (w == null) + w = 0; + if (h == null) + h = 0; + + axis.labelWidth = w; + axis.labelHeight = h; + } + + function allocateAxisBoxFirstPhase(axis) { + // find the bounding box of the axis by looking at label + // widths/heights and ticks, make room by diminishing the + // plotOffset + + var lw = axis.labelWidth, + lh = axis.labelHeight, + pos = axis.options.position, + tickLength = axis.options.tickLength, + axismargin = options.grid.axisMargin, + padding = options.grid.labelMargin, + all = axis.direction == "x" ? xaxes : yaxes, + index; + + // determine axis margin + var samePosition = $.grep(all, function (a) { + return a && a.options.position == pos && a.reserveSpace; + }); + if ($.inArray(axis, samePosition) == samePosition.length - 1) + axismargin = 0; // outermost + + // determine tick length - if we're innermost, we can use "full" + if (tickLength == null) + tickLength = "full"; + + var sameDirection = $.grep(all, function (a) { + return a && a.reserveSpace; + }); + + var innermost = $.inArray(axis, sameDirection) == 0; + if (!innermost && tickLength == "full") + tickLength = 5; + + if (!isNaN(+tickLength)) + padding += +tickLength; + + // compute box + if (axis.direction == "x") { + lh += padding; + + if (pos == "bottom") { + plotOffset.bottom += lh + axismargin; + axis.box = { top: canvasHeight - plotOffset.bottom, height: lh }; + } + else { + axis.box = { top: plotOffset.top + axismargin, height: lh }; + plotOffset.top += lh + axismargin; + } + } + else { + lw += padding; + + if (pos == "left") { + axis.box = { left: plotOffset.left + axismargin, width: lw }; + plotOffset.left += lw + axismargin; + } + else { + plotOffset.right += lw + axismargin; + axis.box = { left: canvasWidth - plotOffset.right, width: lw }; + } + } + + // save for future reference + axis.position = pos; + axis.tickLength = tickLength; + axis.box.padding = padding; + axis.innermost = innermost; + } + + function allocateAxisBoxSecondPhase(axis) { + // set remaining bounding box coordinates + if (axis.direction == "x") { + axis.box.left = plotOffset.left; + axis.box.width = plotWidth; + } + else { + axis.box.top = plotOffset.top; + axis.box.height = plotHeight; + } + } + + function setupGrid() { + var i, axes = allAxes(); + + // first calculate the plot and axis box dimensions + + $.each(axes, function (_, axis) { + axis.show = axis.options.show; + if (axis.show == null) + axis.show = axis.used; // by default an axis is visible if it's got data + + axis.reserveSpace = axis.show || axis.options.reserveSpace; + + setRange(axis); + }); + + allocatedAxes = $.grep(axes, function (axis) { return axis.reserveSpace; }); + + plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0; + if (options.grid.show) { + $.each(allocatedAxes, function (_, axis) { + // make the ticks + setupTickGeneration(axis); + setTicks(axis); + snapRangeToTicks(axis, axis.ticks); + + // find labelWidth/Height for axis + measureTickLabels(axis); + }); + + // with all dimensions in house, we can compute the + // axis boxes, start from the outside (reverse order) + for (i = allocatedAxes.length - 1; i >= 0; --i) + allocateAxisBoxFirstPhase(allocatedAxes[i]); + + // make sure we've got enough space for things that + // might stick out + var minMargin = options.grid.minBorderMargin; + if (minMargin == null) { + minMargin = 0; + for (i = 0; i < series.length; ++i) + minMargin = Math.max(minMargin, series[i].points.radius + series[i].points.lineWidth/2); + } + + for (var a in plotOffset) { + plotOffset[a] += options.grid.borderWidth; + plotOffset[a] = Math.max(minMargin, plotOffset[a]); + } + } + + plotWidth = canvasWidth - plotOffset.left - plotOffset.right; + plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top; + + // now we got the proper plotWidth/Height, we can compute the scaling + $.each(axes, function (_, axis) { + setTransformationHelpers(axis); + }); + + if (options.grid.show) { + $.each(allocatedAxes, function (_, axis) { + allocateAxisBoxSecondPhase(axis); + }); + + insertAxisLabels(); + } + + insertLegend(); + } + + function setRange(axis) { + var opts = axis.options, + min = +(opts.min != null ? opts.min : axis.datamin), + max = +(opts.max != null ? opts.max : axis.datamax), + delta = max - min; + + if (delta == 0.0) { + // degenerate case + var widen = max == 0 ? 1 : 0.01; + + if (opts.min == null) + min -= widen; + // always widen max if we couldn't widen min to ensure we + // don't fall into min == max which doesn't work + if (opts.max == null || opts.min != null) + max += widen; + } + else { + // consider autoscaling + var margin = opts.autoscaleMargin; + if (margin != null) { + if (opts.min == null) { + min -= delta * margin; + // make sure we don't go below zero if all values + // are positive + if (min < 0 && axis.datamin != null && axis.datamin >= 0) + min = 0; + } + if (opts.max == null) { + max += delta * margin; + if (max > 0 && axis.datamax != null && axis.datamax <= 0) + max = 0; + } + } + } + axis.min = min; + axis.max = max; + } + + function setupTickGeneration(axis) { + var opts = axis.options; + + // estimate number of ticks + var noTicks; + if (typeof opts.ticks == "number" && opts.ticks > 0) + noTicks = opts.ticks; + else + // heuristic based on the model a*sqrt(x) fitted to + // some data points that seemed reasonable + noTicks = 0.3 * Math.sqrt(axis.direction == "x" ? canvasWidth : canvasHeight); + + var delta = (axis.max - axis.min) / noTicks, + size, generator, unit, formatter, i, magn, norm; + + if (opts.mode == "time") { + // pretty handling of time + + // map of app. size of time units in milliseconds + var timeUnitSize = { + "second": 1000, + "minute": 60 * 1000, + "hour": 60 * 60 * 1000, + "day": 24 * 60 * 60 * 1000, + "month": 30 * 24 * 60 * 60 * 1000, + "year": 365.2425 * 24 * 60 * 60 * 1000 + }; + + + // the allowed tick sizes, after 1 year we use + // an integer algorithm + var spec = [ + [1, "second"], [2, "second"], [5, "second"], [10, "second"], + [30, "second"], + [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"], + [30, "minute"], + [1, "hour"], [2, "hour"], [4, "hour"], + [8, "hour"], [12, "hour"], + [1, "day"], [2, "day"], [3, "day"], + [0.25, "month"], [0.5, "month"], [1, "month"], + [2, "month"], [3, "month"], [6, "month"], + [1, "year"] + ]; + + var minSize = 0; + if (opts.minTickSize != null) { + if (typeof opts.tickSize == "number") + minSize = opts.tickSize; + else + minSize = opts.minTickSize[0] * timeUnitSize[opts.minTickSize[1]]; + } + + for (var i = 0; i < spec.length - 1; ++i) + if (delta < (spec[i][0] * timeUnitSize[spec[i][1]] + + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2 + && spec[i][0] * timeUnitSize[spec[i][1]] >= minSize) + break; + size = spec[i][0]; + unit = spec[i][1]; + + // special-case the possibility of several years + if (unit == "year") { + magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10)); + norm = (delta / timeUnitSize.year) / magn; + if (norm < 1.5) + size = 1; + else if (norm < 3) + size = 2; + else if (norm < 7.5) + size = 5; + else + size = 10; + + size *= magn; + } + + axis.tickSize = opts.tickSize || [size, unit]; + + generator = function(axis) { + var ticks = [], + tickSize = axis.tickSize[0], unit = axis.tickSize[1], + d = new Date(axis.min); + + var step = tickSize * timeUnitSize[unit]; + + if (unit == "second") + d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize)); + if (unit == "minute") + d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize)); + if (unit == "hour") + d.setUTCHours(floorInBase(d.getUTCHours(), tickSize)); + if (unit == "month") + d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize)); + if (unit == "year") + d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize)); + + // reset smaller components + d.setUTCMilliseconds(0); + if (step >= timeUnitSize.minute) + d.setUTCSeconds(0); + if (step >= timeUnitSize.hour) + d.setUTCMinutes(0); + if (step >= timeUnitSize.day) + d.setUTCHours(0); + if (step >= timeUnitSize.day * 4) + d.setUTCDate(1); + if (step >= timeUnitSize.year) + d.setUTCMonth(0); + + + var carry = 0, v = Number.NaN, prev; + do { + prev = v; + v = d.getTime(); + ticks.push(v); + if (unit == "month") { + if (tickSize < 1) { + // a bit complicated - we'll divide the month + // up but we need to take care of fractions + // so we don't end up in the middle of a day + d.setUTCDate(1); + var start = d.getTime(); + d.setUTCMonth(d.getUTCMonth() + 1); + var end = d.getTime(); + d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize); + carry = d.getUTCHours(); + d.setUTCHours(0); + } + else + d.setUTCMonth(d.getUTCMonth() + tickSize); + } + else if (unit == "year") { + d.setUTCFullYear(d.getUTCFullYear() + tickSize); + } + else + d.setTime(v + step); + } while (v < axis.max && v != prev); + + return ticks; + }; + + formatter = function (v, axis) { + var d = new Date(v); + + // first check global format + if (opts.timeformat != null) + return $.plot.formatDate(d, opts.timeformat, opts.monthNames); + + var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]]; + var span = axis.max - axis.min; + var suffix = (opts.twelveHourClock) ? " %p" : ""; + + if (t < timeUnitSize.minute) + fmt = "%h:%M:%S" + suffix; + else if (t < timeUnitSize.day) { + if (span < 2 * timeUnitSize.day) + fmt = "%h:%M" + suffix; + else + fmt = "%b %d %h:%M" + suffix; + } + else if (t < timeUnitSize.month) + fmt = "%b %d"; + else if (t < timeUnitSize.year) { + if (span < timeUnitSize.year) + fmt = "%b"; + else + fmt = "%b %y"; + } + else + fmt = "%y"; + + return $.plot.formatDate(d, fmt, opts.monthNames); + }; + } + else { + // pretty rounding of base-10 numbers + var maxDec = opts.tickDecimals; + var dec = -Math.floor(Math.log(delta) / Math.LN10); + if (maxDec != null && dec > maxDec) + dec = maxDec; + + magn = Math.pow(10, -dec); + norm = delta / magn; // norm is between 1.0 and 10.0 + + if (norm < 1.5) + size = 1; + else if (norm < 3) { + size = 2; + // special case for 2.5, requires an extra decimal + if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) { + size = 2.5; + ++dec; + } + } + else if (norm < 7.5) + size = 5; + else + size = 10; + + size *= magn; + + if (opts.minTickSize != null && size < opts.minTickSize) + size = opts.minTickSize; + + axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec); + axis.tickSize = opts.tickSize || size; + + generator = function (axis) { + var ticks = []; + + // spew out all possible ticks + var start = floorInBase(axis.min, axis.tickSize), + i = 0, v = Number.NaN, prev; + do { + prev = v; + v = start + i * axis.tickSize; + ticks.push(v); + ++i; + } while (v < axis.max && v != prev); + return ticks; + }; + + formatter = function (v, axis) { + return v.toFixed(axis.tickDecimals); + }; + } + + if (opts.alignTicksWithAxis != null) { + var otherAxis = (axis.direction == "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1]; + if (otherAxis && otherAxis.used && otherAxis != axis) { + // consider snapping min/max to outermost nice ticks + var niceTicks = generator(axis); + if (niceTicks.length > 0) { + if (opts.min == null) + axis.min = Math.min(axis.min, niceTicks[0]); + if (opts.max == null && niceTicks.length > 1) + axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]); + } + + generator = function (axis) { + // copy ticks, scaled to this axis + var ticks = [], v, i; + for (i = 0; i < otherAxis.ticks.length; ++i) { + v = (otherAxis.ticks[i].v - otherAxis.min) / (otherAxis.max - otherAxis.min); + v = axis.min + v * (axis.max - axis.min); + ticks.push(v); + } + return ticks; + }; + + // we might need an extra decimal since forced + // ticks don't necessarily fit naturally + if (axis.mode != "time" && opts.tickDecimals == null) { + var extraDec = Math.max(0, -Math.floor(Math.log(delta) / Math.LN10) + 1), + ts = generator(axis); + + // only proceed if the tick interval rounded + // with an extra decimal doesn't give us a + // zero at end + if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec)))) + axis.tickDecimals = extraDec; + } + } + } + + axis.tickGenerator = generator; + if ($.isFunction(opts.tickFormatter)) + axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); }; + else + axis.tickFormatter = formatter; + } + + function setTicks(axis) { + var oticks = axis.options.ticks, ticks = []; + if (oticks == null || (typeof oticks == "number" && oticks > 0)) + ticks = axis.tickGenerator(axis); + else if (oticks) { + if ($.isFunction(oticks)) + // generate the ticks + ticks = oticks({ min: axis.min, max: axis.max }); + else + ticks = oticks; + } + + // clean up/labelify the supplied ticks, copy them over + var i, v; + axis.ticks = []; + for (i = 0; i < ticks.length; ++i) { + var label = null; + var t = ticks[i]; + if (typeof t == "object") { + v = +t[0]; + if (t.length > 1) + label = t[1]; + } + else + v = +t; + if (label == null) + label = axis.tickFormatter(v, axis); + if (!isNaN(v)) + axis.ticks.push({ v: v, label: label }); + } + } + + function snapRangeToTicks(axis, ticks) { + if (axis.options.autoscaleMargin && ticks.length > 0) { + // snap to ticks + if (axis.options.min == null) + axis.min = Math.min(axis.min, ticks[0].v); + if (axis.options.max == null && ticks.length > 1) + axis.max = Math.max(axis.max, ticks[ticks.length - 1].v); + } + } + + function draw() { + ctx.clearRect(0, 0, canvasWidth, canvasHeight); + + var grid = options.grid; + + // draw background, if any + if (grid.show && grid.backgroundColor) + drawBackground(); + + if (grid.show && !grid.aboveData) + drawGrid(); + + for (var i = 0; i < series.length; ++i) { + executeHooks(hooks.drawSeries, [ctx, series[i]]); + drawSeries(series[i]); + } + + executeHooks(hooks.draw, [ctx]); + + if (grid.show && grid.aboveData) + drawGrid(); + } + + function extractRange(ranges, coord) { + var axis, from, to, key, axes = allAxes(); + + for (i = 0; i < axes.length; ++i) { + axis = axes[i]; + if (axis.direction == coord) { + key = coord + axis.n + "axis"; + if (!ranges[key] && axis.n == 1) + key = coord + "axis"; // support x1axis as xaxis + if (ranges[key]) { + from = ranges[key].from; + to = ranges[key].to; + break; + } + } + } + + // backwards-compat stuff - to be removed in future + if (!ranges[key]) { + axis = coord == "x" ? xaxes[0] : yaxes[0]; + from = ranges[coord + "1"]; + to = ranges[coord + "2"]; + } + + // auto-reverse as an added bonus + if (from != null && to != null && from > to) { + var tmp = from; + from = to; + to = tmp; + } + + return { from: from, to: to, axis: axis }; + } + + function drawBackground() { + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)"); + ctx.fillRect(0, 0, plotWidth, plotHeight); + ctx.restore(); + } + + function drawGrid() { + var i; + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + // draw markings + var markings = options.grid.markings; + if (markings) { + if ($.isFunction(markings)) { + var axes = plot.getAxes(); + // xmin etc. is backwards compatibility, to be + // removed in the future + axes.xmin = axes.xaxis.min; + axes.xmax = axes.xaxis.max; + axes.ymin = axes.yaxis.min; + axes.ymax = axes.yaxis.max; + + markings = markings(axes); + } + + for (i = 0; i < markings.length; ++i) { + var m = markings[i], + xrange = extractRange(m, "x"), + yrange = extractRange(m, "y"); + + // fill in missing + if (xrange.from == null) + xrange.from = xrange.axis.min; + if (xrange.to == null) + xrange.to = xrange.axis.max; + if (yrange.from == null) + yrange.from = yrange.axis.min; + if (yrange.to == null) + yrange.to = yrange.axis.max; + + // clip + if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max || + yrange.to < yrange.axis.min || yrange.from > yrange.axis.max) + continue; + + xrange.from = Math.max(xrange.from, xrange.axis.min); + xrange.to = Math.min(xrange.to, xrange.axis.max); + yrange.from = Math.max(yrange.from, yrange.axis.min); + yrange.to = Math.min(yrange.to, yrange.axis.max); + + if (xrange.from == xrange.to && yrange.from == yrange.to) + continue; + + // then draw + xrange.from = xrange.axis.p2c(xrange.from); + xrange.to = xrange.axis.p2c(xrange.to); + yrange.from = yrange.axis.p2c(yrange.from); + yrange.to = yrange.axis.p2c(yrange.to); + + if (xrange.from == xrange.to || yrange.from == yrange.to) { + // draw line + ctx.beginPath(); + ctx.strokeStyle = m.color || options.grid.markingsColor; + ctx.lineWidth = m.lineWidth || options.grid.markingsLineWidth; + ctx.moveTo(xrange.from, yrange.from); + ctx.lineTo(xrange.to, yrange.to); + ctx.stroke(); + } + else { + // fill area + ctx.fillStyle = m.color || options.grid.markingsColor; + ctx.fillRect(xrange.from, yrange.to, + xrange.to - xrange.from, + yrange.from - yrange.to); + } + } + } + + // draw the ticks + var axes = allAxes(), bw = options.grid.borderWidth; + + for (var j = 0; j < axes.length; ++j) { + var axis = axes[j], box = axis.box, + t = axis.tickLength, x, y, xoff, yoff; + if (!axis.show || axis.ticks.length == 0) + continue; + + ctx.strokeStyle = axis.options.tickColor || $.color.parse(axis.options.color).scale('a', 0.22).toString(); + ctx.lineWidth = 1; + + // find the edges + if (axis.direction == "x") { + x = 0; + if (t == "full") + y = (axis.position == "top" ? 0 : plotHeight); + else + y = box.top - plotOffset.top + (axis.position == "top" ? box.height : 0); + } + else { + y = 0; + if (t == "full") + x = (axis.position == "left" ? 0 : plotWidth); + else + x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0); + } + + // draw tick bar + if (!axis.innermost) { + ctx.beginPath(); + xoff = yoff = 0; + if (axis.direction == "x") + xoff = plotWidth; + else + yoff = plotHeight; + + if (ctx.lineWidth == 1) { + x = Math.floor(x) + 0.5; + y = Math.floor(y) + 0.5; + } + + ctx.moveTo(x, y); + ctx.lineTo(x + xoff, y + yoff); + ctx.stroke(); + } + + // draw ticks + ctx.beginPath(); + for (i = 0; i < axis.ticks.length; ++i) { + var v = axis.ticks[i].v; + + xoff = yoff = 0; + + if (v < axis.min || v > axis.max + // skip those lying on the axes if we got a border + || (t == "full" && bw > 0 + && (v == axis.min || v == axis.max))) + continue; + + if (axis.direction == "x") { + x = axis.p2c(v); + yoff = t == "full" ? -plotHeight : t; + + if (axis.position == "top") + yoff = -yoff; + } + else { + y = axis.p2c(v); + xoff = t == "full" ? -plotWidth : t; + + if (axis.position == "left") + xoff = -xoff; + } + + if (ctx.lineWidth == 1) { + if (axis.direction == "x") + x = Math.floor(x) + 0.5; + else + y = Math.floor(y) + 0.5; + } + + ctx.moveTo(x, y); + ctx.lineTo(x + xoff, y + yoff); + } + + ctx.stroke(); + } + + + // draw border + if (bw) { + ctx.lineWidth = bw; + ctx.strokeStyle = options.grid.borderColor; + ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw); + } + + ctx.restore(); + } + + function insertAxisLabels() { + placeholder.find(".tickLabels").remove(); + + var html = ['<div class="tickLabels" style="font-size:smaller">']; + + var axes = allAxes(); + for (var j = 0; j < axes.length; ++j) { + var axis = axes[j], box = axis.box; + if (!axis.show) + continue; + //debug: html.push('<div style="position:absolute;opacity:0.10;background-color:red;left:' + box.left + 'px;top:' + box.top + 'px;width:' + box.width + 'px;height:' + box.height + 'px"></div>') + html.push('<div class="' + axis.direction + 'Axis ' + axis.direction + axis.n + 'Axis" style="color:' + axis.options.color + '">'); + for (var i = 0; i < axis.ticks.length; ++i) { + var tick = axis.ticks[i]; + if (!tick.label || tick.v < axis.min || tick.v > axis.max) + continue; + + var pos = {}, align; + + if (axis.direction == "x") { + align = "center"; + pos.left = Math.round(plotOffset.left + axis.p2c(tick.v) - axis.labelWidth/2); + if (axis.position == "bottom") + pos.top = box.top + box.padding; + else + pos.bottom = canvasHeight - (box.top + box.height - box.padding); + } + else { + pos.top = Math.round(plotOffset.top + axis.p2c(tick.v) - axis.labelHeight/2); + if (axis.position == "left") { + pos.right = canvasWidth - (box.left + box.width - box.padding) + align = "right"; + } + else { + pos.left = box.left + box.padding; + align = "left"; + } + } + + pos.width = axis.labelWidth; + + var style = ["position:absolute", "text-align:" + align ]; + for (var a in pos) + style.push(a + ":" + pos[a] + "px") + + html.push('<div class="tickLabel" style="' + style.join(';') + '">' + tick.label + '</div>'); + } + html.push('</div>'); + } + + html.push('</div>'); + + placeholder.append(html.join("")); + } + + function drawSeries(series) { + if (series.lines.show) + drawSeriesLines(series); + if (series.bars.show) + drawSeriesBars(series); + if (series.points.show) + drawSeriesPoints(series); + } + + function drawSeriesLines(series) { + function plotLine(datapoints, xoffset, yoffset, axisx, axisy) { + var points = datapoints.points, + ps = datapoints.pointsize, + prevx = null, prevy = null; + + ctx.beginPath(); + for (var i = ps; i < points.length; i += ps) { + var x1 = points[i - ps], y1 = points[i - ps + 1], + x2 = points[i], y2 = points[i + 1]; + + if (x1 == null || x2 == null) + continue; + + // clip with ymin + if (y1 <= y2 && y1 < axisy.min) { + if (y2 < axisy.min) + continue; // line segment is outside + // compute new intersection point + x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.min; + } + else if (y2 <= y1 && y2 < axisy.min) { + if (y1 < axisy.min) + continue; + x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.min; + } + + // clip with ymax + if (y1 >= y2 && y1 > axisy.max) { + if (y2 > axisy.max) + continue; + x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.max; + } + else if (y2 >= y1 && y2 > axisy.max) { + if (y1 > axisy.max) + continue; + x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.max; + } + + // clip with xmin + if (x1 <= x2 && x1 < axisx.min) { + if (x2 < axisx.min) + continue; + y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.min; + } + else if (x2 <= x1 && x2 < axisx.min) { + if (x1 < axisx.min) + continue; + y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.min; + } + + // clip with xmax + if (x1 >= x2 && x1 > axisx.max) { + if (x2 > axisx.max) + continue; + y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.max; + } + else if (x2 >= x1 && x2 > axisx.max) { + if (x1 > axisx.max) + continue; + y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.max; + } + + if (x1 != prevx || y1 != prevy) + ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset); + + prevx = x2; + prevy = y2; + ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset); + } + ctx.stroke(); + } + + function plotLineArea(datapoints, axisx, axisy) { + var points = datapoints.points, + ps = datapoints.pointsize, + bottom = Math.min(Math.max(0, axisy.min), axisy.max), + i = 0, top, areaOpen = false, + ypos = 1, segmentStart = 0, segmentEnd = 0; + + // we process each segment in two turns, first forward + // direction to sketch out top, then once we hit the + // end we go backwards to sketch the bottom + while (true) { + if (ps > 0 && i > points.length + ps) + break; + + i += ps; // ps is negative if going backwards + + var x1 = points[i - ps], + y1 = points[i - ps + ypos], + x2 = points[i], y2 = points[i + ypos]; + + if (areaOpen) { + if (ps > 0 && x1 != null && x2 == null) { + // at turning point + segmentEnd = i; + ps = -ps; + ypos = 2; + continue; + } + + if (ps < 0 && i == segmentStart + ps) { + // done with the reverse sweep + ctx.fill(); + areaOpen = false; + ps = -ps; + ypos = 1; + i = segmentStart = segmentEnd + ps; + continue; + } + } + + if (x1 == null || x2 == null) + continue; + + // clip x values + + // clip with xmin + if (x1 <= x2 && x1 < axisx.min) { + if (x2 < axisx.min) + continue; + y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.min; + } + else if (x2 <= x1 && x2 < axisx.min) { + if (x1 < axisx.min) + continue; + y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.min; + } + + // clip with xmax + if (x1 >= x2 && x1 > axisx.max) { + if (x2 > axisx.max) + continue; + y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x1 = axisx.max; + } + else if (x2 >= x1 && x2 > axisx.max) { + if (x1 > axisx.max) + continue; + y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; + x2 = axisx.max; + } + + if (!areaOpen) { + // open area + ctx.beginPath(); + ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom)); + areaOpen = true; + } + + // now first check the case where both is outside + if (y1 >= axisy.max && y2 >= axisy.max) { + ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max)); + ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max)); + continue; + } + else if (y1 <= axisy.min && y2 <= axisy.min) { + ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min)); + ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min)); + continue; + } + + // else it's a bit more complicated, there might + // be a flat maxed out rectangle first, then a + // triangular cutout or reverse; to find these + // keep track of the current x values + var x1old = x1, x2old = x2; + + // clip the y values, without shortcutting, we + // go through all cases in turn + + // clip with ymin + if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) { + x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.min; + } + else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) { + x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.min; + } + + // clip with ymax + if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) { + x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y1 = axisy.max; + } + else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) { + x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; + y2 = axisy.max; + } + + // if the x value was changed we got a rectangle + // to fill + if (x1 != x1old) { + ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1)); + // it goes to (x1, y1), but we fill that below + } + + // fill triangular section, this sometimes result + // in redundant points if (x1, y1) hasn't changed + // from previous line to, but we just ignore that + ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1)); + ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); + + // fill the other rectangle if it's there + if (x2 != x2old) { + ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); + ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2)); + } + } + } + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + ctx.lineJoin = "round"; + + var lw = series.lines.lineWidth, + sw = series.shadowSize; + // FIXME: consider another form of shadow when filling is turned on + if (lw > 0 && sw > 0) { + // draw shadow as a thick and thin line with transparency + ctx.lineWidth = sw; + ctx.strokeStyle = "rgba(0,0,0,0.1)"; + // position shadow at angle from the mid of line + var angle = Math.PI/18; + plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis); + ctx.lineWidth = sw/2; + plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis); + } + + ctx.lineWidth = lw; + ctx.strokeStyle = series.color; + var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight); + if (fillStyle) { + ctx.fillStyle = fillStyle; + plotLineArea(series.datapoints, series.xaxis, series.yaxis); + } + + if (lw > 0) + plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis); + ctx.restore(); + } + + function drawSeriesPoints(series) { + function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) { + var points = datapoints.points, ps = datapoints.pointsize; + + for (var i = 0; i < points.length; i += ps) { + var x = points[i], y = points[i + 1]; + if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) + continue; + + ctx.beginPath(); + x = axisx.p2c(x); + y = axisy.p2c(y) + offset; + if (symbol == "circle") + ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false); + else + symbol(ctx, x, y, radius, shadow); + ctx.closePath(); + + if (fillStyle) { + ctx.fillStyle = fillStyle; + ctx.fill(); + } + ctx.stroke(); + } + } + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + var lw = series.points.lineWidth, + sw = series.shadowSize, + radius = series.points.radius, + symbol = series.points.symbol; + if (lw > 0 && sw > 0) { + // draw shadow in two steps + var w = sw / 2; + ctx.lineWidth = w; + ctx.strokeStyle = "rgba(0,0,0,0.1)"; + plotPoints(series.datapoints, radius, null, w + w/2, true, + series.xaxis, series.yaxis, symbol); + + ctx.strokeStyle = "rgba(0,0,0,0.2)"; + plotPoints(series.datapoints, radius, null, w/2, true, + series.xaxis, series.yaxis, symbol); + } + + ctx.lineWidth = lw; + ctx.strokeStyle = series.color; + plotPoints(series.datapoints, radius, + getFillStyle(series.points, series.color), 0, false, + series.xaxis, series.yaxis, symbol); + ctx.restore(); + } + + function drawBar(x, y, b, barLeft, barRight, offset, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) { + var left, right, bottom, top, + drawLeft, drawRight, drawTop, drawBottom, + tmp; + + // in horizontal mode, we start the bar from the left + // instead of from the bottom so it appears to be + // horizontal rather than vertical + if (horizontal) { + drawBottom = drawRight = drawTop = true; + drawLeft = false; + left = b; + right = x; + top = y + barLeft; + bottom = y + barRight; + + // account for negative bars + if (right < left) { + tmp = right; + right = left; + left = tmp; + drawLeft = true; + drawRight = false; + } + } + else { + drawLeft = drawRight = drawTop = true; + drawBottom = false; + left = x + barLeft; + right = x + barRight; + bottom = b; + top = y; + + // account for negative bars + if (top < bottom) { + tmp = top; + top = bottom; + bottom = tmp; + drawBottom = true; + drawTop = false; + } + } + + // clip + if (right < axisx.min || left > axisx.max || + top < axisy.min || bottom > axisy.max) + return; + + if (left < axisx.min) { + left = axisx.min; + drawLeft = false; + } + + if (right > axisx.max) { + right = axisx.max; + drawRight = false; + } + + if (bottom < axisy.min) { + bottom = axisy.min; + drawBottom = false; + } + + if (top > axisy.max) { + top = axisy.max; + drawTop = false; + } + + left = axisx.p2c(left); + bottom = axisy.p2c(bottom); + right = axisx.p2c(right); + top = axisy.p2c(top); + + // fill the bar + if (fillStyleCallback) { + c.beginPath(); + c.moveTo(left, bottom); + c.lineTo(left, top); + c.lineTo(right, top); + c.lineTo(right, bottom); + c.fillStyle = fillStyleCallback(bottom, top); + c.fill(); + } + + // draw outline + if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) { + c.beginPath(); + + // FIXME: inline moveTo is buggy with excanvas + c.moveTo(left, bottom + offset); + if (drawLeft) + c.lineTo(left, top + offset); + else + c.moveTo(left, top + offset); + if (drawTop) + c.lineTo(right, top + offset); + else + c.moveTo(right, top + offset); + if (drawRight) + c.lineTo(right, bottom + offset); + else + c.moveTo(right, bottom + offset); + if (drawBottom) + c.lineTo(left, bottom + offset); + else + c.moveTo(left, bottom + offset); + c.stroke(); + } + } + + function drawSeriesBars(series) { + function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) { + var points = datapoints.points, ps = datapoints.pointsize; + + for (var i = 0; i < points.length; i += ps) { + if (points[i] == null) + continue; + drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, offset, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth); + } + } + + ctx.save(); + ctx.translate(plotOffset.left, plotOffset.top); + + // FIXME: figure out a way to add shadows (for instance along the right edge) + ctx.lineWidth = series.bars.lineWidth; + ctx.strokeStyle = series.color; + var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2; + var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null; + plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, 0, fillStyleCallback, series.xaxis, series.yaxis); + ctx.restore(); + } + + function getFillStyle(filloptions, seriesColor, bottom, top) { + var fill = filloptions.fill; + if (!fill) + return null; + + if (filloptions.fillColor) + return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor); + + var c = $.color.parse(seriesColor); + c.a = typeof fill == "number" ? fill : 0.4; + c.normalize(); + return c.toString(); + } + + function insertLegend() { + placeholder.find(".legend").remove(); + + if (!options.legend.show) + return; + + var fragments = [], rowStarted = false, + lf = options.legend.labelFormatter, s, label; + for (var i = 0; i < series.length; ++i) { + s = series[i]; + label = s.label; + if (!label) + continue; + + if (i % options.legend.noColumns == 0) { + if (rowStarted) + fragments.push('</tr>'); + fragments.push('<tr>'); + rowStarted = true; + } + + if (lf) + label = lf(label, s); + + fragments.push( + '<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + s.color + ';overflow:hidden"></div></div></td>' + + '<td class="legendLabel">' + label + '</td>'); + } + if (rowStarted) + fragments.push('</tr>'); + + if (fragments.length == 0) + return; + + var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + '</table>'; + if (options.legend.container != null) + $(options.legend.container).html(table); + else { + var pos = "", + p = options.legend.position, + m = options.legend.margin; + if (m[0] == null) + m = [m, m]; + if (p.charAt(0) == "n") + pos += 'top:' + (m[1] + plotOffset.top) + 'px;'; + else if (p.charAt(0) == "s") + pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;'; + if (p.charAt(1) == "e") + pos += 'right:' + (m[0] + plotOffset.right) + 'px;'; + else if (p.charAt(1) == "w") + pos += 'left:' + (m[0] + plotOffset.left) + 'px;'; + var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder); + if (options.legend.backgroundOpacity != 0.0) { + // put in the transparent background + // separately to avoid blended labels and + // label boxes + var c = options.legend.backgroundColor; + if (c == null) { + c = options.grid.backgroundColor; + if (c && typeof c == "string") + c = $.color.parse(c); + else + c = $.color.extract(legend, 'background-color'); + c.a = 1; + c = c.toString(); + } + var div = legend.children(); + $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity); + } + } + } + + + // interactive features + + var highlights = [], + redrawTimeout = null; + + // returns the data item the mouse is over, or null if none is found + function findNearbyItem(mouseX, mouseY, seriesFilter) { + var maxDistance = options.grid.mouseActiveRadius, + smallestDistance = maxDistance * maxDistance + 1, + item = null, foundPoint = false, i, j; + + for (i = series.length - 1; i >= 0; --i) { + if (!seriesFilter(series[i])) + continue; + + var s = series[i], + axisx = s.xaxis, + axisy = s.yaxis, + points = s.datapoints.points, + ps = s.datapoints.pointsize, + mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster + my = axisy.c2p(mouseY), + maxx = maxDistance / axisx.scale, + maxy = maxDistance / axisy.scale; + + // with inverse transforms, we can't use the maxx/maxy + // optimization, sadly + if (axisx.options.inverseTransform) + maxx = Number.MAX_VALUE; + if (axisy.options.inverseTransform) + maxy = Number.MAX_VALUE; + + if (s.lines.show || s.points.show) { + for (j = 0; j < points.length; j += ps) { + var x = points[j], y = points[j + 1]; + if (x == null) + continue; + + // For points and lines, the cursor must be within a + // certain distance to the data point + if (x - mx > maxx || x - mx < -maxx || + y - my > maxy || y - my < -maxy) + continue; + + // We have to calculate distances in pixels, not in + // data units, because the scales of the axes may be different + var dx = Math.abs(axisx.p2c(x) - mouseX), + dy = Math.abs(axisy.p2c(y) - mouseY), + dist = dx * dx + dy * dy; // we save the sqrt + + // use <= to ensure last point takes precedence + // (last generally means on top of) + if (dist < smallestDistance) { + smallestDistance = dist; + item = [i, j / ps]; + } + } + } + + if (s.bars.show && !item) { // no other point can be nearby + var barLeft = s.bars.align == "left" ? 0 : -s.bars.barWidth/2, + barRight = barLeft + s.bars.barWidth; + + for (j = 0; j < points.length; j += ps) { + var x = points[j], y = points[j + 1], b = points[j + 2]; + if (x == null) + continue; + + // for a bar graph, the cursor must be inside the bar + if (series[i].bars.horizontal ? + (mx <= Math.max(b, x) && mx >= Math.min(b, x) && + my >= y + barLeft && my <= y + barRight) : + (mx >= x + barLeft && mx <= x + barRight && + my >= Math.min(b, y) && my <= Math.max(b, y))) + item = [i, j / ps]; + } + } + } + + if (item) { + i = item[0]; + j = item[1]; + ps = series[i].datapoints.pointsize; + + return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps), + dataIndex: j, + series: series[i], + seriesIndex: i }; + } + + return null; + } + + function onMouseMove(e) { + if (options.grid.hoverable) + triggerClickHoverEvent("plothover", e, + function (s) { return s["hoverable"] != false; }); + } + + function onMouseLeave(e) { + if (options.grid.hoverable) + triggerClickHoverEvent("plothover", e, + function (s) { return false; }); + } + + function onClick(e) { + triggerClickHoverEvent("plotclick", e, + function (s) { return s["clickable"] != false; }); + } + + // trigger click or hover event (they send the same parameters + // so we share their code) + function triggerClickHoverEvent(eventname, event, seriesFilter) { + var offset = eventHolder.offset(), + canvasX = event.pageX - offset.left - plotOffset.left, + canvasY = event.pageY - offset.top - plotOffset.top, + pos = canvasToAxisCoords({ left: canvasX, top: canvasY }); + + pos.pageX = event.pageX; + pos.pageY = event.pageY; + + var item = findNearbyItem(canvasX, canvasY, seriesFilter); + + if (item) { + // fill in mouse pos for any listeners out there + item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left); + item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top); + } + + if (options.grid.autoHighlight) { + // clear auto-highlights + for (var i = 0; i < highlights.length; ++i) { + var h = highlights[i]; + if (h.auto == eventname && + !(item && h.series == item.series && + h.point[0] == item.datapoint[0] && + h.point[1] == item.datapoint[1])) + unhighlight(h.series, h.point); + } + + if (item) + highlight(item.series, item.datapoint, eventname); + } + + placeholder.trigger(eventname, [ pos, item ]); + } + + function triggerRedrawOverlay() { + if (!redrawTimeout) + redrawTimeout = setTimeout(drawOverlay, 30); + } + + function drawOverlay() { + redrawTimeout = null; + + // draw highlights + octx.save(); + octx.clearRect(0, 0, canvasWidth, canvasHeight); + octx.translate(plotOffset.left, plotOffset.top); + + var i, hi; + for (i = 0; i < highlights.length; ++i) { + hi = highlights[i]; + + if (hi.series.bars.show) + drawBarHighlight(hi.series, hi.point); + else + drawPointHighlight(hi.series, hi.point); + } + octx.restore(); + + executeHooks(hooks.drawOverlay, [octx]); + } + + function highlight(s, point, auto) { + if (typeof s == "number") + s = series[s]; + + if (typeof point == "number") { + var ps = s.datapoints.pointsize; + point = s.datapoints.points.slice(ps * point, ps * (point + 1)); + } + + var i = indexOfHighlight(s, point); + if (i == -1) { + highlights.push({ series: s, point: point, auto: auto }); + + triggerRedrawOverlay(); + } + else if (!auto) + highlights[i].auto = false; + } + + function unhighlight(s, point) { + if (s == null && point == null) { + highlights = []; + triggerRedrawOverlay(); + } + + if (typeof s == "number") + s = series[s]; + + if (typeof point == "number") + point = s.data[point]; + + var i = indexOfHighlight(s, point); + if (i != -1) { + highlights.splice(i, 1); + + triggerRedrawOverlay(); + } + } + + function indexOfHighlight(s, p) { + for (var i = 0; i < highlights.length; ++i) { + var h = highlights[i]; + if (h.series == s && h.point[0] == p[0] + && h.point[1] == p[1]) + return i; + } + return -1; + } + + function drawPointHighlight(series, point) { + var x = point[0], y = point[1], + axisx = series.xaxis, axisy = series.yaxis; + + if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) + return; + + var pointRadius = series.points.radius + series.points.lineWidth / 2; + octx.lineWidth = pointRadius; + octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString(); + var radius = 1.5 * pointRadius, + x = axisx.p2c(x), + y = axisy.p2c(y); + + octx.beginPath(); + if (series.points.symbol == "circle") + octx.arc(x, y, radius, 0, 2 * Math.PI, false); + else + series.points.symbol(octx, x, y, radius, false); + octx.closePath(); + octx.stroke(); + } + + function drawBarHighlight(series, point) { + octx.lineWidth = series.bars.lineWidth; + octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString(); + var fillStyle = $.color.parse(series.color).scale('a', 0.5).toString(); + var barLeft = series.bars.align == "left" ? 0 : -series.bars.barWidth/2; + drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth, + 0, function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth); + } + + function getColorOrGradient(spec, bottom, top, defaultColor) { + if (typeof spec == "string") + return spec; + else { + // assume this is a gradient spec; IE currently only + // supports a simple vertical gradient properly, so that's + // what we support too + var gradient = ctx.createLinearGradient(0, top, 0, bottom); + + for (var i = 0, l = spec.colors.length; i < l; ++i) { + var c = spec.colors[i]; + if (typeof c != "string") { + var co = $.color.parse(defaultColor); + if (c.brightness != null) + co = co.scale('rgb', c.brightness) + if (c.opacity != null) + co.a *= c.opacity; + c = co.toString(); + } + gradient.addColorStop(i / (l - 1), c); + } + + return gradient; + } + } + } + + $.plot = function(placeholder, data, options) { + //var t0 = new Date(); + var plot = new Plot($(placeholder), data, options, $.plot.plugins); + //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime())); + return plot; + }; + + $.plot.version = "0.7"; + + $.plot.plugins = []; + + // returns a string with the date d formatted according to fmt + $.plot.formatDate = function(d, fmt, monthNames) { + var leftPad = function(n) { + n = "" + n; + return n.length == 1 ? "0" + n : n; + }; + + var r = []; + var escape = false, padNext = false; + var hours = d.getUTCHours(); + var isAM = hours < 12; + if (monthNames == null) + monthNames = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + + if (fmt.search(/%p|%P/) != -1) { + if (hours > 12) { + hours = hours - 12; + } else if (hours == 0) { + hours = 12; + } + } + for (var i = 0; i < fmt.length; ++i) { + var c = fmt.charAt(i); + + if (escape) { + switch (c) { + case 'h': c = "" + hours; break; + case 'H': c = leftPad(hours); break; + case 'M': c = leftPad(d.getUTCMinutes()); break; + case 'S': c = leftPad(d.getUTCSeconds()); break; + case 'd': c = "" + d.getUTCDate(); break; + case 'm': c = "" + (d.getUTCMonth() + 1); break; + case 'y': c = "" + d.getUTCFullYear(); break; + case 'b': c = "" + monthNames[d.getUTCMonth()]; break; + case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break; + case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break; + case '0': c = ""; padNext = true; break; + } + if (c && padNext) { + c = leftPad(c); + padNext = false; + } + r.push(c); + if (!padNext) + escape = false; + } + else { + if (c == "%") + escape = true; + else + r.push(c); + } + } + return r.join(""); + }; + + // round to nearby lower multiple of base + function floorInBase(n, base) { + return base * Math.floor(n / base); + } + +})(jQuery); diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/redbutton.css b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/redbutton.css new file mode 100644 index 0000000000..a70cf5e575 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/redbutton.css @@ -0,0 +1,3 @@ +.redButton { + background-color: red; +}
\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java b/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java index 1d98e35dd5..2f5c1177fa 100644 --- a/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java +++ b/tests/testbench/com/vaadin/tests/requesthandlers/AppResource404.java @@ -22,6 +22,7 @@ public class AppResource404 extends TestBase { addComponent(new Button("Remove existing resrouce", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { removeResource(resource); } diff --git a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java index 3d7379aafe..cb8963c3d4 100644 --- a/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java +++ b/tests/testbench/com/vaadin/tests/resources/DownloadLargeFileResource.java @@ -22,6 +22,7 @@ public class DownloadLargeFileResource extends TestBase { + String.format("%.1f", fileSize / 1024.0 / 1024.0) + "MB file", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { download(); } diff --git a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java index d3bbeef99a..b6dbcfca97 100644 --- a/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java +++ b/tests/testbench/com/vaadin/tests/resources/NonExistingFileResource.java @@ -22,6 +22,7 @@ public class NonExistingFileResource extends TestBase { Button b = new Button("Download " + filename); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { FileResource res = new FileResource(new File(getContext() .getBaseDirectory() + "/" + filename), diff --git a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java index 69fd0b2b81..8ab6ce153d 100644 --- a/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java +++ b/tests/testbench/com/vaadin/tests/resources/ResourceDownload.java @@ -17,6 +17,7 @@ public class ResourceDownload extends TestBase { public void setup() { Button b = new Button("Download (_new)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download("_new"); } @@ -24,6 +25,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Download (_blank)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download("_blank"); } @@ -31,6 +33,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Download ()", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download(""); } @@ -38,6 +41,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Download (_top)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { download("_top"); } @@ -45,6 +49,7 @@ public class ResourceDownload extends TestBase { addComponent(b); b = new Button("Test", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ResourceDownload.this.getMainWindow().showNotification( "Still working"); @@ -59,6 +64,7 @@ public class ResourceDownload extends TestBase { String filename = "filename"; StreamResource streamResource = new StreamResource(new StreamSource() { + @Override public InputStream getStream() { try { return new FileInputStream("FIXME C:/temp/file.xls"); diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.html b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.html new file mode 100644 index 0000000000..3d52356cab --- /dev/null +++ b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.html @@ -0,0 +1,107 @@ +<?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="http://localhost:8888/" /> +<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/com.vaadin.tests.serialization.SerializerTest?restartApplication</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[16]</td> + <td>1. sendBoolean: false, false, [false, false, true, false, true, true]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[15]</td> + <td>2. sendByte: 5, -12, [3, 1, 2]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[14]</td> + <td>3. sendChar: Å, ∫, [a, b, c, d]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[13]</td> + <td>4. sendInt: 2, 5, [2147483647, 0]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[12]</td> + <td>5. sendLong: -57841235865, 577431841358, [57, 0]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[11]</td> + <td>6. sendFloat: 1.0000001, 3.14159, [-12.0, 0.0, 57.0]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[10]</td> + <td>7. sendDouble: 0.423310825130748, 5.859874482048838, [2.0, 1.7976931348623157E308, 4.9E-324]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[9]</td> + <td>8. sendString: Taegghiiiinnrsssstt‡</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[8]</td> + <td>9. sendConnector: com.vaadin.tests.widgetset.server.SerializerTestExtension</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[7]</td> + <td>10. sendBean: ComplexTestBean [innerBean1=SimpleTestBean(1), innerBean2=SimpleTestBean(3), innerBeanCollection=[SimpleTestBean(6), SimpleTestBean(0)], privimite=6], SimpleTestBean(0), [SimpleTestBean(7)]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[6]</td> + <td>11. sendNull: null, Not null</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[5]</td> + <td>12. sendNestedArray: [[7, 5]], [[SimpleTestBean(2)], [SimpleTestBean(4)]]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[4]</td> + <td>13. sendList: [-234, 5, 8], class com.vaadin.tests.widgetset.server.SerializerTestExtension, class com.vaadin.tests.serialization.SerializerTest, [SimpleTestBean(-568), SimpleTestBean(234)]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[3]</td> + <td>14. sendArrayList: [[2], [2]], [[2, 1], [2, 3]], [[SimpleTestBean(7)]]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[2]</td> + <td>15. sendSet: [-12, -7, -4], class com.vaadin.tests.serialization.SerializerTest, [SimpleTestBean(2), SimpleTestBean(3)]</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[1]</td> + <td>16. sendMap: {a=null}, [com.vaadin.tests.widgetset.server.SerializerTestExtension=false], [2=com.vaadin.tests.widgetset.server.SerializerTestExtension], {SimpleTestBean(4)=SimpleTestBean(-4), SimpleTestBean(-5)=SimpleTestBean(5)}</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestsserializationSerializerTest::/VVerticalLayout[0]/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]</td> + <td>17. sendWrappedGenerics: {[SimpleTestBean(1)]={1=[SimpleTestBean(42)]}}</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java index d0b672fbf9..7c8aed1992 100644 --- a/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java +++ b/tests/testbench/com/vaadin/tests/serialization/SerializerTest.java @@ -15,8 +15,8 @@ import java.util.Map.Entry; import java.util.Set; import com.vaadin.annotations.Widgetset; +import com.vaadin.shared.Connector; import com.vaadin.terminal.WrappedRequest; -import com.vaadin.terminal.gwt.client.Connector; import com.vaadin.tests.components.AbstractTestRoot; import com.vaadin.tests.util.Log; import com.vaadin.tests.widgetset.client.ComplexTestBean; @@ -63,13 +63,12 @@ public class SerializerTest extends AbstractTestRoot { rpc.sendList(Arrays.asList(5, 8, -234), Arrays.<Connector> asList(this, testExtension), Arrays.asList(new SimpleTestBean(234), new SimpleTestBean(-568))); - // Disabled because of #8861 - // rpc.sendArrayList( - // Arrays.asList(new int[] { 1, 2 }, new int[] { 3, 4 }), - // Arrays.asList(new Integer[] { 5, 6 }, new Integer[] { 7, 8 }), - // Collections - // .singletonList(new SimpleTestBean[] { new SimpleTestBean( - // 7) })); + rpc.sendArrayList( + Arrays.asList(new int[] { 1, 2 }, new int[] { 3, 4 }), + Arrays.asList(new Integer[] { 5, 6 }, new Integer[] { 7, 8 }), + Collections + .singletonList(new SimpleTestBean[] { new SimpleTestBean( + 7) })); // Disabled because of #8861 // rpc.sendListArray( // new List[] { Arrays.asList(1, 2), Arrays.asList(3, 4) }, @@ -112,61 +111,73 @@ public class SerializerTest extends AbstractTestRoot { }); testExtension.registerRpc(new SerializerTestRpc() { + @Override public void sendBoolean(boolean value, Boolean boxedValue, boolean[] array) { log.log("sendBoolean: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendByte(byte value, Byte boxedValue, byte[] array) { log.log("sendByte: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendChar(char value, Character boxedValue, char[] array) { log.log("sendChar: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendInt(int value, Integer boxedValue, int[] array) { log.log("sendInt: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendLong(long value, Long boxedValue, long[] array) { log.log("sendLong: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendFloat(float value, Float boxedValue, float[] array) { log.log("sendFloat: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendDouble(double value, Double boxedValue, double[] array) { log.log("sendDouble: " + value + ", " + boxedValue + ", " + Arrays.toString(array)); } + @Override public void sendString(String value) { log.log("sendString: " + value); } + @Override public void sendConnector(Connector connector) { log.log("sendConnector: " + connector.getClass().getName()); } + @Override public void sendBean(ComplexTestBean complexBean, SimpleTestBean simpleBean, SimpleTestBean[] array) { log.log("sendBean: " + complexBean + ", " + simpleBean + ", " + Arrays.toString(array)); } + @Override public void sendNull(String value1, String value2) { log.log("sendNull: " + value1 + ", " + value2); } + @Override public void sendNestedArray(int[][] nestedIntArray, SimpleTestBean[][] nestedBeanArray) { log.log("sendNestedArray: " @@ -174,6 +185,7 @@ public class SerializerTest extends AbstractTestRoot { + Arrays.deepToString(nestedBeanArray)); } + @Override public void sendList(List<Integer> intList, List<Connector> connectorList, List<SimpleTestBean> beanList) { log.log("sendList: " + intList + ", " @@ -196,19 +208,24 @@ public class SerializerTest extends AbstractTestRoot { return string; } + @Override public void sendArrayList(List<int[]> primitiveArrayList, List<Integer[]> objectArrayList, List<SimpleTestBean[]> beanArrayList) { - log.log("sendArrayList: " + primitiveArrayList + ", " - + objectArrayList + ", " + beanArrayList); + log.log("sendArrayList: " + + Arrays.deepToString(primitiveArrayList.toArray()) + + ", " + Arrays.deepToString(objectArrayList.toArray()) + + ", " + Arrays.deepToString(beanArrayList.toArray())); } + @Override public void sendListArray(List<Integer>[] objectListArray, List<SimpleTestBean>[] beanListArray) { log.log("sendArrayList: " + Arrays.toString(objectListArray) + ", " + Arrays.toString(beanListArray)); } + @Override public void sendSet(Set<Integer> intSet, Set<Connector> connectorSet, Set<SimpleTestBean> beanSet) { log.log("sendSet: " + intSet + ", " @@ -216,6 +233,7 @@ public class SerializerTest extends AbstractTestRoot { + beanSet); } + @Override public void sendMap(Map<String, SimpleTestBean> stringMap, Map<Connector, Boolean> connectorMap, Map<Integer, Connector> intMap, @@ -252,6 +270,7 @@ public class SerializerTest extends AbstractTestRoot { + ", " + intMapString + ", " + beanMap); } + @Override public void sendWrappedGenerics( Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> generics) { log.log("sendWrappedGenerics: " + generics.toString()); diff --git a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java index cc275c18f4..a2d482dfbf 100644 --- a/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java +++ b/tests/testbench/com/vaadin/tests/themes/ButtonsTest.java @@ -35,6 +35,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { themeToggle = new CheckBox("Runo theme"); themeToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (getTheme() == "reindeer") { setTheme("runo"); @@ -49,6 +50,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { styleToggle = new CheckBox("Black style"); styleToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (!main.getContent().getStyleName().contains("black")) { main.getContent().setStyleName("black"); @@ -63,6 +65,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { iconToggle = new CheckBox("64x icons"); iconToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { largeIcons = !largeIcons; recreateAll(); @@ -74,6 +77,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { nativeToggle = new CheckBox("Native buttons"); nativeToggle.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { nativeButtons = !nativeButtons; recreateAll(); @@ -120,6 +124,7 @@ public class ButtonsTest extends com.vaadin.Application.LegacyApplication { main.addComponent(b); Button c = new Button("toggle enabled", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { b.setEnabled(!b.isEnabled()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java index fe9cb6e415..299c939043 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1225.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Alignment; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java index 872084d436..b1841b69ba 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1230.java @@ -32,6 +32,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(selectWithoutNullItem); Button b = new Button("Select NULL_PROPERTY", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select(NULL_ITEM_ID); printState(); @@ -41,6 +42,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(b); b = new Button("Select 1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select("1"); printState(); @@ -50,6 +52,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(b); b = new Button("Select 2", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select("2"); printState(); @@ -60,6 +63,7 @@ public class Ticket1230 extends Application.LegacyApplication { b = new Button("Select null", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithoutNullItem.select(null); printState(); @@ -79,6 +83,7 @@ public class Ticket1230 extends Application.LegacyApplication { selectWithNullItem.setCaption("Select with null item id"); Button b = new Button("Select NULL_PROPERTY", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select(NULL_ITEM_ID); printState(); @@ -89,6 +94,7 @@ public class Ticket1230 extends Application.LegacyApplication { b = new Button("Select 1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select("1"); printState(); @@ -98,6 +104,7 @@ public class Ticket1230 extends Application.LegacyApplication { layout.addComponent(b); b = new Button("Select 2", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select("2"); printState(); @@ -107,6 +114,7 @@ public class Ticket1230 extends Application.LegacyApplication { b = new Button("Select null", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { selectWithNullItem.select(null); printState(); @@ -118,6 +126,7 @@ public class Ticket1230 extends Application.LegacyApplication { w.addComponent(new Button("print select values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { printState(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java index 81a164d22e..8761db1cc3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket124.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket124.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -27,6 +27,7 @@ public class Ticket124 extends Application.LegacyApplication { tf = new TextField("Row nr"); Button insert = new Button("Insert row", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { insertRow(); @@ -34,6 +35,7 @@ public class Ticket124 extends Application.LegacyApplication { }); Button delete = new Button("Delete row", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { deleteRow(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java index b35d185811..7e9f5dab2c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1365.java @@ -33,10 +33,12 @@ public class Ticket1365 extends com.vaadin.Application.LegacyApplication new ShortcutAction("CTRL-S", ShortcutAction.KeyCode.S, new int[] { ShortcutAction.ModifierKey.CTRL }), }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { status.setValue("Pressed " + action.getCaption() + " to fire shortcut. Texfield value: " + f.getValue()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java index a1a5b449d1..92d3598382 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1368.java @@ -26,6 +26,7 @@ public class Ticket1368 extends Application.LegacyApplication { addColumn.setImmediate(true); addColumn.setNewItemsAllowed(true); addColumn.setNewItemHandler(new ComboBox.NewItemHandler() { + @Override public void addNewItem(String newItemCaption) { t.addContainerProperty(newItemCaption, String.class, "-"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java index dfccf31956..3ba7ae2bfa 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1397.java @@ -30,10 +30,12 @@ public class Ticket1397 extends Application.LegacyApplication { "fooTextField"); PopupView.Content content = new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(prop.getValue()); } + @Override public Component getPopupComponent() { return new TextField("Edit foo", prop); } @@ -56,6 +58,7 @@ public class Ticket1397 extends Application.LegacyApplication { public myButton() { super("Reverse the property"); this.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { StringBuffer getContents = prop2.getValue(); getContents.reverse(); @@ -68,10 +71,12 @@ public class Ticket1397 extends Application.LegacyApplication { final Panel panel2 = new Panel("Editor with a button"); panel2.addComponent(new myButton()); PopupView.Content content2 = new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(prop2.getValue()); } + @Override public Component getPopupComponent() { return panel2; } @@ -89,10 +94,12 @@ public class Ticket1397 extends Application.LegacyApplication { panel3.addComponent(tf2); PopupView.Content content3 = new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(op.getValue()); } + @Override public Component getPopupComponent() { return panel3; } @@ -113,10 +120,12 @@ public class Ticket1397 extends Application.LegacyApplication { final InlineDateField df = new InlineDateField("", new Date()); PopupView pp = new PopupView(new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return String.valueOf(df.getValue()); } + @Override public Component getPopupComponent() { return df; } @@ -130,11 +139,13 @@ public class Ticket1397 extends Application.LegacyApplication { + lineNum + " and see how the overview-version changes."); + @Override public String getMinimizedValueAsHTML() { return "" + String.valueOf(tf.getValue()).length() + " characters of info"; } + @Override public Component getPopupComponent() { return tf; } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java index c280be4e4a..438f7e2d5f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1435.java @@ -118,6 +118,7 @@ public class Ticket1435 extends Application.LegacyApplication { collapse.setStyleName("collapse"); collapse.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { if (useWorkaround) { container.setVisible(false); @@ -144,6 +145,7 @@ public class Ticket1435 extends Application.LegacyApplication { if (useWorkaround) { expand.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { container.setVisible(true); root.setHeight(lastHeight, lastHeightUnit); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java index 1af3b405e2..a597a5b242 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1444.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java index 9a777d655c..4b7d4201e0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1465ModalNotification.java @@ -23,6 +23,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { Button b = new Button("click to show notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification.show( "Try clicking the button in main window!", @@ -35,6 +36,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to warning notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification.show( "Try clicking the button in main window!", @@ -46,6 +48,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to Humanized notification", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification.show( "Try clicking the button in main window!", @@ -56,6 +59,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to test modality!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.addComponent(new Label("clicked")); @@ -68,6 +72,7 @@ public class Ticket1465ModalNotification extends Application.LegacyApplication { b = new Button("click to test modality!", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.addComponent(new Label("clicked")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java index 0c06a24df5..9835e046dc 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_Panel.java @@ -26,6 +26,7 @@ public class Ticket1506_Panel extends Panel { private Component initButton(final ObjectProperty<?> property) { Button button = new Button("Clear select"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { property.setValue(null); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java index 616e40d917..d6b53db7c7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer.java @@ -38,6 +38,7 @@ public class Ticket1506_TestContainer implements Container { items.put(ITEM_2_ID, item2); } + @Override public Item getItem(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -45,6 +46,7 @@ public class Ticket1506_TestContainer implements Container { return items.get(itemId); } + @Override public Collection<String> getContainerPropertyIds() { if (items.isEmpty()) { loadItems(); @@ -55,6 +57,7 @@ public class Ticket1506_TestContainer implements Container { return a; } + @Override public Collection<String> getItemIds() { if (items.isEmpty()) { loadItems(); @@ -65,6 +68,7 @@ public class Ticket1506_TestContainer implements Container { return a; } + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -76,6 +80,7 @@ public class Ticket1506_TestContainer implements Container { return null; } + @Override public Class<String> getType(Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -83,6 +88,7 @@ public class Ticket1506_TestContainer implements Container { return String.class; } + @Override public int size() { if (items.isEmpty()) { loadItems(); @@ -90,6 +96,7 @@ public class Ticket1506_TestContainer implements Container { return items.size(); } + @Override public boolean containsId(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -97,29 +104,35 @@ public class Ticket1506_TestContainer implements Container { return items.containsKey(itemId); } + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java index 863ce907da..7ac34dcd2e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1506_TestContainer2.java @@ -33,6 +33,7 @@ public class Ticket1506_TestContainer2 implements Container { } } + @Override public Item getItem(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -40,6 +41,7 @@ public class Ticket1506_TestContainer2 implements Container { return items.get(itemId); } + @Override public Collection<String> getContainerPropertyIds() { if (items.isEmpty()) { loadItems(); @@ -50,6 +52,7 @@ public class Ticket1506_TestContainer2 implements Container { return a; } + @Override public Collection<String> getItemIds() { if (items.isEmpty()) { loadItems(); @@ -57,6 +60,7 @@ public class Ticket1506_TestContainer2 implements Container { return items.keySet(); } + @Override public Property<?> getContainerProperty(Object itemId, Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -68,6 +72,7 @@ public class Ticket1506_TestContainer2 implements Container { return null; } + @Override public Class<String> getType(Object propertyId) { if (items.isEmpty()) { loadItems(); @@ -75,6 +80,7 @@ public class Ticket1506_TestContainer2 implements Container { return String.class; } + @Override public int size() { if (items.isEmpty()) { loadItems(); @@ -82,6 +88,7 @@ public class Ticket1506_TestContainer2 implements Container { return items.size(); } + @Override public boolean containsId(Object itemId) { if (items.isEmpty()) { loadItems(); @@ -89,29 +96,35 @@ public class Ticket1506_TestContainer2 implements Container { return items.containsKey(itemId); } + @Override public Item addItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public Object addItem() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeItem(Object itemId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean addContainerProperty(Object propertyId, Class<?> type, Object defaultValue) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeContainerProperty(Object propertyId) throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } + @Override public boolean removeAllItems() throws UnsupportedOperationException { throw new UnsupportedOperationException("Not implemented"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java index 614c471d3e..b9fd2debd5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1572.java @@ -35,6 +35,7 @@ public class Ticket1572 extends com.vaadin.Application.LegacyApplication { Button b = new Button("next margin state"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { nextMarginState(); } @@ -48,6 +49,7 @@ public class Ticket1572 extends com.vaadin.Application.LegacyApplication { Button b2 = new Button("next spacing state"); b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { nextSpacingState(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java index 1efea99a0e..6831d4c52d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1581.java @@ -52,6 +52,7 @@ public class Ticket1581 extends com.vaadin.Application.LegacyApplication { final Button stop = new Button("Stop updating", new ClickListener() { boolean active = true; + @Override public void buttonClick(ClickEvent event) { if (active) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java index 7aba886133..95cc918b6e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java @@ -50,6 +50,7 @@ class MyDynamicResource implements RequestHandler { * Returns null if the URI does not match. Otherwise returns a download * stream that contains the response from the server. */ + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java index 0faf9b8afb..5cb03e77af 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1598.java @@ -32,6 +32,7 @@ public class Ticket1598 extends Application.LegacyApplication { for (int i = 0; i < 5; i++) { first.addItem(new String("Submenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); } @@ -44,6 +45,7 @@ public class Ticket1598 extends Application.LegacyApplication { firstSubItem1.addItem(new String("Subsubmenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); @@ -56,6 +58,7 @@ public class Ticket1598 extends Application.LegacyApplication { firstSubItem2.addItem(new String("Subsubmenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); @@ -69,6 +72,7 @@ public class Ticket1598 extends Application.LegacyApplication { second.addItem(new String("Second submenu item" + i), null, new Command() { + @Override public void menuSelected(MenuItem selected) { main.showNotification("Action " + selected.getText()); @@ -82,6 +86,7 @@ public class Ticket1598 extends Application.LegacyApplication { for (int i = 2; i <= 3; i++) { (menuBar.getItems().get(i)).setCommand(new Command() { + @Override public void menuSelected(MenuItem selectedItem) { main.showNotification("Action " + selectedItem.getText()); } @@ -92,6 +97,7 @@ public class Ticket1598 extends Application.LegacyApplication { fourth.setText("Add new item"); fourth.setCommand(new Command() { + @Override public void menuSelected(MenuItem selected) { menuBar.addItem("Newborn", null, null); } @@ -108,6 +114,7 @@ public class Ticket1598 extends Application.LegacyApplication { // A command for removing the selected menuitem Command removeCommand = new Command() { + @Override public void menuSelected(MenuItem selected) { MenuItem parent = selected.getParent(); if (parent != null) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java index 1819076b32..b8bf8deb20 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket161.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket161.java @@ -27,6 +27,7 @@ public class Ticket161 extends Application.LegacyApplication { Button b = new Button("Truncate to 20 rows"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Container containerDataSource = t.getContainerDataSource(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java index 1774000355..43feab5ab7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1632.java @@ -45,6 +45,7 @@ public class Ticket1632 extends Application.LegacyApplication { b.addListener(new Button.ClickListener() { boolean visible = false; + @Override public void buttonClick(ClickEvent event) { visible = !visible; if (visible) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java index d78a1d78af..3c64a49316 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1659.java @@ -16,6 +16,7 @@ public class Ticket1659 extends Application.LegacyApplication { "Change URI using Application.getURL()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.open(new ExternalResource(getURL() + "#" + System.currentTimeMillis())); @@ -24,6 +25,7 @@ public class Ticket1659 extends Application.LegacyApplication { mainWin.addComponent(new Button("Change URI uring Window.getURL()", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.open(new ExternalResource(mainWin.getURL() + "#" + System.currentTimeMillis())); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java index 891cdf9f21..277096598e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1673.java @@ -14,6 +14,7 @@ public class Ticket1673 extends com.vaadin.Application.LegacyApplication { setMainWindow(main); main.addComponent(new Button("close", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { close(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java index 827879d3c6..01792aeb89 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1710.java @@ -279,6 +279,7 @@ public class Ticket1710 extends com.vaadin.Application.LegacyApplication { } Property.ValueChangeListener marginSpacingListener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateMarginsAndSpacing(); } @@ -343,6 +344,7 @@ public class Ticket1710 extends com.vaadin.Application.LegacyApplication { Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right"); Property.ValueChangeListener alignmentChangeListener = new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { updateAlignments(((Integer) hAlign.getValue()).intValue(), ((Integer) vAlign.getValue()).intValue()); @@ -372,6 +374,7 @@ public class Ticket1710 extends com.vaadin.Application.LegacyApplication { Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right"); lAlign.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { testPanelLayout.setComponentAlignment(testedLayout, ((Integer) lAlign.getValue()).intValue(), diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java index 7ca90904f8..2cbb648227 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1772.java @@ -24,6 +24,7 @@ public class Ticket1772 extends com.vaadin.Application.LegacyApplication { b.addListener(new Button.ClickListener() { int counter = 0; + @Override public void buttonClick(ClickEvent event) { gridLayout diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java index aed69056aa..63af96b1a2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1775.java @@ -27,6 +27,7 @@ public class Ticket1775 extends com.vaadin.Application.LegacyApplication { button2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { Label mainComponent = new Label("Main"); Label header = new Label("Header"); @@ -34,6 +35,7 @@ public class Ticket1775 extends com.vaadin.Application.LegacyApplication { layout.addComponent(mainComponent, "body"); layout.addComponent(header, "loginUser"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { layout.addComponent(anotherComponent, "body"); layout.removeComponent("loginUser"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java index d627d11e18..0a89675fc0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1804.java @@ -5,8 +5,8 @@ import java.util.LinkedList; import com.vaadin.data.Validator; import com.vaadin.data.util.MethodProperty; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.SystemError; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -91,6 +91,7 @@ public class Ticket1804 extends com.vaadin.Application.LegacyApplication { main.addComponent(checkValidity); checkValidity.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuffer msg = new StringBuffer(); for (Iterator<Select> i = listOfAllFields.iterator(); i @@ -136,6 +137,7 @@ public class Ticket1804 extends com.vaadin.Application.LegacyApplication { this.msg = msg; } + @Override public void validate(Object value) throws InvalidValueException { if (value == null || value.toString().length() == 0) { throw new InvalidValueException(msg); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java index d7eac667f0..a40f5b25b9 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1805.java @@ -30,6 +30,7 @@ public class Ticket1805 extends com.vaadin.Application.LegacyApplication { final TextField size = new TextField("Grid width in css unit"); size.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { String width = size.getValue().toString(); if (width == null || width.equals("")) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java index c47ea49697..2c979f4600 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1806.java @@ -25,18 +25,21 @@ public class Ticket1806 extends com.vaadin.Application.LegacyApplication { "This button does nothing (but flushes queued variable changes)")); main.addComponent(new Button("Commit the field to property", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { tf1.commit(); } })); main.addComponent(new Button("Show property value", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.showNotification("'" + prop.getValue() + "'"); } })); main.addComponent(new Button("Show field value", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.showNotification("'" + tf1.getValue() + "'"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java index d530c949e8..695be19300 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1811.java @@ -5,7 +5,7 @@ import java.util.LinkedList; import com.vaadin.data.Validator; import com.vaadin.data.validator.StringLengthValidator; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -56,6 +56,7 @@ public class Ticket1811 extends com.vaadin.Application.LegacyApplication { main.addComponent(checkValidity); checkValidity.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuffer msg = new StringBuffer(); for (Iterator<TextField> i = listOfAllFields.iterator(); i diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java index 8e5f107b17..42474d748d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1819.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.util.Iterator; import java.util.LinkedList; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -47,6 +47,7 @@ public class Ticket1819 extends com.vaadin.Application.LegacyApplication { main.addComponent(checkValidity); checkValidity.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { StringBuffer msg = new StringBuffer(); for (Iterator<Select> i = listOfAllFields.iterator(); i diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index 912f5ba02d..de91b04c1c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -29,6 +29,7 @@ public class Ticket1834PanelScrolling extends Button b = new Button("update"); currentState.addComponent(b); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { state.setValue("ScrollTop: " + p.getScrollTop() + " ScrollLeft: " + p.getScrollLeft()); @@ -38,6 +39,7 @@ public class Ticket1834PanelScrolling extends b = new Button("ScrollBy 50px"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setScrollLeft(p.getScrollLeft() + 50); p.setScrollTop(p.getScrollTop() + 50); @@ -52,6 +54,7 @@ public class Ticket1834PanelScrolling extends b.addListener(new ClickListener() { int i = 0; + @Override public void buttonClick(ClickEvent event) { p.addComponent(new Label("new Row" + ++i)); } @@ -61,6 +64,7 @@ public class Ticket1834PanelScrolling extends b = new Button("Repaint Panel"); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.requestRepaint(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java index 2af5bf9c85..4b546de0f6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1857.java @@ -41,6 +41,7 @@ public class Ticket1857 extends Application.LegacyApplication implements footer.addComponent(actionHandlerEnabler); actionHandlerEnabler.setImmediate(true); actionHandlerEnabler.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (actionHandlerEnabler.getValue().booleanValue()) { t.addActionHandler(Ticket1857.this); @@ -54,9 +55,11 @@ public class Ticket1857 extends Application.LegacyApplication implements footer.addComponent(cellStylesEnabler); cellStylesEnabler.setImmediate(true); cellStylesEnabler.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (cellStylesEnabler.getValue().booleanValue()) { t.setCellStyleGenerator(new Table.CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { Object cell = t.getContainerProperty(itemId, propertyId).getValue(); @@ -99,10 +102,12 @@ public class Ticket1857 extends Application.LegacyApplication implements private final Action removeAction = new Action("Remove"); + @Override public Action[] getActions(Object target, Object sender) { return new Action[] { removeAction }; } + @Override public void handleAction(Action action, Object sender, Object target) { getMainWindow().showNotification("Removing row number:" + target); ((Table) sender).removeItem(target); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java index 6072782dc3..0a8992c17f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1878.java @@ -52,6 +52,7 @@ public class Ticket1878 extends Application.LegacyApplication { switchToGridButton = new Button("Switch to GridLayout", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { changeLayout(switchToGridButton, gridLayout); } @@ -60,6 +61,7 @@ public class Ticket1878 extends Application.LegacyApplication { switchToOrderedButton = new Button("Switch to OrderedLayout", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { changeLayout(switchToOrderedButton, orderedLayout); } @@ -69,6 +71,7 @@ public class Ticket1878 extends Application.LegacyApplication { switchToFormsButton = new Button("Switch to Form", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { changeLayout(switchToFormsButton, formLayout); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java index fdbecf8eae..9fe8ccd801 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1900.java @@ -24,6 +24,7 @@ public class Ticket1900 extends Application.LegacyApplication { f[i].setRequired(true); main.addComponent(f[i]); f[i].addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("Validity test", "Testcase " + j + " is " + (f[j].isValid() ? "valid" : "invalid")); @@ -60,6 +61,7 @@ public class Ticket1900 extends Application.LegacyApplication { this.c = c; } + @Override public void validate(Object value) throws InvalidValueException { if (value == null || !value.toString().contains(c)) { throw new InvalidValueException("Value does not contain " + c); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java index 68a2eaa2bc..75a2aafb96 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1919.java @@ -48,6 +48,7 @@ public class Ticket1919 extends com.vaadin.Application.LegacyApplication { p.setSizeFull(); Button b = new Button("toggle Values", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggleStyleName(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java index c0a1c7d2c9..416bb80875 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1921.java @@ -30,6 +30,7 @@ public class Ticket1921 extends Application.LegacyApplication implements inner = new VerticalLayout(); outer.addComponent(inner); button = new Button("foo", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { newState(); } @@ -92,6 +93,7 @@ public class Ticket1921 extends Application.LegacyApplication implements } } + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java index d24cace2c9..48d8ff458c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1939.java @@ -26,6 +26,7 @@ public class Ticket1939 extends Application.LegacyApplication { w.addComponent(new Button("show me the bug", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { l.setWidth(null); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java index aed322ca4d..2a29113829 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1969.java @@ -46,6 +46,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { b = new Button( "change introduction caption (should add * to tab name)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { testContent.setCaption(testContent.getCaption() + "*"); } @@ -54,6 +55,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { b = new Button("change tab caption (should add * to tab name)", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { actions.setCaption(actions.getCaption() + "*"); } @@ -64,6 +66,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { final UserError e = new UserError("Test error"); b = new Button("Toggle error", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (testContent.getComponentError() == null) { testContent.setComponentError(e); @@ -75,6 +78,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { actions.addComponent(b); b = new Button("Change table caption", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { t.setCaption(t.getCaption() + "*"); } @@ -82,6 +86,7 @@ public class Ticket1969 extends com.vaadin.Application.LegacyApplication { actions.addComponent(b); b = new Button("Toggle Table error", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (t.getComponentError() == null) { t.setComponentError(e); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java index 3c5822fbda..f9f098a05a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1970.java @@ -3,7 +3,7 @@ package com.vaadin.tests.tickets; import java.util.Iterator; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -38,6 +38,7 @@ public class Ticket1970 extends Application.LegacyApplication { w.addComponent(new Button("Show open windows", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String openWindows = ""; for (Iterator<LegacyWindow> i = getWindows().iterator(); i @@ -57,6 +58,7 @@ public class Ticket1970 extends Application.LegacyApplication { final LegacyWindow w = new LegacyWindow(); w.addComponent(new Button("Show the name of the application", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.showNotification("Name of this window = " + w.getName()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java index d4b1345eb1..24d11e6569 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973.java @@ -30,6 +30,7 @@ public class Ticket1973 extends com.vaadin.Application.LegacyApplication { Button refreshTable = new Button("Change table container"); refreshTable.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent e) { table.setContainerDataSource(container2); table.setContainerDataSource(container1); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java index d43aac9da0..68307f7f99 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1973_2.java @@ -31,6 +31,7 @@ public class Ticket1973_2 extends Application.LegacyApplication { Button refreshTable = new Button("Change table container"); refreshTable.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent e) { table.setContainerDataSource(container2); table.setContainerDataSource(container1); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java index d908cc567c..e959098765 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java @@ -38,6 +38,7 @@ public class Ticket1975 extends Application.LegacyApplication { layout.addComponent(new Button("Disable/Enable", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { boolean e = cl1.isEnabled(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java index 431c3a6b99..fe0b636c56 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1982.java @@ -62,6 +62,7 @@ public class Ticket1982 extends Application.LegacyApplication { min.setVisible(false); max.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { min.setVisible(true); max.setVisible(false); @@ -71,6 +72,7 @@ public class Ticket1982 extends Application.LegacyApplication { } }); min.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { min.setVisible(false); max.setVisible(true); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java index 5bd0cd2ae6..4deb5020ab 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1983.java @@ -83,6 +83,7 @@ public class Ticket1983 extends Application.LegacyApplication { Button button = new Button("Change col value to short"); button.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { // Change the column value to a short one --> Should remove // the scrollbar @@ -117,6 +118,7 @@ public class Ticket1983 extends Application.LegacyApplication { CheckBox checkBox = new CheckBox("Two col"); checkBox.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) event.getProperty().getValue()) { table.setVisibleColumns(new Object[] { propId, propId2 }); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java index 23f377e89e..2aaacef448 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1995.java @@ -40,6 +40,7 @@ public class Ticket1995 extends Application.LegacyApplication { mainWin.addComponent(new Button("Add item", new com.vaadin.ui.Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { addItem(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java index 5c4779e69e..061fc0cf16 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket20.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket20.java @@ -38,6 +38,7 @@ public class Ticket20 extends Application.LegacyApplication { } } + @Override public void validate(Object value) throws InvalidValueException { if (!isValid(value)) { throw new InvalidValueException(value @@ -49,6 +50,7 @@ public class Ticket20 extends Application.LegacyApplication { v2.addValidator(v); v2.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { if (!"".equals("" + value)) { throw new InvalidValueException("Value is not empty string"); @@ -69,6 +71,7 @@ public class Ticket20 extends Application.LegacyApplication { mainWin.addComponent(new Button("Validate integer", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { mainWin.showNotification("The field is " diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java index a14c881b85..8c7a7ba659 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2001.java @@ -22,6 +22,7 @@ public class Ticket2001 extends Application.LegacyApplication { final CheckBox b = new CheckBox("fixed width: 30px", false); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) b.getValue()) { l.setWidth("30px"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java index 6700267a25..e0b8635f32 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2007.java @@ -17,6 +17,7 @@ public class Ticket2007 extends Application.LegacyApplication { setMainWindow(main); main.addComponent(new Button("Open another (non-main) window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { LegacyWindow c = new LegacyWindow( "Non-main browser window " + (++childs)); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java index 7667d6190b..68cf5ef6d4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2009.java @@ -40,6 +40,7 @@ public class Ticket2009 extends com.vaadin.Application.LegacyApplication { final VerticalLayout events = new VerticalLayout(); t.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { events.addComponent(new Label(new Label("Click:" + (event.isDoubleClick() ? "double" : "single") @@ -62,6 +63,7 @@ public class Ticket2009 extends com.vaadin.Application.LegacyApplication { .getTestTable(5, 100); table.setRowHeaderMode(Table.ROW_HEADER_MODE_ID); table.addListener(new ItemClickEvent.ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { events2.addComponent(new Label("Click:" + (event.isDoubleClick() ? "double" : "single") @@ -115,6 +117,7 @@ public class Ticket2009 extends com.vaadin.Application.LegacyApplication { getMainWindow().addWindow(this); done.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().removeWindow(PropertyEditor.this); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java index 538ebc4ccd..8d9a5e67d4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2014.java @@ -33,6 +33,7 @@ public class Ticket2014 extends Application.LegacyApplication { layout.addComponent(new Button("Change class name", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { b1.setStyleName(UUID.randomUUID().toString()); } @@ -51,6 +52,7 @@ public class Ticket2014 extends Application.LegacyApplication { b1 = new Button("Button inside orderedLayout", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { System.out.println("Clicked " + event.getButton().getCaption()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java index cab8fc261c..c36bb5c25e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2021.java @@ -111,6 +111,7 @@ public class Ticket2021 extends Application.LegacyApplication { Button b = new Button("Enable/disable caption and watch button move", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { System.out.println("Enable/disable caption"); for (AbstractComponent l : new AbstractComponent[] { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java index 238561ef47..427a55391b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2023.java @@ -31,6 +31,7 @@ public class Ticket2023 extends com.vaadin.Application.LegacyApplication gl.addComponent(new Button("null", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { c.setWidth(null); c.setHeight(null); @@ -43,6 +44,7 @@ public class Ticket2023 extends com.vaadin.Application.LegacyApplication } + @Override public void buttonClick(ClickEvent event) { c.setWidth(event.getButton().getCaption()); c.setHeight(event.getButton().getCaption()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java index 1eadd3d7bd..8acf4f1d16 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2029.java @@ -81,6 +81,7 @@ public class Ticket2029 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { Component c = ((Component) event.getProperty()); c.setCaption("askfdj"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java index 86d9cf6d40..c979898299 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2037.java @@ -25,6 +25,7 @@ public class Ticket2037 extends com.vaadin.Application.LegacyApplication { main.addComponent(lo); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { repopupate(lo); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java index a5c102b988..fa4cd76f47 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2038.java @@ -21,6 +21,7 @@ public class Ticket2038 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { w.showNotification("TextField is " + (tf.isValid() ? "" : "in") + "valid, with error: " + tf.getErrorMessage(), @@ -35,6 +36,7 @@ public class Ticket2038 extends Application.LegacyApplication { w.addComponent(b); b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequiredError((Boolean) b.getValue() ? "Field must not be empty" : null); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java index c4eded63d7..d79f4a1bd6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2042.java @@ -26,6 +26,7 @@ public class Ticket2042 extends Application.LegacyApplication { layout.addComponent(new Label("abc")); layout.addComponent(new Button("B", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Notification n = new Notification("Test"); getMainWindow().showNotification(n); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java index 84978a42e1..0b5a537b4d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2048.java @@ -71,6 +71,7 @@ public class Ticket2048 extends Application.LegacyApplication { "Replace image with new embedded component (flashes)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Embedded newEmbedded = new Embedded(null, new ThemeResource("icons/64/folder-add.png")); @@ -85,6 +86,7 @@ public class Ticket2048 extends Application.LegacyApplication { b = new Button("Change image source (is fine)", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { String img = "folder-add"; if (((ThemeResource) embedded.getSource()).getResourceId() diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java index 751dbbae01..fd64d6e35a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2053.java @@ -25,6 +25,7 @@ public class Ticket2053 extends Application.LegacyApplication { + "draw changes not originating from this window. Such changes include changes " + "made by other browser-windows."); Button add = new Button("Add a window", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { final String name = "Child " + (++childs); LegacyWindow c = new LegacyWindow(name); @@ -35,6 +36,7 @@ public class Ticket2053 extends Application.LegacyApplication { final TextField tf = new TextField("Non immediate textfield"); c.addComponent(tf); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.addComponent(new Label(name + " send text:" + tf.getValue())); @@ -44,6 +46,7 @@ public class Ticket2053 extends Application.LegacyApplication { final String caption = "Slow button " + i; c.addComponent(new Button(caption, new Button.ClickListener() { + @Override public synchronized void buttonClick( ClickEvent event) { try { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java index b47fbc8818..1d7d8bb006 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2060.java @@ -31,6 +31,7 @@ public class Ticket2060 extends Application.LegacyApplication { button2 = new Button("Button without width"); button3 = new Button("Click to repaint buttons", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { button1.requestRepaint(); button2.requestRepaint(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java index 0881d141cb..1f633d7337 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061.java @@ -95,6 +95,7 @@ public class Ticket2061 extends Application.LegacyApplication { return columns; } + @Override public void valueChange(ValueChangeEvent event) { } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java index 98badf36e8..e3cd09926e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061b.java @@ -148,6 +148,7 @@ public class Ticket2061b extends Application.LegacyApplication implements return columns; } + @Override public void valueChange(ValueChangeEvent event) { } @@ -192,6 +193,7 @@ public class Ticket2061b extends Application.LegacyApplication implements } } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { p.setScrollTop(10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java index a8188a4913..082b956fe0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2061c.java @@ -111,6 +111,7 @@ public class Ticket2061c extends Application.LegacyApplication implements return columns; } + @Override public void valueChange(ValueChangeEvent event) { } @@ -140,6 +141,7 @@ public class Ticket2061c extends Application.LegacyApplication implements } } + @Override public void selectedTabChange(SelectedTabChangeEvent event) { p.setScrollTop(10); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java index b4171b9bac..2042cf7cad 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2090.java @@ -27,6 +27,7 @@ public class Ticket2090 extends Application.LegacyApplication { w.addComponent(label); w.addComponent(target); height.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { target.setHeight(height.getValue()); @@ -38,6 +39,7 @@ public class Ticket2090 extends Application.LegacyApplication { } }); width.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { try { target.setWidth(width.getValue()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java index 6278f7d4df..0f0c00b05c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2099.java @@ -30,6 +30,7 @@ public class Ticket2099 extends Application.LegacyApplication { private void createUI(GridLayout layout) { Button b = new Button("Show popup", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addWindow(popup); // popup.setVisible(true); @@ -42,6 +43,7 @@ public class Ticket2099 extends Application.LegacyApplication { layout.addComponent(b); layout.addComponent(new Button("Hide label '222'", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { l2.setVisible(!l2.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java index b40035a189..b8a6724a41 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2104.java @@ -6,8 +6,8 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.MethodProperty; import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -52,6 +52,7 @@ public class Ticket2104 extends Application.LegacyApplication { cb = new CheckBox("icon"); cb.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if (tree.getItemIconPropertyId() == null) { tree.setItemIconPropertyId("icon"); @@ -82,6 +83,7 @@ public class Ticket2104 extends Application.LegacyApplication { "http://www.itmill.com/res/images/itmill_logo.gif")); tree.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { getMainWindow().addComponent( new Label(event.toString() + " // " + event.getItemId() @@ -117,6 +119,7 @@ public class Ticket2104 extends Application.LegacyApplication { table.addItem("Item " + i); } table.addListener(new ItemClickListener() { + @Override public void itemClick(ItemClickEvent event) { getMainWindow().addComponent( new Label(event.toString() + " // " + event.getItemId() diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java index 0776f6c4a6..6edc625b39 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2106.java @@ -27,6 +27,7 @@ public class Ticket2106 extends Application.LegacyApplication { setMainWindow(new LegacyWindow("#2106")); getMainWindow().addComponent( new Button("Do nothing", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { getMainWindow().addComponent( new Label("Last time did nothing: " diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java index 57926143eb..09ba9fac0b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2107.java @@ -23,6 +23,7 @@ public class Ticket2107 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { w.showNotification("TextField is " + (tf.isValid() ? "" : "in") + "valid, with error: " + tf.getErrorMessage(), @@ -31,6 +32,7 @@ public class Ticket2107 extends Application.LegacyApplication { }); tf.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { if (value == null || value.toString().length() <= 3) { throw new InvalidValueException( @@ -46,6 +48,7 @@ public class Ticket2107 extends Application.LegacyApplication { w.addComponent(b); b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequiredError(b.getValue() ? "Field must not be empty" : null); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java index 933494f78a..8bbfe0cd07 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2117.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; @@ -39,6 +39,7 @@ public class Ticket2117 extends Application.LegacyApplication { w.addComponent(new Label("It has also been redirected to " + w.getURL() + " to support reloading")); w.addComponent(new Button("button", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.showNotification("Button clicked"); w.addComponent(new Label("clicked")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java index 34054e09d1..b563ec90ef 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2119.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.ExternalResource; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; @@ -74,6 +74,7 @@ public class Ticket2119 extends Application.LegacyApplication { layout.addComponent(select); globalValue.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(Property.ValueChangeEvent event) { Object value = event.getProperty().getValue(); valueProperty.setValue((null != value) ? value.toString() @@ -83,6 +84,7 @@ public class Ticket2119 extends Application.LegacyApplication { final Button changeValueButton = new Button("Change Value to 2"); changeValueButton.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { globalValue.setValue("2"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java index cc81c787b2..b12a865e80 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2125.java @@ -34,12 +34,14 @@ public class Ticket2125 extends Application.LegacyApplication { table.addContainerProperty("String", String.class, "a string"); table.addContainerProperty("Boolean", Boolean.class, Boolean.TRUE); table.addGeneratedColumn("Generated", new ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { return new Label("Item " + itemId); } }); table.setCellStyleGenerator(new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if (new Integer(4).equals(itemId)) { if (propertyId == null) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java index abcca6d59c..c9e070bef4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2126.java @@ -46,6 +46,7 @@ public class Ticket2126 extends com.vaadin.Application.LegacyApplication { refreshTable.addListener(new Button.ClickListener() { boolean full = true; + @Override public void buttonClick(Button.ClickEvent e) { if (full) { table.setContainerDataSource(container2); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java index ba4dd2ee46..31e1a9a0d6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2179.java @@ -25,6 +25,7 @@ public class Ticket2179 extends Application.LegacyApplication { f.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("Test field is " + (f.isValid() ? "valid" : "invalid")); @@ -40,6 +41,7 @@ public class Ticket2179 extends Application.LegacyApplication { this.c = c; } + @Override public void validate(Object value) throws InvalidValueException { if (value == null || !value.toString().contains(c)) { throw new InvalidValueException("Value does not contain " + c); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java index c3219102f6..44893eb531 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2181.java @@ -70,6 +70,7 @@ public class Ticket2181 extends Application.LegacyApplication implements return options; } + @Override public void buttonClick(ClickEvent event) { if (event.getButton() == setButton) { set(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java index eef13ca06c..4caba62df2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2204.java @@ -71,6 +71,7 @@ public class Ticket2204 extends Application.LegacyApplication { Button b = new Button("Show area", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { showHide(); } @@ -80,6 +81,7 @@ public class Ticket2204 extends Application.LegacyApplication { b = new Button("Show tab", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { showTab(); } @@ -128,6 +130,7 @@ public class Ticket2204 extends Application.LegacyApplication { Form f = (Form) cc; f.setFormFieldFactory(new FormFieldFactory() { + @Override public Field<?> createField(Item item, Object propertyId, Component uiContext) { formTextArea = new RichTextArea(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java index ada9471f18..3f0f35bb84 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2208.java @@ -25,6 +25,7 @@ public class Ticket2208 extends Application.LegacyApplication { t.setHeight("150px"); t.addGeneratedColumn("col 3 (green)", new ColumnGenerator() { + @Override public Component generateCell(Table source, Object itemId, Object columnId) { Item item = source.getItem(itemId); @@ -38,6 +39,7 @@ public class Ticket2208 extends Application.LegacyApplication { t.addContainerProperty("col 4", String.class, ""); t.setCellStyleGenerator(new CellStyleGenerator() { + @Override public String getStyle(Object itemId, Object propertyId) { if ("col 1 (red)".equals(propertyId)) { return "red"; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java index 5ba69895b6..a387781ae3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209.java @@ -31,6 +31,7 @@ public class Ticket2209 extends Application.LegacyApplication { Button b = new Button("Add label text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { labelLong.setValue(labelLong.getValue() + "-12345"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java index 4a45709ef6..226df8b5e7 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL.java @@ -38,6 +38,7 @@ public class Ticket2209OL extends Application.LegacyApplication { Button b = new Button("Add label text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { labelLong.setValue(labelLong.getValue() + "-12345"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java index e2e51d8101..921f3b190b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2209OL2.java @@ -44,6 +44,7 @@ public class Ticket2209OL2 extends Application.LegacyApplication { Button b = new Button("Add label text", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { labelLong.setValue(labelLong.getValue() + "-12345"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java index 2b7d5ef6d1..886aa376c3 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2221.java @@ -46,6 +46,7 @@ public class Ticket2221 extends Application.LegacyApplication { Button b = new Button("Switch textfield/panel", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Component visible = tf; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java index f33d2f7ea8..c777d0772f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2240.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Root.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java index 15b2b630a5..4b44ed1a87 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2242.java @@ -33,6 +33,7 @@ public class Ticket2242 extends Application.LegacyApplication implements Button b = new Button("Change container datasource", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { for (int i = 0; i < 5; i++) { t.setContainerDataSource(createContainer()); @@ -71,6 +72,7 @@ public class Ticket2242 extends Application.LegacyApplication implements return ic; } + @Override public void valueChange(ValueChangeEvent event) { System.out.println("Value change from " + tableValue + " to " + t.getValue()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java index 8540960b30..a360760039 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2244.java @@ -33,6 +33,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new item", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(new BeanItem<MyBean>(new MyBean())); @@ -42,6 +43,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new bigger item", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setItemDataSource(new BeanItem<MyBean>( new MyBiggerBean())); @@ -52,6 +54,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new grid layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setLayout(new GridLayout()); @@ -61,6 +64,7 @@ public class Ticket2244 extends Application.LegacyApplication { w.addComponent(new Button("new form layout", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.setLayout(new FormLayout()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java index cf1d2f64d2..b5d6772e7f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2267.java @@ -21,6 +21,7 @@ public class Ticket2267 extends Application.LegacyApplication { Button button = new Button("1", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { Button b = event.getButton(); l.setValue(l.getValue() + b.getCaption()); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java index 67fe3f9846..c72b4e15ff 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2282.java @@ -38,6 +38,7 @@ public class Ticket2282 extends Application.LegacyApplication { Button b = new Button("Swap", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (layout1.getWidth() < 0.0) { layout1.setWidth("500px"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java index a4664989ec..716c8af0db 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2287.java @@ -2,7 +2,7 @@ package com.vaadin.tests.tickets; import java.net.URL; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Root.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java index 4cd421e30d..0ad023450c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2289.java @@ -25,6 +25,7 @@ public class Ticket2289 extends Application.LegacyApplication { w.setContent(ol); Button b = new Button("close current tab"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeCurrentTab(); @@ -34,6 +35,7 @@ public class Ticket2289 extends Application.LegacyApplication { b = new Button("close first tab"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { closeFirstTab(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java index a413e87110..35e9b8f2c5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java @@ -47,6 +47,7 @@ public class Ticket2292 extends com.vaadin.Application.LegacyApplication addRequestHandler(this); } + @Override public boolean handleRequest(Application application, WrappedRequest request, WrappedResponse response) throws IOException { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java index 264ce9b5fc..b767b3661f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2304.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.Root.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java index 36bda7095c..1cad5bde4f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2310.java @@ -34,6 +34,7 @@ public class Ticket2310 extends Application.LegacyApplication { b.addListener(new Button.ClickListener() { int i = 0; + @Override public void buttonClick(ClickEvent event) { l.setValue("foobar " + i++); @@ -43,6 +44,7 @@ public class Ticket2310 extends Application.LegacyApplication { Button b2 = new Button("toggle panel visibility"); b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { p.setVisible(!p.isVisible()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java index f1906d1492..f583a4af4b 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2329.java @@ -34,6 +34,7 @@ public class Ticket2329 extends Application.LegacyApplication { } class TestColumnGenerator implements ColumnGenerator { + @Override public Component generateCell(Table source, Object rowId, Object columnId) { return new Button("1"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java index f71492a96b..f0cae1a59f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2337.java @@ -17,6 +17,7 @@ public class Ticket2337 extends Application.LegacyApplication { setMainWindow(w); Button b = new Button("add", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gl.addComponent(new Label("asd"), 0, gl.getCursorY(), 2, gl.getCursorY()); @@ -28,6 +29,7 @@ public class Ticket2337 extends Application.LegacyApplication { b = new Button("empty", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { gl.removeAllComponents(); ; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java index 207d6ee413..5528dfebd6 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2347.java @@ -25,6 +25,7 @@ public class Ticket2347 extends Application.LegacyApplication { b1 = new Button("200px button"); b1.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (b1.getWidth() == 200.0) { b1.setWidth("300px"); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java index 19d473f970..252406cc2d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2365.java @@ -25,6 +25,7 @@ public class Ticket2365 extends Application.LegacyApplication { Button b = new Button("Toggle parent level size"); lo.addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { if (p.getWidth() > 0) { p.setSizeUndefined(); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java index a121d93099..0036bdc7b2 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2406.java @@ -33,6 +33,7 @@ public class Ticket2406 extends Application.LegacyApplication { b.setSizeFull(); b.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { w.setHeight("200px"); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java index 0514e9bb39..509f4cf437 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2415.java @@ -19,6 +19,7 @@ public class Ticket2415 extends Application.LegacyApplication { tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("New value = " + tf); } @@ -30,6 +31,7 @@ public class Ticket2415 extends Application.LegacyApplication { tf2.setImmediate(true); tf2.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { main.showNotification("New value = " + tf2); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java index 7866d031ed..40862e3ccd 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2426.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Root.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java index b751488bae..f6e6c1e7b5 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2431.java @@ -30,10 +30,12 @@ public class Ticket2431 extends Application.LegacyApplication { Action[] actions = new Action[] { a1, a2 }; + @Override public Action[] getActions(Object target, Object sender) { return actions; } + @Override public void handleAction(Action action, Object sender, Object target) { if (action == a1) { getMainWindow().addComponent(new Label("CTRL X hit")); diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java index fc6445d62f..f48cf7a79a 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2436.java @@ -15,16 +15,19 @@ public class Ticket2436 extends Application.LegacyApplication { final Button remover = new Button("Remove PopupView"); final PopupView pv = new PopupView(new PopupView.Content() { + @Override public String getMinimizedValueAsHTML() { return "PopupView"; } + @Override public Component getPopupComponent() { return remover; } }); remover.addListener(new Button.ClickListener() { + @Override public void buttonClick(Button.ClickEvent event) { main.removeComponent(pv); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java index 8123fe1182..97d096405e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2526.java @@ -14,6 +14,7 @@ public class Ticket2526 extends Application.LegacyApplication { setMainWindow(main); Button b = new Button("Add windows"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { main.addWindow(new Window()); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java index a3ff6808dc..ee60c0ce7e 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2998.java @@ -174,6 +174,7 @@ public class Ticket2998 extends Application.LegacyApplication { if (propertyId.equals("kilometers")) { f.setWidth("4em"); f.addValidator(new Validator() { + @Override public void validate(Object value) throws InvalidValueException { // FIXME this does not follow the standard pattern diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java index 924b1318ab..b6e01d912f 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket3146.java @@ -36,6 +36,7 @@ public class Ticket3146 extends Application.LegacyApplication { Button clearButton = new Button("Clear selection", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { clearSelection(); } @@ -43,6 +44,7 @@ public class Ticket3146 extends Application.LegacyApplication { mainWindow.addComponent(clearButton); Button clearButton2 = new Button("Clear selection 2", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { clearSelection2(); } @@ -50,6 +52,7 @@ public class Ticket3146 extends Application.LegacyApplication { mainWindow.addComponent(clearButton2); Button clearButton3 = new Button("Clear selection 3", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { clearSelection3(); } @@ -57,6 +60,7 @@ public class Ticket3146 extends Application.LegacyApplication { mainWindow.addComponent(clearButton3); Button printButton = new Button("Print selection", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { printSelection(); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java index f6fbe05e38..e3b90c94b0 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket34.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket34.java @@ -34,6 +34,7 @@ public class Ticket34 extends Application.LegacyApplication { mainWin.getPage().addListener(new Page.FragmentChangedListener() { + @Override public void fragmentChanged(FragmentChangedEvent event) { getMainWindow().showNotification( "Fragment now: " + event.getFragment()); @@ -90,6 +91,7 @@ public class Ticket34 extends Application.LegacyApplication { p.addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { String viewName = tf.getValue().toString(); // fragmentChangedListener will change the view if possible diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java b/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java index a608f736ca..b7caa08b82 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket5952.java @@ -1,7 +1,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Root.LegacyWindow; diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java index c68dc9d534..fef7061516 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket6002.java @@ -32,6 +32,7 @@ public class Ticket6002 extends TestBase { "Changing this field modifies only the textfield", property1); tf1.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { // This value change event is called twice if the new // input value is an integer. The second time is during @@ -57,6 +58,7 @@ public class Ticket6002 extends TestBase { property2); tf2.addListener(new Property.ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { // This value change event is called twice if the new // input value is an integer. The second time is during diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java index 473ec79342..ca55b8648c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket677.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket677.java @@ -5,7 +5,7 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.Property; import com.vaadin.data.util.BeanItem; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; @@ -51,28 +51,33 @@ public class Ticket677 extends Application.LegacyApplication { l.addComponent(new Button("Toggle root panel", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(root); } })); l.addComponent(new Button("Toggle panel one", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(one); } })); l.addComponent(new Button("Toggle panel two", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(two); } })); l.addComponent(new Button("Toggle form", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(form); } })); l.addComponent(new Button("Toggle table", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { toggle(table); } diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java index 11d643cd52..c62cee038c 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket695.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket695.java @@ -20,6 +20,7 @@ public class Ticket695 extends Application.LegacyApplication { w.addComponent(b); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); try { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java index 091e0c97af..d871c8adc4 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket736.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket736.java @@ -42,12 +42,14 @@ public class Ticket736 extends Application.LegacyApplication { f.setBuffered(true); Button commit = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { f.commit(); } }); Button discard = new Button("Discard", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { f.discard(); } @@ -90,6 +92,7 @@ public class Ticket736 extends Application.LegacyApplication { mainWin.addComponent(new Button("Show state of the address object", new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { mainWin.showNotification(address.toString()); } @@ -164,6 +167,7 @@ public class Ticket736 extends Application.LegacyApplication { /** Simple state validator */ static class IsValidState implements Validator { + @Override public void validate(Object value) throws InvalidValueException { // Empty and null are accepted values if (value == null || "".equals("" + value)) { diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java b/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java new file mode 100644 index 0000000000..2f094f0bf8 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket8291.java @@ -0,0 +1,125 @@ +package com.vaadin.tests.tickets; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import com.vaadin.data.Container.Filter; +import com.vaadin.data.Item; +import com.vaadin.data.util.BeanItemContainer; +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Root; +import com.vaadin.ui.Table; + +/** + * Test for #8291 and #7666: NegativeArraySizeException when Table scrolled to + * the end and its size reduced. + */ +public class Ticket8291 extends Root { + + @Override + public void init(WrappedRequest request) { + setContent(new TestView()); + } + + private static class DecimateFilter implements Filter { + @Override + public boolean passesFilter(Object itemId, Item item) + throws UnsupportedOperationException { + return ((((TestObject) itemId).property3 % 10) == 0); + } + + @Override + public boolean appliesToProperty(Object propertyId) { + return true; + } + } + + private static class TestView extends HorizontalLayout { + + private Filter filter = null; + + private boolean reduceData; + + private TestView() { + final Table table = new Table(); + List<TestObject> data = createData(1000); + final BeanItemContainer<TestObject> container = new BeanItemContainer<TestObject>( + TestObject.class, data) { + + @Override + public int size() { + if (reduceData) { + return 100; + } else { + return super.size(); + } + } + }; + table.setContainerDataSource(container); + addComponent(table); + Button button = new Button("Click"); + button.addListener(new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + reduceData = !reduceData; + table.refreshRowCache(); + } + }); + addComponent(button); + Button button2 = new Button("Filter"); + button2.addListener(new Button.ClickListener() { + @Override + public void buttonClick(ClickEvent event) { + if (filter != null) { + container.removeAllContainerFilters(); + filter = null; + } else { + filter = new DecimateFilter(); + container.addContainerFilter(filter); + } + table.refreshRowCache(); + } + }); + addComponent(button2); + } + } + + private static List<TestObject> createData(int count) { + ArrayList<TestObject> data = new ArrayList<TestObject>(count); + for (int i = 0; i < count; i++) { + data.add(new TestObject("string-" + i, new Date(), i)); + } + return data; + } + + public static class TestObject { + + private String property1; + private Date property2; + private Integer property3; + + public TestObject(String property1, Date property2, Integer property3) { + this.property1 = property1; + this.property2 = property2; + this.property3 = property3; + } + + public String getProperty1() { + return property1; + } + + public Date getProperty2() { + return property2; + } + + public Integer getProperty3() { + return property3; + } + + } + +} diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java index 714b3c21ca..413d823d2d 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket846.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket846.java @@ -35,6 +35,7 @@ public class Ticket846 extends Application.LegacyApplication { mainWin.addComponent(new Button("Validate integer", new Button.ClickListener() { + @Override public void buttonClick( com.vaadin.ui.Button.ClickEvent event) { mainWin.showNotification("The field is " diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java index bf6f6d1879..f72ff8beec 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket932.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket932.java @@ -27,6 +27,7 @@ public class Ticket932 extends Application.LegacyApplication { Button b = new Button("Check value"); b.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { l.setValue("Length: " + tx.getValue().toString().length() + " Content: " + tx.getValue()); @@ -46,6 +47,7 @@ public class Ticket932 extends Application.LegacyApplication { Button b2 = new Button("Check value"); b2.addListener(new Button.ClickListener() { + @Override public void buttonClick(ClickEvent event) { l.setValue("Length: " + tx2.getValue().toString().length() + " Content: " + tx2.getValue()); diff --git a/tests/testbench/com/vaadin/tests/util/Log.java b/tests/testbench/com/vaadin/tests/util/Log.java index 1404db0dee..9111ff3968 100644 --- a/tests/testbench/com/vaadin/tests/util/Log.java +++ b/tests/testbench/com/vaadin/tests/util/Log.java @@ -3,7 +3,7 @@ package com.vaadin.tests.util; import java.util.ArrayList; import java.util.List; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; diff --git a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java index 2c8ac675f8..c22eac9a6e 100644 --- a/tests/testbench/com/vaadin/tests/util/SampleDirectory.java +++ b/tests/testbench/com/vaadin/tests/util/SampleDirectory.java @@ -7,8 +7,8 @@ package com.vaadin.tests.util; import java.io.File; import com.vaadin.Application; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.terminal.SystemError; -import com.vaadin.terminal.gwt.client.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.Root; diff --git a/tests/testbench/com/vaadin/tests/util/TestClickListener.java b/tests/testbench/com/vaadin/tests/util/TestClickListener.java index 95b9cf2d40..b9f6d66b3e 100644 --- a/tests/testbench/com/vaadin/tests/util/TestClickListener.java +++ b/tests/testbench/com/vaadin/tests/util/TestClickListener.java @@ -29,6 +29,7 @@ public class TestClickListener implements Button.ClickListener { System.out.println("Created listener " + name + ", id=" + count); } + @Override public void buttonClick(ClickEvent event) { System.out .println("ClickEvent from listener " + name + ", id=" + count); diff --git a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java index 8fb0c3585d..d6627a7d94 100644 --- a/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java +++ b/tests/testbench/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java @@ -58,6 +58,7 @@ public class EmptyFieldErrorIndicators extends TestBase { Button validate = new Button("Validate fields"); validate.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.validate(); @@ -96,6 +97,7 @@ public class EmptyFieldErrorIndicators extends TestBase { form.getLayout().addComponent(setDateButton); // form.addField("Set Date", setDateButton); setDateButton.addListener(new ClickListener() { + @Override public void buttonClick(ClickEvent event) { form.getField("Date").setValue(new Date(0)); } diff --git a/tests/testbench/com/vaadin/tests/validation/TestValidators.java b/tests/testbench/com/vaadin/tests/validation/TestValidators.java index a530dee852..746a460da8 100644 --- a/tests/testbench/com/vaadin/tests/validation/TestValidators.java +++ b/tests/testbench/com/vaadin/tests/validation/TestValidators.java @@ -137,6 +137,7 @@ public class TestValidators extends TestBase { Button b = new Button("Commit", new ClickListener() { + @Override public void buttonClick(ClickEvent event) { try { form.commit(); diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html index cc594882dd..62d972e89f 100644 --- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html +++ b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.html @@ -88,11 +88,21 @@ <td>0,0</td> </tr> <tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::Root/VTooltip[0]/FlowPanel[0]/VErrorMessage[0]/HTML[0]/domChild[0]/domChild[1]</td> + <td></td> +</tr> +<tr> <td>screenCapture</td> <td></td> <td>error-must-be-int-and-5-to-10-chars</td> </tr> <tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]</td> + <td>0,0</td> +</tr> +<tr> <td>mouseClick</td> <td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VCheckBox[0]/domChild[0]</td> <td>12,7</td> @@ -123,11 +133,15 @@ <td>0,0</td> </tr> <tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestsvalidationValidationOfRequiredEmptyFields::Root/VTooltip[0]/FlowPanel[0]/VErrorMessage[0]/HTML[0]/domChild[0]/domChild[1]</td> + <td></td> +</tr> +<tr> <td>screenCapture</td> <td></td> <td>empty-invalid-not-required</td> </tr> - </tbody></table> </body> </html> diff --git a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java index 51c4f5ecc8..dd1732023b 100644 --- a/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java +++ b/tests/testbench/com/vaadin/tests/validation/ValidationOfRequiredEmptyFields.java @@ -27,6 +27,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { requiredInput = new CheckBox("Field required"); requiredInput.setImmediate(true); requiredInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequired((Boolean) requiredInput.getValue()); } @@ -35,6 +36,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { requiredErrorInput = new TextField("Required error message"); requiredErrorInput.setImmediate(true); requiredErrorInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { tf.setRequiredError((String) requiredErrorInput.getValue()); } @@ -44,6 +46,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { integerValidatorInput.setImmediate(true); integerValidatorInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) integerValidatorInput.getValue()) { tf.addValidator(integerValidator); @@ -57,6 +60,7 @@ public class ValidationOfRequiredEmptyFields extends TestBase { stringLengthValidatorInput.setImmediate(true); stringLengthValidatorInput.addListener(new ValueChangeListener() { + @Override public void valueChange(ValueChangeEvent event) { if ((Boolean) stringLengthValidatorInput.getValue()) { tf.addValidator(stringLengthValidator); diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java new file mode 100644 index 0000000000..db3e097a6e --- /dev/null +++ b/tests/testbench/com/vaadin/tests/widgetset/client/BasicExtensionTestConnector.java @@ -0,0 +1,27 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.tests.widgetset.client; + +import com.google.gwt.dom.client.DivElement; +import com.google.gwt.dom.client.Document; +import com.vaadin.shared.ui.Connect; +import com.vaadin.terminal.gwt.client.ServerConnector; +import com.vaadin.terminal.gwt.client.Util; +import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector; +import com.vaadin.tests.extensions.BasicExtension; + +@Connect(BasicExtension.class) +public class BasicExtensionTestConnector extends AbstractExtensionConnector { + @Override + protected void extend(ServerConnector target) { + String message = Util.getSimpleName(this) + " extending " + + Util.getSimpleName(target); + + DivElement element = Document.get().createDivElement(); + element.setInnerText(message); + + Document.get().getBody().insertFirst(element); + } +} diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java b/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java index e465ee2624..47f8bedab1 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/ComplexTestBean.java @@ -6,7 +6,7 @@ package com.vaadin.tests.widgetset.client; import java.util.List; -import com.vaadin.terminal.gwt.client.communication.SharedState; +import com.vaadin.shared.communication.SharedState; @SuppressWarnings("javadoc") public class ComplexTestBean extends SharedState { diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java index 5b7c6d8712..11d01c552e 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java @@ -3,8 +3,8 @@ */ package com.vaadin.tests.widgetset.client; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.terminal.gwt.client.ui.label.VLabel; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 72bfbe285a..32e87ce6a4 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -14,11 +14,11 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import com.vaadin.terminal.gwt.client.Connector; +import com.vaadin.shared.Connector; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.communication.RpcProxy; import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.widgetset.server.SerializerTestExtension; @Connect(SerializerTestExtension.class) @@ -29,6 +29,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { public SerializerTestConnector() { registerRpc(SerializerTestRpc.class, new SerializerTestRpc() { + @Override public void sendWrappedGenerics( Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> generics) { Map<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>> updated = new HashMap<Set<SimpleTestBean>, Map<Integer, List<SimpleTestBean>>>(); @@ -49,12 +50,14 @@ public class SerializerTestConnector extends AbstractExtensionConnector { rpc.sendWrappedGenerics(updated); } + @Override public void sendString(String value) { char[] chars = value.toCharArray(); Arrays.sort(chars); rpc.sendString(new String(chars)); } + @Override public void sendSet(Set<Integer> intSet, Set<Connector> connectorSet, Set<SimpleTestBean> beanSet) { @@ -68,6 +71,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { Collections.singleton(getRootConnector()), beanSet); } + @Override public void sendNestedArray(int[][] nestedIntArray, SimpleTestBean[][] nestedBeanArray) { rpc.sendNestedArray(new int[][] { { nestedIntArray[1][0], @@ -75,6 +79,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { { nestedBeanArray[0][1] }, { nestedBeanArray[0][0] } }); } + @Override public void sendMap(Map<String, SimpleTestBean> stringMap, Map<Connector, Boolean> connectorMap, Map<Integer, Connector> intMap, @@ -93,11 +98,13 @@ public class SerializerTestConnector extends AbstractExtensionConnector { getThisConnector()), updatedBeanMap); } + @Override public void sendLong(long value, Long boxedValue, long[] array) { rpc.sendLong(array[0], Long.valueOf(value), new long[] { array[1], boxedValue.longValue() }); } + @Override public void sendList(List<Integer> intList, List<Connector> connectorList, List<SimpleTestBean> beanList) { Collections.sort(intList); @@ -107,17 +114,20 @@ public class SerializerTestConnector extends AbstractExtensionConnector { beanList); } + @Override public void sendInt(int value, Integer boxedValue, int[] array) { rpc.sendInt(array.length, Integer.valueOf(array[0]), new int[] { value, boxedValue.intValue() }); } + @Override public void sendFloat(float value, Float boxedValue, float[] array) { Arrays.sort(array); rpc.sendFloat(boxedValue.floatValue(), Float.valueOf(value), array); } + @Override public void sendDouble(double value, Double boxedValue, double[] array) { rpc.sendDouble(value + boxedValue.doubleValue(), @@ -125,16 +135,19 @@ public class SerializerTestConnector extends AbstractExtensionConnector { new double[] { array.length, array[0], array[1] }); } + @Override public void sendConnector(Connector connector) { rpc.sendConnector(getThisConnector()); } + @Override public void sendChar(char value, Character boxedValue, char[] array) { rpc.sendChar(Character.toUpperCase(boxedValue.charValue()), Character.valueOf(value), new String(array) .toLowerCase().toCharArray()); } + @Override public void sendByte(byte value, Byte boxedValue, byte[] array) { // There will most certainly be a bug that is not discovered // because this particular method doesn't do anything with it's @@ -142,6 +155,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { rpc.sendByte(value, boxedValue, array); } + @Override public void sendBoolean(boolean value, Boolean boxedValue, boolean[] array) { boolean[] inverseArray = new boolean[array.length]; @@ -152,6 +166,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { Boolean.valueOf(!value), inverseArray); } + @Override public void sendBean(ComplexTestBean complexBean, SimpleTestBean simpleBean, SimpleTestBean[] array) { SimpleTestBean updatedSimpleBean = new SimpleTestBean(); @@ -174,6 +189,7 @@ public class SerializerTestConnector extends AbstractExtensionConnector { arrayList.toArray(new SimpleTestBean[array.length])); } + @Override public void sendArrayList(List<int[]> primitiveArrayList, List<Integer[]> objectArrayList, List<SimpleTestBean[]> beanArrayList) { @@ -191,10 +207,12 @@ public class SerializerTestConnector extends AbstractExtensionConnector { updatedObjectArrayList, beanArrayList); } + @Override public void sendNull(String value1, String value2) { rpc.sendNull(value2, value1); } + @Override public void sendListArray(List<Integer>[] objectListArray, List<SimpleTestBean>[] beanListArray) { rpc.sendListArray(new List[] { objectListArray[1], diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java index 5b73e1d34d..eedbda0fb8 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/SerializerTestRpc.java @@ -8,9 +8,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.vaadin.terminal.gwt.client.Connector; -import com.vaadin.terminal.gwt.client.communication.ClientRpc; -import com.vaadin.terminal.gwt.client.communication.ServerRpc; +import com.vaadin.shared.Connector; +import com.vaadin.shared.communication.ClientRpc; +import com.vaadin.shared.communication.ServerRpc; @SuppressWarnings("javadoc") public interface SerializerTestRpc extends ServerRpc, ClientRpc { diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java new file mode 100644 index 0000000000..a5b89e9c1e --- /dev/null +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/GreetAgainRpc.java @@ -0,0 +1,12 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tests.widgetset.client.helloworldfeature; + +import com.vaadin.shared.communication.ClientRpc; + +public interface GreetAgainRpc extends ClientRpc { + + public void greetAgain(); + +} diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java new file mode 100644 index 0000000000..3848ad169a --- /dev/null +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldExtensionConnector.java @@ -0,0 +1,49 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tests.widgetset.client.helloworldfeature; + +import com.google.gwt.user.client.Window; +import com.vaadin.shared.ui.Connect; +import com.vaadin.terminal.gwt.client.ServerConnector; +import com.vaadin.terminal.gwt.client.Util; +import com.vaadin.terminal.gwt.client.VConsole; +import com.vaadin.terminal.gwt.client.communication.RpcProxy; +import com.vaadin.terminal.gwt.client.extensions.AbstractExtensionConnector; +import com.vaadin.tests.extensions.HelloWorldExtension; + +@Connect(HelloWorldExtension.class) +public class HelloWorldExtensionConnector extends AbstractExtensionConnector { + HelloWorldRpc rpc = RpcProxy.create(HelloWorldRpc.class, this); + + @Override + public HelloWorldState getState() { + return (HelloWorldState) super.getState(); + } + + @Override + protected void init() { + registerRpc(GreetAgainRpc.class, new GreetAgainRpc() { + @Override + public void greetAgain() { + greet(); + } + }); + } + + @Override + public void setParent(ServerConnector parent) { + super.setParent(parent); + greet(); + } + + private void greet() { + String msg = getState().getGreeting() + " from " + + Util.getConnectorString(this) + " attached to " + + Util.getConnectorString(getParent()); + VConsole.log(msg); + + String response = Window.prompt(msg, ""); + rpc.onMessageSent(response); + } +} diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java new file mode 100644 index 0000000000..980d76043a --- /dev/null +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldRpc.java @@ -0,0 +1,10 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tests.widgetset.client.helloworldfeature; + +import com.vaadin.shared.communication.ServerRpc; + +public interface HelloWorldRpc extends ServerRpc { + public void onMessageSent(String message); +} diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java new file mode 100644 index 0000000000..913c8bdd1c --- /dev/null +++ b/tests/testbench/com/vaadin/tests/widgetset/client/helloworldfeature/HelloWorldState.java @@ -0,0 +1,18 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ +package com.vaadin.tests.widgetset.client.helloworldfeature; + +import com.vaadin.shared.communication.SharedState; + +public class HelloWorldState extends SharedState { + private String greeting = "Hello world"; + + public String getGreeting() { + return greeting; + } + + public void setGreeting(String greeting) { + this.greeting = greeting; + } +} diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java index a5a5f504ab..838eff1e5c 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java @@ -4,8 +4,8 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; -import com.vaadin.terminal.gwt.client.ComponentState; -import com.vaadin.terminal.gwt.client.Connector; +import com.vaadin.shared.ComponentState; +import com.vaadin.shared.Connector; public class ComponentInStateState extends ComponentState { private Connector otherComponent; diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java index 6e855f7c04..952e4b83c5 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateStateConnector.java @@ -5,10 +5,10 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; import com.google.gwt.user.client.ui.Label; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.minitutorials.v7a2.ComponentInStateComponent; @Connect(ComponentInStateComponent.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java index 68e2df533c..f85d67da4b 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentClientRpc.java @@ -1,6 +1,6 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; -import com.vaadin.terminal.gwt.client.communication.ClientRpc; +import com.vaadin.shared.communication.ClientRpc; public interface MyComponentClientRpc extends ClientRpc { diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java index 2a131c07c8..3a6aab617a 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentConnector.java @@ -3,12 +3,12 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.user.client.Window; -import com.vaadin.terminal.gwt.client.MouseEventDetails; +import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder; import com.vaadin.terminal.gwt.client.communication.RpcProxy; import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.minitutorials.v7a2.MyComponent; @Connect(MyComponent.class) @@ -19,6 +19,7 @@ public class MyComponentConnector extends AbstractComponentConnector { public MyComponentConnector() { getWidget().addClickHandler(new ClickHandler() { + @Override public void onClick(ClickEvent event) { final MouseEventDetails mouseDetails = MouseEventDetailsBuilder @@ -29,6 +30,7 @@ public class MyComponentConnector extends AbstractComponentConnector { } }); registerRpc(MyComponentClientRpc.class, new MyComponentClientRpc() { + @Override public void alert(String message) { Window.alert(message); } diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java index 7f273c28d2..5571ffb701 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentServerRpc.java @@ -1,7 +1,7 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; -import com.vaadin.terminal.gwt.client.MouseEventDetails; -import com.vaadin.terminal.gwt.client.communication.ServerRpc; +import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.communication.ServerRpc; public interface MyComponentServerRpc extends ServerRpc { diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java index a80aa7bca8..8b68331f30 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java @@ -1,6 +1,6 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; -import com.vaadin.terminal.gwt.client.ComponentState; +import com.vaadin.shared.ComponentState; public class MyComponentState extends ComponentState { diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java index f05d4a0eb9..bad782e462 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java @@ -5,10 +5,10 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; import com.google.gwt.user.client.ui.Image; +import com.vaadin.shared.communication.URLReference; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.communication.StateChangeEvent; -import com.vaadin.terminal.gwt.client.communication.URLReference; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.minitutorials.v7a2.ResourceInStateComponent; @Connect(ResourceInStateComponent.class) diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java index 7c124e7bf8..69b415625c 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java @@ -1,7 +1,7 @@ package com.vaadin.tests.widgetset.client.minitutorials.v7a2; -import com.vaadin.terminal.gwt.client.ComponentState; -import com.vaadin.terminal.gwt.client.communication.URLReference; +import com.vaadin.shared.ComponentState; +import com.vaadin.shared.communication.URLReference; public class ResourceInStateState extends ComponentState { diff --git a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java index 012060f437..7905de89f2 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java +++ b/tests/testbench/com/vaadin/tests/widgetset/client/minitutorials/v7a2/WidgetContainerConnector.java @@ -4,10 +4,10 @@ import java.util.List; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.Connect; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent; import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector; -import com.vaadin.terminal.gwt.client.ui.Connect; import com.vaadin.tests.minitutorials.v7a2.WidgetContainer; @Connect(WidgetContainer.class) @@ -30,6 +30,7 @@ public class WidgetContainerConnector extends return GWT.create(VWidgetContainer.class); } + @Override public void updateCaption(ComponentConnector connector) { } }
\ No newline at end of file |