diff options
| author | Artur Signell <artur@vaadin.com> | 2015-05-19 19:47:43 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-05-20 08:37:53 +0000 |
| commit | c778f5b859b05f8c9c89322147b4f78b3454d493 (patch) | |
| tree | 5a7e45e9cab0ec411a2bef589b77413477677d32 /server/src/com/vaadin/ui/Grid.java | |
| parent | 6834d65caec655b2d0c20ec599f9d90302d1e4a9 (diff) | |
| download | vaadin-framework-c778f5b859b05f8c9c89322147b4f78b3454d493.tar.gz vaadin-framework-c778f5b859b05f8c9c89322147b4f78b3454d493.zip | |
Return components in merged header/footer cells only once (#17904)
Change-Id: I763ff330f20e50c43d352524058fa8993401bf43
Diffstat (limited to 'server/src/com/vaadin/ui/Grid.java')
| -rw-r--r-- | server/src/com/vaadin/ui/Grid.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index 282711aa92..902098e8d0 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -5371,7 +5371,9 @@ public class Grid extends AbstractComponent implements SelectionNotifier, @Override public Iterator<Component> iterator() { - List<Component> componentList = new ArrayList<Component>(); + // This is a hash set to avoid adding header/footer components inside + // merged cells multiple times + LinkedHashSet<Component> componentList = new LinkedHashSet<Component>(); Header header = getHeader(); for (int i = 0; i < header.getRowCount(); ++i) { |