Fix for #2278 - MarginHandler refactoring.

- Added MarginHandler interface which contains getMargin() and setMargin(MarginInfo).
- Renamed client side MarginInfo to IMarginInfo to avoid mixups.


svn changeset:6081/svn branch:trunk

1 files changed, 22 insertions, 3 deletions

diff --git a/src/com/itmill/toolkit/ui/AbstractLayout.java b/src/com/itmill/toolkit/ui/AbstractLayout.java
index 59f7aa1923..c849c86b39 100644
--- a/src/com/itmill/toolkit/ui/AbstractLayout.java
+++ b/src/com/itmill/toolkit/ui/AbstractLayout.java
@@ -6,7 +6,7 @@ package com.itmill.toolkit.ui;
 
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.gwt.client.ui.MarginInfo;
+import com.itmill.toolkit.ui.Layout.MarginHandler;
 
 /**
  * An abstract class that defines default implementation for the {@link Layout}
@@ -18,9 +18,9 @@ import com.itmill.toolkit.terminal.gwt.client.ui.MarginInfo;
  * @since 5.0
  */
 public abstract class AbstractLayout extends AbstractComponentContainer
-        implements Layout {
+        implements Layout, MarginHandler {
 
-    protected MarginInfo margins = new MarginInfo(false, false, false, false);
+    protected MarginInfo margins = new MarginInfo(false);
 
     /*
      * (non-Javadoc)
@@ -42,6 +42,25 @@ public abstract class AbstractLayout extends AbstractComponentContainer
     /*
      * (non-Javadoc)
      * 
+     * @see com.itmill.toolkit.ui.Layout.MarginHandler#getMargin()
+     */
+    public MarginInfo getMargin() {
+        return margins;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.itmill.toolkit.ui.Layout.MarginHandler#setMargin(MarginInfo)
+     */
+    public void setMargin(MarginInfo marginInfo) {
+        margins.setMargins(marginInfo);
+        requestRepaint();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
      * @see com.itmill.toolkit.ui.Layout#setMargin(boolean, boolean, boolean,
      * boolean)
      */