From 96b7065f7ce30e4ef04bea13905745e05eb7bae6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Leif=20=C3=85strand?= Date: Tue, 29 Nov 2011 15:11:12 +0200 Subject: [PATCH] Ensure window attached by LegacyApplication has an application --- src/com/vaadin/Application.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java index 23bac80e19..7bbe0b095c 100644 --- a/src/com/vaadin/Application.java +++ b/src/com/vaadin/Application.java @@ -120,6 +120,12 @@ public class Application implements Terminal.ErrorListener, Serializable { throw new IllegalStateException( "mainWindow has already been set"); } + if (mainWindow.getApplication() == null) { + mainWindow.setApplication(this); + } else if (mainWindow.getApplication() != this) { + throw new IllegalStateException( + "mainWindow is attached to another application"); + } this.mainWindow = mainWindow; } @@ -172,6 +178,7 @@ public class Application implements Terminal.ErrorListener, Serializable { public void addWindow(Root root, String name) { legacyRootNames.put(name, root); + root.setApplication(this); } public void removeWindow(Root root) { -- 2.39.5