Added several missing updateComponent calls. This will probably fix some caching...

svn changeset:2506/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
index 3dfe2ab055fe390a05de34ec2930c69c5b27e2c5..fe1fffd49794c7328fd68a90564ce06f33930a6c 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFormLayout.java
@@ -21,6 +21,10 @@ public class IFormLayout extends FlexTable implements Container {
 
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
                this.client = client;
+
+               if (client.updateComponent(this, uidl, false))
+                       return;
+
                int i = 0;
                for (Iterator it = uidl.getChildIterator(); it.hasNext(); i++) {
                        prepareCell(i, 1);

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
index 73b5a95e80890cdd54eadfad80ff88862d1c9df1..69645e047d33f1aad4784ca3fa4ae23d0853e909 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IGridLayout.java
@@ -18,6 +18,10 @@ public class IGridLayout extends FlexTable implements Paintable, Container {
        private HashMap widgetToCaptionWrapper = new HashMap();
 
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+
+               if (client.updateComponent(this, uidl, false))
+                       return;
+
                clear();
                if (uidl.hasAttribute("caption"))
                        setTitle(uidl.getStringAttribute("caption"));

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java
index 9c9bedfd9b856ce35d6a3d7c135763b9c87578bc..7d22df437975eeb2fc13e14ad3c67ec149365aab 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java
@@ -24,6 +24,9 @@ public class IProgressIndicator extends Widget implements Paintable {
        }
 
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+               if (client.updateComponent(this, uidl, true))
+                       return;
+
                poller.cancel();
                this.client = client;
                if (client.updateComponent(this, uidl, true))

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
index 0963e9de91f3f4b458886e52e5f77084fb0d30fc..c0bd2bc03b48756758aa37ed8244a95feeccdd68 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
@@ -98,7 +98,8 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
        }
 
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-               client.updateComponent(this, uidl, true);
+               if (client.updateComponent(this, uidl, true))
+                       return;
 
                setWidth(uidl.getStringAttribute("width"));
                setHeight(uidl.getStringAttribute("height"));
@@ -150,7 +151,8 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
                        pixelPosition = DOM.getElementPropertyInt(splitter, "offsetLeft");
 
                        // reposition splitter in case it is out of box
-                       if (pixelPosition > 0 && pixelPosition + getSplitterSize() > wholeSize) {
+                       if (pixelPosition > 0
+                                       && pixelPosition + getSplitterSize() > wholeSize) {
                                pixelPosition = wholeSize - getSplitterSize();
                                if (pixelPosition < 0)
                                        pixelPosition = 0;
@@ -175,7 +177,8 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
                        pixelPosition = DOM.getElementPropertyInt(splitter, "offsetTop");
 
                        // reposition splitter in case it is out of box
-                       if (pixelPosition > 0 && pixelPosition + getSplitterSize() > wholeSize) {
+                       if (pixelPosition > 0
+                                       && pixelPosition + getSplitterSize() > wholeSize) {
                                pixelPosition = wholeSize - getSplitterSize();
                                if (pixelPosition < 0)
                                        pixelPosition = 0;
@@ -312,7 +315,8 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
        private int getSplitterSize() {
                if (splitterSize < 0) {
                        if (isAttached()) {
-                               splitterSize = DOM.getElementPropertyInt(splitter, "offsetWidth");
+                               splitterSize = DOM.getElementPropertyInt(splitter,
+                                               "offsetWidth");
                        }
                }
                return splitterSize;

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
index 71a6302be3af49b06a7d1122ae5d1c8d2883ba4c..3deeb88999836a7f9bc3af81107ea8623b1f8493 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -16,7 +16,8 @@ import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
 import com.itmill.toolkit.terminal.gwt.client.Util;
 
-public class ITabsheet extends FlowPanel implements Paintable, ContainerResizedListener {
+public class ITabsheet extends FlowPanel implements Paintable,
+               ContainerResizedListener {
 
        public static final String CLASSNAME = "i-tabsheet";
 
@@ -75,8 +76,7 @@ public class ITabsheet extends FlowPanel implements Paintable, ContainerResizedL
                this.client = client;
                id = uidl.getId();
 
-               // Use cached sub-tree if available
-               if (uidl.getBooleanAttribute("cached"))
+               if (client.updateComponent(this, uidl, false))
                        return;
 
                // Adjust width and height
@@ -164,14 +164,14 @@ public class ITabsheet extends FlowPanel implements Paintable, ContainerResizedL
                                DOM.getChild(tr, DOM.getChildCount(tr) - 1), 0);
                DOM.removeElementAttribute(rest, "style");
        }
-       
+
        public void setHeight(String height) {
                this.height = height;
                iLayout();
        }
 
        public void iLayout() {
-               if(height != null) {
+               if (height != null) {
                        // First, calculate needed pixel height
                        super.setHeight(height);
                        int neededHeight = getOffsetHeight();
@@ -181,7 +181,7 @@ public class ITabsheet extends FlowPanel implements Paintable, ContainerResizedL
                        DOM.setStyleAttribute(tp.getElement(), "overflow", "hidden");
                        int pixelHeight = getOffsetHeight();
                        tp.setHeight(neededHeight - pixelHeight + "px");
-                       DOM.setStyleAttribute(tp.getElement(), "overflow", "");                 
+                       DOM.setStyleAttribute(tp.getElement(), "overflow", "");
                }
                Util.runAnchestorsLayout(this);
        }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java
index 6263c1abeb3d233f28b6ab0fbcd2d74d90631465..cbe7698372c300d232f8f943f570e611356c5578 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUnknownComponent.java
@@ -22,6 +22,8 @@ public class IUnknownComponent extends Composite implements Paintable {
        }
 
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+               if (client.updateComponent(this, uidl, false))
+                       return;
                setCaption("Client faced an unknown component type. Unrendered UIDL:");
                uidlTree.clear();
                uidlTree.addItem(uidl.dir());

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
index f31f33c3e5cd523a25be0f710b9ea1ddf9ee403c..477b03298fe49b30331ee4f556be6edd26dd225f 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
@@ -64,6 +64,8 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
        }
 
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+               if (client.updateComponent(this, uidl, false))
+                       return;
                this.client = client;
                this.paintableId = uidl.getId();
                setAction(client.getAppUri());

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
index ce26267062c308261a498c1c13dcc85b77c71cea..e7680093e6aa516e135a01a8d4cc32fb4a39242d 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
@@ -160,8 +160,8 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener {
        public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
                this.id = uidl.getId();
                this.client = client;
-
-               if (uidl.getBooleanAttribute("cached"))
+               
+               if(client.updateComponent(this, uidl, false))
                        return;
 
                if (uidl.hasAttribute("invisible")) {