Browse Source
Ensure table's cells aren't refreshed if table is detached. (#9138)
Change-Id: I026cd70e9e518fa320f6ec3011194359385a3a4atags/7.1.1
Anna Koskinen
11 years ago
3 changed files with 163 additions and 1 deletions
+ 1
- 1
server/src/com/vaadin/ui/Table.java
View File
| @@ -1615,7 +1615,7 @@ public class Table extends AbstractSelect implements Action.Container, | |||
| * guaranteed to be recreated. | |||
| */ | |||
| protected void refreshRenderedCells() { | |||
| if (getParent() == null) { | |||
| if (!isAttached()) { | |||
| return; | |||
| } | |||
+ 41
- 0
uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.html
View File
| @@ -0,0 +1,41 @@ | |||
| <?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>RefreshRenderedCellsOnlyIfAttachedTest</title> | |||
| </head> | |||
| <body> | |||
| <table cellpadding="1" cellspacing="1" border="1"> | |||
| <thead> | |||
| <tr><td rowspan="1" colspan="3">RefreshRenderedCellsOnlyIfAttachedTest</td></tr> | |||
| </thead><tbody> | |||
| <tr> | |||
| <td>open</td> | |||
| <td>/run/RefreshRenderedCellsOnlyIfAttached?restartApplication</td> | |||
| <td></td> | |||
| </tr> | |||
| <tr> | |||
| <td>assertText</td> | |||
| <td>vaadin=runRefreshRenderedCellsOnlyIfAttached::PID_Slabel</td> | |||
| <td>default</td> | |||
| </tr> | |||
| <tr> | |||
| <td>click</td> | |||
| <td>vaadin=runRefreshRenderedCellsOnlyIfAttached::PID_Sbutton/domChild[0]/domChild[0]</td> | |||
| <td></td> | |||
| </tr> | |||
| <tr> | |||
| <td>assertNotText</td> | |||
| <td>vaadin=runRefreshRenderedCellsOnlyIfAttached::PID_Slabel</td> | |||
| <td>default</td> | |||
| </tr> | |||
| <tr> | |||
| <td>assertText</td> | |||
| <td>vaadin=runRefreshRenderedCellsOnlyIfAttached::PID_Slabel</td> | |||
| <td>original: false, now: false</td> | |||
| </tr> | |||
| </tbody></table> | |||
| </body> | |||
| </html> | |||
+ 121
- 0
uitest/src/com/vaadin/tests/components/table/RefreshRenderedCellsOnlyIfAttached.java
View File
| @@ -0,0 +1,121 @@ | |||
| /* | |||
| * Copyright 2000-2013 Vaadin Ltd. | |||
| * | |||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | |||
| * use this file except in compliance with the License. You may obtain a copy of | |||
| * the License at | |||
| * | |||
| * http://www.apache.org/licenses/LICENSE-2.0 | |||
| * | |||
| * Unless required by applicable law or agreed to in writing, software | |||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | |||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | |||
| * License for the specific language governing permissions and limitations under | |||
| * the License. | |||
| */ | |||
| package com.vaadin.tests.components.table; | |||
| import com.vaadin.server.VaadinRequest; | |||
| import com.vaadin.tests.components.AbstractTestUI; | |||
| import com.vaadin.ui.Button; | |||
| import com.vaadin.ui.Button.ClickEvent; | |||
| import com.vaadin.ui.Label; | |||
| import com.vaadin.ui.Table; | |||
| import com.vaadin.ui.VerticalLayout; | |||
| /** | |||
| * There shouldn't be any attempts to refresh table's cells if the table isn't | |||
| * attached. | |||
| * | |||
| * @since | |||
| * @author Vaadin Ltd | |||
| */ | |||
| public class RefreshRenderedCellsOnlyIfAttached extends AbstractTestUI { | |||
| VerticalLayout layout; | |||
| boolean check; | |||
| /* | |||
| * (non-Javadoc) | |||
| * | |||
| * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server. | |||
| * VaadinRequest) | |||
| */ | |||
| @Override | |||
| protected void setup(VaadinRequest request) { | |||
| getLayout().setMargin(true); | |||
| check = false; | |||
| layout = new VerticalLayout(); | |||
| final Label l1 = new Label("default"); | |||
| l1.setId("label"); | |||
| final Label l2 = new Label("should be: default"); | |||
| final Table t = new Table() { | |||
| /* | |||
| * (non-Javadoc) | |||
| * | |||
| * @see com.vaadin.ui.Table#refreshRenderedCells() | |||
| */ | |||
| @Override | |||
| protected void refreshRenderedCells() { | |||
| boolean original = isRowCacheInvalidated(); | |||
| super.refreshRenderedCells(); | |||
| if (check) { | |||
| l1.setValue("original: " + original + ", now: " | |||
| + isRowCacheInvalidated()); | |||
| l2.setValue("should be: false & false"); | |||
| } | |||
| } | |||
| }; | |||
| t.addContainerProperty("text", String.class, ""); | |||
| t.addItem(new Object[] { "Foo" }, "foo"); | |||
| t.setId("table"); | |||
| layout.addComponent(t); | |||
| addComponent(l1); | |||
| addComponent(l2); | |||
| addComponent(layout); | |||
| Button b = new Button("Detach table", new Button.ClickListener() { | |||
| @Override | |||
| public void buttonClick(ClickEvent event) { | |||
| check = true; | |||
| removeTableParent(); | |||
| // call refreshRenderedCells | |||
| t.setColumnCollapsingAllowed(true); | |||
| } | |||
| }); | |||
| b.setId("button"); | |||
| addComponent(b); | |||
| } | |||
| /** | |||
| * Remove Table's parent component. | |||
| * | |||
| * @since | |||
| */ | |||
| protected void removeTableParent() { | |||
| removeComponent(layout); | |||
| } | |||
| /* | |||
| * (non-Javadoc) | |||
| * | |||
| * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription() | |||
| */ | |||
| @Override | |||
| protected String getTestDescription() { | |||
| return "There shouldn't be any attempts to refresh table's cells if the table isn't attached."; | |||
| } | |||
| /* | |||
| * (non-Javadoc) | |||
| * | |||
| * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber() | |||
| */ | |||
| @Override | |||
| protected Integer getTicketNumber() { | |||
| return 9138; | |||
| } | |||
| } | |||
Loading…