Merged 'b1ae3cd70e2ca4656bb28f77ca79fe0efd29dd67' (origin/6.8)

Conflicts:
	WebContent/release-notes.html
	tests/server-side/com/vaadin/tests/server/LicenseInJavaFiles.java

diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java
Simple merge

diff --cc src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index de68ae96a4f54d09663f12f3c9d48b062987be64,f7d23d44534be07fd83686ba71ba7c9440a870a3..24763745e337f89ffa3597ff6af3af6080e7b34a
--- 1/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
--- 2/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@@ -4536,10 -4744,10 +4547,11 @@@ public class VScrollTable extends FlowP
                  super.onAttach();
                  if (pendingComponentPaints != null) {
                      for (UIDL uidl : pendingComponentPaints) {
 -                        Paintable paintable = client.getPaintable(uidl);
 +                        VPaintableWidget paintable = (VPaintableWidget) VPaintableMap
 +                                .get(client).getPaintable(uidl.getId());
                          paintable.updateFromUIDL(uidl, client);
                      }
+                     pendingComponentPaints.clear();
                  }
              }
  

diff --cc src/com/vaadin/ui/Window.java
index e6c8642b84ac60e8c1704108c087fce82283bb7b,7e33f91d312f6d63411d7a2b5c33813f8af7f3b3..a6cf51e80f6ecfd4d131cfc5d96e5eff9e69b2d3
--- 1/src/com/vaadin/ui/Window.java
--- 2/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@@ -889,13 -2344,64 +889,37 @@@ 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();
+         }
+     }
+ 
  }

diff --cc tests/integration_tests.xml
Simple merge

diff --cc tests/testbench/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
Simple merge