From: Artur Signell <artur@vaadin.com>
Date: Tue, 31 Jan 2012 16:55:40 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/6.8'
X-Git-Tag: 7.0.0.alpha2~483
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=92fe7ca57723007184a6f48a8e3109fc48a4ff61;p=vaadin-framework.git

Merge remote-tracking branch 'origin/6.8'

Conflicts:
	WebContent/release-notes.html
---

92fe7ca57723007184a6f48a8e3109fc48a4ff61
diff --cc src/com/vaadin/ui/Window.java
index a6cf51e80f,5f6c29f182..e6c8642b84
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@@ -889,37 -2344,40 +889,13 @@@ public class Window extends Panel imple
       */
      @Override
      public void focus() {
 -        if (getParent() != null) {
 -            /*
 -             * When focusing a sub-window it basically means it should be
 -             * brought to the front. Instead of just moving the keyboard focus
 -             * we focus the window and bring it top-most.
 -             */
 -            bringToFront();
 -        } else {
 -            super.focus();
 -        }
 -    }
 -
 -    /**
 -     * Notifies the child components and subwindows that the window is attached
 -     * to the application.
 -     */
 -    @Override
 -    public void attach() {
 -        super.attach();
 -        for (Window w : subwindows) {
 -            w.attach();
 -        }
 -    }
 -
 -    /**
 -     * Notifies the child components and subwindows that the window is detached
 -     * from the application.
 -     */
 -    @Override
 -    public void detach() {
 -        super.detach();
 -        for (Window w : subwindows) {
 -            w.detach();
 -        }
 +        /*
 +         * When focusing a sub-window it basically means it should be brought to
 +         * the front. Instead of just moving the keyboard focus we focus the
 +         * window and bring it top-most.
 +         */
 +        super.focus();
 +        bringToFront();
      }
  
-     /**
-      * Notifies the child components and subwindows that the window is attached
-      * to the application.
-      */
-     @Override
-     public void attach() {
-         super.attach();
-         for (Window w : subwindows) {
-             w.attach();
-         }
-     }
- 
-     /**
-      * Notifies the child components and subwindows that the window is detached
-      * from the application.
-      */
-     @Override
-     public void detach() {
-         super.detach();
-         for (Window w : subwindows) {
-             w.detach();
-         }
-     }
- 
  }