From 7cc29fd08fe1da7c6c924f4211ba80b48b960d69 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 5 Apr 2012 09:08:17 +0300 Subject: [PATCH] Fixed spacing that was only partly moved to shared state --- .../ui/AbstractOrderedLayoutConnector.java | 2 +- src/com/vaadin/ui/AbstractOrderedLayout.java | 32 ++----------------- src/com/vaadin/ui/Form.java | 1 + src/com/vaadin/ui/GridLayout.java | 22 ++----------- src/com/vaadin/ui/Layout.java | 9 ------ 5 files changed, 8 insertions(+), 58 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java index 188b66e10f..c9faf83e7d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java @@ -26,7 +26,7 @@ public abstract class AbstractOrderedLayoutConnector extends AbstractLayoutConnector implements Paintable, DirectionalManagedLayout { public static class AbstractOrderedLayoutState extends AbstractLayoutState { - private boolean spacing = true; + private boolean spacing = false; public boolean isSpacing() { return spacing; diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java index d911579216..97929dcf25 100644 --- a/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -50,11 +50,6 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements private final Map componentToExpandRatio = new HashMap(); - /** - * Is spacing between contained components enabled. Defaults to false. - */ - private boolean spacing = false; - public AbstractOrderedLayout() { registerRpc(rpc); } @@ -184,17 +179,6 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements public void paintContent(PaintTarget target) throws PaintException { super.paintContent(target); - // Add spacing attribute (omitted if false) - if (spacing) { - target.addAttribute("spacing", spacing); - } - - // Adds all items in all the locations - for (Component c : components) { - // Paint child component UIDL - c.paint(target); - } - // Add child component alignment info to layout tag target.addAttribute("alignments", componentToAlignment); target.addAttribute("expandRatios", componentToExpandRatio); @@ -295,28 +279,18 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements * * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean) */ - public void setSpacing(boolean enabled) { - spacing = enabled; + public void setSpacing(boolean spacing) { + getState().setSpacing(spacing); requestRepaint(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing() - */ - @Deprecated - public boolean isSpacingEnabled() { - return spacing; - } - /* * (non-Javadoc) * * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing() */ public boolean isSpacing() { - return spacing; + return getState().isSpacing(); } /** diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java index be8c64d5e8..fa0e1d1e31 100644 --- a/src/com/vaadin/ui/Form.java +++ b/src/com/vaadin/ui/Form.java @@ -180,6 +180,7 @@ public class Form extends AbstractField implements Item.Editor, public Form(Layout formLayout, FormFieldFactory fieldFactory) { super(); setLayout(formLayout); + setFooter(null); setFormFieldFactory(fieldFactory); setValidationVisible(false); setWidth(100, UNITS_PERCENTAGE); diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java index 8e7caedc59..c076c8a273 100644 --- a/src/com/vaadin/ui/GridLayout.java +++ b/src/com/vaadin/ui/GridLayout.java @@ -19,7 +19,6 @@ import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.gwt.client.Connector; import com.vaadin.terminal.gwt.client.MouseEventDetails; -import com.vaadin.terminal.gwt.client.ui.GridLayoutConnector; import com.vaadin.terminal.gwt.client.ui.GridLayoutConnector.GridLayoutServerRPC; import com.vaadin.terminal.gwt.client.ui.GridLayoutConnector.GridLayoutState; import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler; @@ -91,11 +90,6 @@ public class GridLayout extends AbstractLayout implements */ private Map componentToAlignment = new HashMap(); - /** - * Is spacing between contained components enabled. Defaults to false. - */ - private boolean spacing = false; - private static final Alignment ALIGNMENT_DEFAULT = Alignment.TOP_LEFT; /** @@ -1164,28 +1158,18 @@ public class GridLayout extends AbstractLayout implements * * @see com.vaadin.ui.Layout.SpacingHandler#setSpacing(boolean) */ - public void setSpacing(boolean enabled) { - spacing = enabled; + public void setSpacing(boolean spacing) { + getState().setSpacing(spacing); requestRepaint(); } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing() - */ - @Deprecated - public boolean isSpacingEnabled() { - return spacing; - } - /* * (non-Javadoc) * * @see com.vaadin.ui.Layout.SpacingHandler#isSpacing() */ public boolean isSpacing() { - return spacing; + return getState().isSpacing(); } /** diff --git a/src/com/vaadin/ui/Layout.java b/src/com/vaadin/ui/Layout.java index a7cd0abdb4..67bfaa75ff 100644 --- a/src/com/vaadin/ui/Layout.java +++ b/src/com/vaadin/ui/Layout.java @@ -174,15 +174,6 @@ public interface Layout extends ComponentContainer, Serializable { */ public void setSpacing(boolean enabled); - /** - * - * @return true if spacing between child components within this layout - * is enabled, false otherwise - * @deprecated Use {@link #isSpacing()} instead. - */ - @Deprecated - public boolean isSpacingEnabled(); - /** * * @return true if spacing between child components within this layout -- 2.39.5