diff options
author | Leif Åstrand <leif@vaadin.com> | 2013-05-13 13:07:20 +0000 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2013-05-13 16:42:26 +0300 |
commit | 7a1ab60fee06851246c6b3f5c670ea7512d0648d (patch) | |
tree | 67c5269ff8c10a9c35f1f5e68af8bb2c771d26da | |
parent | 42d94768bfacb3d831e125ae33eeb4b9fa1d8a53 (diff) | |
download | vaadin-framework-7a1ab60fee06851246c6b3f5c670ea7512d0648d.tar.gz vaadin-framework-7a1ab60fee06851246c6b3f5c670ea7512d0648d.zip |
Revert "Assert that connector needing layout is attached (#11698)"
This reverts commit cb7b02d4e50e91b9377410e79c3578587a900d94
The assert is not a good idea because it is triggered when a connector registers a dependency in its init method.
Merge: no
Change-Id: I1f5a99af8f0af7b3329a1a596073ba09e55e18dc
-rw-r--r-- | client/src/com/vaadin/client/LayoutManager.java | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java index 381aff5afa..14b155c92f 100644 --- a/client/src/com/vaadin/client/LayoutManager.java +++ b/client/src/com/vaadin/client/LayoutManager.java @@ -827,7 +827,6 @@ public class LayoutManager { * the managed layout that should be layouted */ public final void setNeedsHorizontalLayout(ManagedLayout layout) { - assert isAttached(layout); needsHorizontalLayout.add(layout.getConnectorId()); } @@ -843,21 +842,9 @@ public class LayoutManager { * the managed layout that should be layouted */ public final void setNeedsVerticalLayout(ManagedLayout layout) { - assert isAttached(layout); needsVerticalLayout.add(layout.getConnectorId()); } - private boolean isAttached(ServerConnector connector) { - while (connector != null) { - connector = connector.getParent(); - if (connector == connection.getUIConnector()) { - return true; - } - } - // Reaching null parent before reaching UI connector -> not attached - return false; - } - /** * Gets the outer height (including margins, paddings and borders) of the * given element, provided that it has been measured. These elements are |