Make ClassResource find associated Application class (#9402)

1 files changed, 10 insertions, 0 deletions

diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index fc3df8d052..7ef51dfc3e 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -27,6 +27,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Map;
 
+import com.vaadin.Application;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
@@ -94,6 +95,7 @@ public abstract class UI extends AbstractComponentContainer implements
     @Deprecated
     public static class LegacyWindow extends UI {
         private String name;
+        private Application application;
 
         /**
          * Create a new legacy window
@@ -127,6 +129,14 @@ public abstract class UI extends AbstractComponentContainer implements
             // Just empty
         }
 
+        public void setApplication(Application application) {
+            this.application = application;
+        }
+
+        public Application getApplication() {
+            return application;
+        }
+
         /**
          * Gets the unique name of the window. The name of the window is used to
          * uniquely identify it.