diff options
| author | Artur Signell <artur@vaadin.com> | 2014-12-12 10:32:29 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-12-12 10:32:29 +0200 |
| commit | 6fdc3320fec5801a73f51d3e3a3584d23d942c6c (patch) | |
| tree | bca21a044acc56530bb403eb1cd3652c01c71928 /server/src/com/vaadin/ui/CssLayout.java | |
| parent | b3e6edc9634f444ccece00e200cb51eee7994d75 (diff) | |
| parent | 10fa4e4236ed049ef6eac337d23701bc381763ce (diff) | |
| download | vaadin-framework-6fdc3320fec5801a73f51d3e3a3584d23d942c6c.tar.gz vaadin-framework-6fdc3320fec5801a73f51d3e3a3584d23d942c6c.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
Change-Id: I04938bd8c5b4f01c3ca801c9f7adbb20d279523c
Diffstat (limited to 'server/src/com/vaadin/ui/CssLayout.java')
| -rw-r--r-- | server/src/com/vaadin/ui/CssLayout.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/server/src/com/vaadin/ui/CssLayout.java b/server/src/com/vaadin/ui/CssLayout.java index e7b63cc87a..350423576f 100644 --- a/server/src/com/vaadin/ui/CssLayout.java +++ b/server/src/com/vaadin/ui/CssLayout.java @@ -118,7 +118,6 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { components.add(c); try { super.addComponent(c); - markAsDirty(); } catch (IllegalArgumentException e) { components.remove(c); throw e; @@ -141,7 +140,6 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { components.addFirst(c); try { super.addComponent(c); - markAsDirty(); } catch (IllegalArgumentException e) { components.remove(c); throw e; @@ -170,7 +168,6 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { components.add(index, c); try { super.addComponent(c); - markAsDirty(); } catch (IllegalArgumentException e) { components.remove(c); throw e; @@ -187,7 +184,6 @@ public class CssLayout extends AbstractLayout implements LayoutClickNotifier { public void removeComponent(Component c) { components.remove(c); super.removeComponent(c); - markAsDirty(); } /** |