aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2007-11-26 13:08:12 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2007-11-26 13:08:12 +0000
commitccd1c895a6ecb5c6fd30db28414117b2df0e05a0 (patch)
tree741814a5d86a1ea0b17297c09997049e75d7d47e
parent89f144b3a28d782efb202afae8db639d6852608c (diff)
downloadvaadin-framework-ccd1c895a6ecb5c6fd30db28414117b2df0e05a0.tar.gz
vaadin-framework-ccd1c895a6ecb5c6fd30db28414117b2df0e05a0.zip
avoid npe's on node click in test bench
svn changeset:2964/svn branch:trunk
-rw-r--r--src/com/itmill/toolkit/demo/testbench/TestBench.java13
-rw-r--r--src/com/itmill/toolkit/tests/TestBench.java12
2 files changed, 19 insertions, 6 deletions
diff --git a/src/com/itmill/toolkit/demo/testbench/TestBench.java b/src/com/itmill/toolkit/demo/testbench/TestBench.java
index c455dc72ae..090ee9fe0a 100644
--- a/src/com/itmill/toolkit/demo/testbench/TestBench.java
+++ b/src/com/itmill/toolkit/demo/testbench/TestBench.java
@@ -138,9 +138,16 @@ public class TestBench extends com.itmill.toolkit.Application implements
bodyLayout.removeAllComponents();
bodyLayout.setCaption(null);
- String title = ((Class) menu.getValue()).getName();
- bodyLayout.setCaption(title);
- bodyLayout.addComponent(createTestable((Class) menu.getValue()));
+ Object o = menu.getValue();
+ if (o instanceof Class) {
+ Class c = (Class) o;
+ String title = c.getName();
+ bodyLayout.setCaption(title);
+ bodyLayout.addComponent(createTestable(c));
+ } else {
+ // NOP node selected
+ }
+
}
/**
diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/itmill/toolkit/tests/TestBench.java
index 48fd3cffe5..6de3cc7111 100644
--- a/src/com/itmill/toolkit/tests/TestBench.java
+++ b/src/com/itmill/toolkit/tests/TestBench.java
@@ -143,9 +143,15 @@ public class TestBench extends com.itmill.toolkit.Application implements
bodyLayout.removeAllComponents();
bodyLayout.setCaption(null);
- String title = ((Class) menu.getValue()).getName();
- bodyLayout.setCaption(title);
- bodyLayout.addComponent(createTestable((Class) menu.getValue()));
+ Object o = menu.getValue();
+ if (o instanceof Class) {
+ Class c = (Class) o;
+ String title = c.getName();
+ bodyLayout.setCaption(title);
+ bodyLayout.addComponent(createTestable(c));
+ } else {
+ // NOP node selected
+ }
}
/**