Fixed spacing that was only partly moved to shared state

diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
index 188b66e10fa5f343fcfeec6ad499543faccf474c..c9faf83e7dc380824423510101d87ea421d58987 100644 (file)
--- 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 d9115792167444d669a27bcf52096b6173cc011f..97929dcf2526899a4169fc0ccc466e5ed601b3ad 100644 (file)
--- 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<Component, Float> componentToExpandRatio = new HashMap<Component, Float>();
 
-    /**
-     * 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 be8c64d5e8e307b7e86869e441f9e723be390f2a..fa0e1d1e31f793056dc87812694301be15d07a31 100644 (file)
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -180,6 +180,7 @@ public class Form extends AbstractField<Object> 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 8e7caedc59fe8b0d90eecc83f43b5b09e3225ea7..c076c8a273b23bfaef8289376d89fe3cbd3772f1 100644 (file)
--- 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<Component, Alignment> componentToAlignment = new HashMap<Component, Alignment>();
 
-    /**
-     * 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 a7cd0abdb453ce0b2d3b5dd96dd99010a8e41b81..67bfaa75ffde42a1f5a4d6d409128530d74d6a00 100644 (file)
--- 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