aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-03-04 09:26:02 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-03-04 09:26:02 +0000
commit707960f829ab10ccbb71cee04f2ee5db3177071a (patch)
treec63c44875aca54a41a052d69ae30b63c10b773dd /src/com/itmill/toolkit/tests/featurebrowser/Feature.java
parentbf910594825bb1a6b58c4f6c02d30f5779387ba9 (diff)
downloadvaadin-framework-707960f829ab10ccbb71cee04f2ee5db3177071a.tar.gz
vaadin-framework-707960f829ab10ccbb71cee04f2ee5db3177071a.zip
Refactored CustomComponent. Fixed possible NPE in Abstract component. Optimization for AbstractComponent.
svn changeset:3963/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/tests/featurebrowser/Feature.java')
-rw-r--r--src/com/itmill/toolkit/tests/featurebrowser/Feature.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
index 80b85a5298..2f16f3fe02 100644
--- a/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
+++ b/src/com/itmill/toolkit/tests/featurebrowser/Feature.java
@@ -186,8 +186,12 @@ public abstract class Feature extends CustomComponent {
}
// Fix for #512
- public Label getDescription() {
- return description;
+ public String getDescription() {
+ if (description != null && description.getValue() != null) {
+ return description.getValue().toString();
+ } else {
+ return null;
+ }
}
} \ No newline at end of file