fixes #1036 and removes some obsolete code

svn changeset:3704/svn branch:trunk

1 files changed, 17 insertions, 1 deletions

diff --git a/src/com/itmill/toolkit/ui/Window.java b/src/com/itmill/toolkit/ui/Window.java
index 92ed8db5ad..2eca2e0a40 100644
--- a/src/com/itmill/toolkit/ui/Window.java
+++ b/src/com/itmill/toolkit/ui/Window.java
@@ -124,7 +124,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
 
     private LinkedList notifications;
 
-    private boolean modal;
+    private boolean modal = false;
 
     /* ********************************************************************* */
 
@@ -871,8 +871,24 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
         // Closing
         final Boolean close = (Boolean) variables.get("close");
         if (close != null && close.booleanValue()) {
+            close();
+        }
+    }
+
+    /**
+     * Method that handles window closing (from UI). If one wants to have window
+     * that cannot be closed (with server side check), override this with and
+     * empty method.
+     */
+    protected void close() {
+        Window parent = (Window) getParent();
+        if (parent == null) {
             setVisible(false);
             fireClose();
+        } else {
+            // subwindow is removed from parent
+            parent.removeWindow(this);
+            fireClose();
         }
     }