aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/ui/Window.java
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2009-09-25 12:07:09 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2009-09-25 12:07:09 +0000
commit5ef5da15a7903262494d7e3fd7867dde7ed746c4 (patch)
treee8227a00f50dd110149c391301536c99a1dd035a /src/com/vaadin/ui/Window.java
parent0da15b7ebb4b356e49bda9b9c0fb6faf95029fd2 (diff)
downloadvaadin-framework-5ef5da15a7903262494d7e3fd7867dde7ed746c4.tar.gz
vaadin-framework-5ef5da15a7903262494d7e3fd7867dde7ed746c4.zip
steps toward simpler widgetset creation. Still needs a lot of cleaning and refining.
svn changeset:8930/svn branch:2009-09-widget-packaging_3332
Diffstat (limited to 'src/com/vaadin/ui/Window.java')
-rw-r--r--src/com/vaadin/ui/Window.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 663aabbd79..1912a434ef 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -24,6 +24,7 @@ import com.vaadin.terminal.Resource;
import com.vaadin.terminal.Sizeable;
import com.vaadin.terminal.Terminal;
import com.vaadin.terminal.URIHandler;
+import com.vaadin.terminal.gwt.client.ui.VView;
/**
* Application window component.
@@ -34,6 +35,7 @@ import com.vaadin.terminal.URIHandler;
* @since 3.0
*/
@SuppressWarnings("serial")
+@ClientWidget(VView.class)
public class Window extends Panel implements URIHandler, ParameterHandler {
/**
@@ -535,10 +537,15 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
// Window closing
target.addVariable(this, "close", false);
- // Paint subwindows
- for (final Iterator<Window> i = subwindows.iterator(); i.hasNext();) {
- final Window w = i.next();
- w.paint(target);
+ if (getParent() == null) {
+ // Paint subwindows
+ for (final Iterator<Window> i = subwindows.iterator(); i.hasNext();) {
+ final Window w = i.next();
+ w.paint(target);
+ }
+ } else {
+ // mark subwindows
+ target.addAttribute("sub", true);
}
// Paint notifications