From 6ed9b1d27fc9df2487f4eb50ca2fb2667017fc05 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Tue, 29 May 2007 09:05:31 +0000 Subject: [PATCH] #733 svn changeset:1515/svn branch:trunk --- src/com/itmill/toolkit/ui/Select.java | 8 +++++--- 1 file 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); } /** -- 2.39.5