aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/itmill/toolkit/ui/Select.java
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2007-05-29 09:05:31 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2007-05-29 09:05:31 +0000
commit6ed9b1d27fc9df2487f4eb50ca2fb2667017fc05 (patch)
tree935fbb50da60eb0b17195edaa8ff74fbf1460726 /src/com/itmill/toolkit/ui/Select.java
parent838a729aff4db9674f33d13fbc0969478ac4546c (diff)
downloadvaadin-framework-6ed9b1d27fc9df2487f4eb50ca2fb2667017fc05.tar.gz
vaadin-framework-6ed9b1d27fc9df2487f4eb50ca2fb2667017fc05.zip
#733
svn changeset:1515/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/ui/Select.java')
-rw-r--r--src/com/itmill/toolkit/ui/Select.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/itmill/toolkit/ui/Select.java b/src/com/itmill/toolkit/ui/Select.java
index 269ae6f8e9..b986e84e08 100644
--- a/src/com/itmill/toolkit/ui/Select.java
+++ b/src/com/itmill/toolkit/ui/Select.java
@@ -46,6 +46,7 @@ import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
+import com.itmill.toolkit.Application;
import com.itmill.toolkit.data.Container;
import com.itmill.toolkit.data.Item;
import com.itmill.toolkit.data.Property;
@@ -1429,8 +1430,9 @@ public class Select extends AbstractField implements Container,
if (useLazyLoading != isLazyLoading()) {
if (useLazyLoading) {
optionsStream = new OptionsStream(this);
- if (getApplication() != null)
- getWindow().addURIHandler(optionsStream);
+ Application app = getApplication();
+ if (app != null)
+ app.getMainWindow().addURIHandler(optionsStream);
} else {
if (getApplication() != null)
getWindow().removeURIHandler(optionsStream);
@@ -1449,7 +1451,7 @@ public class Select extends AbstractField implements Container,
public void attach() {
super.attach();
if (optionsStream != null)
- getWindow().addURIHandler(optionsStream);
+ getApplication().getMainWindow().addURIHandler(optionsStream);
}
/**