component implements sizeable and simple general terminal implementation

svn changeset:3662/svn branch:trunk

1 files changed, 1 insertions, 16 deletions

diff --git a/src/com/itmill/toolkit/ui/GridLayout.java b/src/com/itmill/toolkit/ui/GridLayout.java
index 990ba634e2..532560fdfa 100644
--- a/src/com/itmill/toolkit/ui/GridLayout.java
+++ b/src/com/itmill/toolkit/ui/GridLayout.java
@@ -10,10 +10,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.Map;
 
-import com.itmill.toolkit.terminal.HasSize;
 import com.itmill.toolkit.terminal.PaintException;
 import com.itmill.toolkit.terminal.PaintTarget;
-import com.itmill.toolkit.terminal.Size;
 import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo;
 
 /**
@@ -36,7 +34,7 @@ import com.itmill.toolkit.terminal.gwt.client.ui.AlignmentInfo;
  * @VERSION@
  * @since 3.0
  */
-public class GridLayout extends AbstractLayout implements HasSize {
+public class GridLayout extends AbstractLayout {
 
     /**
      * Initial grid columns.
@@ -112,11 +110,6 @@ public class GridLayout extends AbstractLayout implements HasSize {
     private boolean spacing = false;
 
     /**
-     * Sizing object.
-     */
-    private Size size;
-
-    /**
      * Constructor for grid of given size (number of cells). Note that grid's
      * final size depends on the items that are added into the grid. Grid grows
      * if you add components outside the grid's area.
@@ -129,7 +122,6 @@ public class GridLayout extends AbstractLayout implements HasSize {
     public GridLayout(int columns, int rows) {
         setColumns(columns);
         setRows(rows);
-        size = new Size(this);
     }
 
     /**
@@ -393,9 +385,6 @@ public class GridLayout extends AbstractLayout implements HasSize {
 
         super.paintContent(target);
 
-        // Size
-        size.paint(target);
-
         // TODO refactor attribute names in future release.
         target.addAttribute("h", rows);
         target.addAttribute("w", cols);
@@ -1026,8 +1015,4 @@ public class GridLayout extends AbstractLayout implements HasSize {
         spacing = enabled;
     }
 
-    public Size getSize() {
-        return size;
-    }
-
 }