OrderedLayout cleanup

svn changeset:5843/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
index ba961e436e609e84c5e763d239e799a759311013..ca9b6ae4daa6403a8620f60f95813c004f4c8051 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java
@@ -33,8 +33,6 @@ public class IOrderedLayout extends CellBasedLayout {
 \r
     private boolean isRendering = false;\r
 \r
-    private String width = null;\r
-\r
     @Override\r
     public void setStyleName(String styleName) {\r
         super.setStyleName(styleName);\r
@@ -56,7 +54,6 @@ public class IOrderedLayout extends CellBasedLayout {
 \r
     public IOrderedLayout() {\r
         setStyleName(CLASSNAME);\r
-        // DOM.setStyleAttribute(getElement(), "overflow", "hidden");\r
     }\r
 \r
     @Override\r
@@ -66,6 +63,7 @@ public class IOrderedLayout extends CellBasedLayout {
 \r
         // Only non-cached UIDL:s can introduce changes\r
         if (uidl.getBooleanAttribute("cached")) {\r
+            isRendering = false;\r
             return;\r
         }\r
 \r
@@ -230,18 +228,6 @@ public class IOrderedLayout extends CellBasedLayout {
 \r
     }\r
 \r
-    private static boolean hasRelativeSize(FloatSize relativeSize,\r
-            int orientation) {\r
-        if (relativeSize == null) {\r
-            return false;\r
-        }\r
-        if (orientation == ORIENTATION_HORIZONTAL) {\r
-            return relativeSize.getWidth() >= 0;\r
-        } else {\r
-            return relativeSize.getHeight() >= 0;\r
-        }\r
-    }\r
-\r
     private void handleOrientationUpdate(UIDL uidl) {\r
         int newOrientation = ORIENTATION_VERTICAL;\r
         if ("horizontal".equals(uidl.getStringAttribute("orientation"))) {\r
@@ -658,7 +644,6 @@ public class IOrderedLayout extends CellBasedLayout {
     @Override\r
     public void setWidth(String width) {\r
         super.setWidth(width);\r
-        this.width = width;\r
 \r
         if (width != null && !width.equals("")) {\r
             activeLayoutSize.setWidth(getOffsetWidth()\r