diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-22 17:12:54 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-08-22 17:12:54 +0300 |
| commit | 7e3d95735858ba8726a7dc472a054ba279d7af21 (patch) | |
| tree | bbc3556e8b0b20d03e1ccd1678d831010bdc96ef /server/src/com/vaadin/ui/CustomLayout.java | |
| parent | 3f36eee94aa400b85a4b322d3247b72a9eee25d0 (diff) | |
| parent | 88776600733901f3f9891aa90a11a5aeb2b97ef4 (diff) | |
| download | vaadin-framework-7e3d95735858ba8726a7dc472a054ba279d7af21.tar.gz vaadin-framework-7e3d95735858ba8726a7dc472a054ba279d7af21.zip | |
Merge branch 'master' into root-cleanup
Conflicts:
client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
Diffstat (limited to 'server/src/com/vaadin/ui/CustomLayout.java')
| -rw-r--r-- | server/src/com/vaadin/ui/CustomLayout.java | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java index 2da443bfa5..d47b2f92b3 100644 --- a/server/src/com/vaadin/ui/CustomLayout.java +++ b/server/src/com/vaadin/ui/CustomLayout.java @@ -291,33 +291,6 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component { requestRepaint(); } - /** - * Although most layouts support margins, CustomLayout does not. The - * behaviour of this layout is determined almost completely by the actual - * template. - * - * @throws UnsupportedOperationException - */ - @Override - public void setMargin(boolean enabled) { - throw new UnsupportedOperationException( - "CustomLayout does not support margins."); - } - - /** - * Although most layouts support margins, CustomLayout does not. The - * behaviour of this layout is determined almost completely by the actual - * template. - * - * @throws UnsupportedOperationException - */ - @Override - public void setMargin(boolean topEnabled, boolean rightEnabled, - boolean bottomEnabled, boolean leftEnabled) { - throw new UnsupportedOperationException( - "CustomLayout does not support margins."); - } - @Override public void changeVariables(Object source, Map<String, Object> variables) { // Nothing to see here |