diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-05-07 12:27:30 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2008-05-07 12:27:30 +0000 |
| commit | c4fc4080116d190a6da04f744100a96f142a9e66 (patch) | |
| tree | 58b8077e5cc14506c4a4733b9bf6aa5a7b35a4b9 /src | |
| parent | 7d79e4a30280d148dafa083c9387460ebc3adf97 (diff) | |
| download | vaadin-framework-c4fc4080116d190a6da04f744100a96f142a9e66.tar.gz vaadin-framework-c4fc4080116d190a6da04f744100a96f142a9e66.zip | |
fixes #1486
svn changeset:4369/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java | 6 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java index 0abb4233a4..848523b9a1 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java @@ -690,7 +690,9 @@ public class IExpandLayout extends ComplexPanel implements * Expanded widget is updated after layout function so it has its * container fixed at the moment of updateFromUIDL. */ - ((Paintable) expandedWidget).updateFromUIDL(expandedWidgetUidl, client); - + if (expandedWidget != null) { + ((Paintable) expandedWidget).updateFromUIDL(expandedWidgetUidl, + client); + } } } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java index f24ddf686f..dc8f18ee67 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java @@ -227,6 +227,9 @@ public class ISlider extends Widget implements Paintable, }
private void setValue(Double value, boolean animate, boolean updateToServer) {
+ if (value == null) {
+ return;
+ }
if (value.doubleValue() < min) {
value = new Double(min);
} else if (value.doubleValue() > max) {
|