aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-08-20 07:55:56 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-08-20 07:55:56 +0000
commitaaa32b2195e7793ae1c53418551734e2906c8f50 (patch)
treefecd98e8fab52f29cc704d33f6d37c48d3f8b924 /src
parentd7acda5109167312aea83aa926fbfe1fae8c9c78 (diff)
downloadvaadin-framework-aaa32b2195e7793ae1c53418551734e2906c8f50.tar.gz
vaadin-framework-aaa32b2195e7793ae1c53418551734e2906c8f50.zip
added null check to live after gwt 1.5 upgrade
svn changeset:5222/svn branch:trunk
Diffstat (limited to 'src')
-rw-r--r--src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java4
1 files changed, 4 insertions, 0 deletions
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 a77df27547..8a8ffa2130 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IWindow.java
@@ -516,6 +516,10 @@ public class IWindow extends PopupPanel implements Paintable, ScrollListener {
}
protected Element getContainerElement() {
+ // in GWT 1.5 this method is used in PopupPanel constructor
+ if (contents == null) {
+ return super.getContainerElement();
+ }
return contents;
}