From: Henri Sara Date: Thu, 22 Dec 2011 14:00:52 +0000 (+0200) Subject: Merge remote branch 'origin/6.8' X-Git-Tag: 7.0.0.alpha1~8 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c6cc203ec360f9efbfb116029ca855a28c7bfa63;p=vaadin-framework.git Merge remote branch 'origin/6.8' Conflicts: tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java --- c6cc203ec360f9efbfb116029ca855a28c7bfa63 diff --cc WebContent/VAADIN/themes/chameleon/components/button/button.css index 6629cfeb1e,0a9544b5ae..1dffddb4c2 --- a/WebContent/VAADIN/themes/chameleon/components/button/button.css +++ b/WebContent/VAADIN/themes/chameleon/components/button/button.css @@@ -254,4 -289,4 +254,4 @@@ body.v-ie .v-pressed.v-button-borderles .v-button-icon-only .v-icon { margin-right: -.5em; -- } ++ } diff --cc tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java index bf98c83585,cca76ce418..b9a2307aff --- a/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java +++ b/tests/testbench/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java @@@ -3,8 -3,9 +3,9 @@@ package com.vaadin.tests.components.but import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Root.LegacyWindow; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; + import com.vaadin.ui.themes.BaseTheme; public class ButtonsInHorizontalLayout extends AbstractTestCase { @@@ -12,16 -13,30 +13,30 @@@ public void init() { VerticalLayout content = new VerticalLayout(); content.setMargin(true); + content.setSpacing(true); + + content.addComponent(createButtonLayout(null)); + content.addComponent(createButtonLayout(BaseTheme.BUTTON_LINK)); + - setMainWindow(new Window("", content)); ++ setMainWindow(new LegacyWindow("", content)); + } + + private HorizontalLayout createButtonLayout(String style) { HorizontalLayout layout = new HorizontalLayout(); layout.setSpacing(true); - layout.addComponent(new Button( - "Look at me in IE7 or IE8 in compatibility mode")); - layout.addComponent(new Button( - "Look at me in IE7 or IE8 in compatibility mode")); - layout.addComponent(new Button( - "Look at me in IE7 or IE8 in compatibility mode")); - content.addComponent(layout); - setMainWindow(new LegacyWindow("", content)); + layout.addComponent(createButton(style)); + layout.addComponent(createButton(style)); + layout.addComponent(createButton(style)); + return layout; + } + + private Button createButton(String style) { + Button button = new Button( + "Look at me in IE7 or IE8 in compatibility mode"); + if (style != null && style.length() != 0) { + button.setStyleName(style); + } + return button; } @Override diff --cc tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java index 0000000000,d88b36abb1..85b5d3b7f7 mode 000000,100644..100644 --- a/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java +++ b/tests/testbench/com/vaadin/tests/components/table/ScrollCausesRequestLoop.java @@@ -1,0 -1,65 +1,65 @@@ + package com.vaadin.tests.components.table; + + import java.util.ArrayList; + import java.util.List; + + import com.vaadin.data.util.BeanItemContainer; + import com.vaadin.tests.components.TestBase; + import com.vaadin.tests.util.Person; + import com.vaadin.ui.HorizontalLayout; ++import com.vaadin.ui.Root.LegacyWindow; + import com.vaadin.ui.Table; -import com.vaadin.ui.Window; + + public class ScrollCausesRequestLoop extends TestBase { + + @Override + protected void setup() { - setMainWindow(new Window("", new TestView())); ++ setMainWindow(new LegacyWindow("", new TestView())); + } + + @Override + protected String getDescription() { + return "Scrolling a table causes an infinite loop of UIDL requests in some cases"; + } + + @Override + protected Integer getTicketNumber() { + return 8040; + } + + private static class TestView extends HorizontalLayout { + + TestView() { + Table table = new Table(); + List data = createData(); + BeanItemContainer container = new BeanItemContainer( + Person.class, data) { + + @Override + public Person getIdByIndex(int index) { + try { + // Simulate some loading delay with some exaggeration + // to make easier to reproduce + Thread.sleep(50); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } + return super.getIdByIndex(index); + } + }; + table.setContainerDataSource(container); + addComponent(table); + } + } + + private static List createData() { + int count = 500; + List data = new ArrayList(count); + for (int i = 0; i < count; i++) { + data.add(new Person("Person", "" + i, "Email", "Phone", "Street", + 12345, "City")); + } + return data; + } + } diff --cc tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java index 0000000000,90a9191036..8540e39c8c mode 000000,100644..100644 --- a/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java +++ b/tests/testbench/com/vaadin/tests/components/table/TableHeaderZoom.java @@@ -1,0 -1,32 +1,32 @@@ + package com.vaadin.tests.components.table; + + import com.vaadin.tests.components.TestBase; + import com.vaadin.ui.CssLayout; ++import com.vaadin.ui.Root.LegacyWindow; + import com.vaadin.ui.Table; -import com.vaadin.ui.Window; + + public class TableHeaderZoom extends TestBase { + + @Override + protected void setup() { + Table table = new Table(); + table.setHeight("100px"); + table.setWidth("200px"); + table.setEnabled(false); + table.addContainerProperty("Column 1", String.class, ""); + - Window main = getMainWindow(); ++ LegacyWindow main = getMainWindow(); + main.setContent(new CssLayout()); + main.addComponent(table); + } + + @Override + protected String getDescription() { + return "Table header text/icon disappears when zooming out"; + } + + @Override + protected Integer getTicketNumber() { + return 6870; + } + }