From: Artur Signell <artur@vaadin.com>
Date: Fri, 23 Mar 2012 07:47:23 +0000 (+0200)
Subject: Merge commit '8da6b1a0c3293c7de05ebc3d451a2f2e272a13b8' from origin/6.8
X-Git-Tag: 7.0.0.alpha2~231
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dd06b3cb695567379b381e4be28fb609d0c70074;p=vaadin-framework.git

Merge commit '8da6b1a0c3293c7de05ebc3d451a2f2e272a13b8' from origin/6.8

Conflicts:
	src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
---

dd06b3cb695567379b381e4be28fb609d0c70074
diff --cc src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index d2064c8d5e,b77203532f..ffef5825f4
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@@ -527,12 -548,9 +529,16 @@@ public class VTabsheet extends VTabshee
      // Can't use "style" as it's already in use
      public static final String TAB_STYLE_NAME = "tabstyle";
  
 +    final Element tabs; // tabbar and 'scroller' container
 +    Tab focusedTab;
++    /**
++     * The tabindex property (position in the browser's focus cycle.) Named like
++     * this to avoid confusion with activeTabIndex.
++     */
 +    int tabulatorIndex = 0;
 +
      private static final FocusImpl focusImpl = FocusImpl.getFocusImplForPanel();
  
 -    private final Element tabs; // tabbar and 'scroller' container
      private final Element scroller; // tab-scroller element
      private final Element scrollerNext; // tab-scroller next button element
      private final Element scrollerPrev; // tab-scroller prev button element
diff --cc src/com/vaadin/ui/GridLayout.java
index 596773b870,90122cddf9..bc5f1a1999
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@@ -18,13 -18,22 +18,22 @@@ import com.vaadin.event.LayoutEvents.La
  import com.vaadin.terminal.PaintException;
  import com.vaadin.terminal.PaintTarget;
  import com.vaadin.terminal.gwt.client.EventId;
 -import com.vaadin.terminal.gwt.client.ui.VGridLayout;
 +import com.vaadin.terminal.gwt.client.ui.GridLayoutConnector;
  
  /**
+  * A layout where the components are laid out on a grid using cell coordinates.
+  * 
+  * <p>
+  * The GridLayout also maintains a cursor for adding components in
+  * left-to-right, top-to-bottom order.
+  * </p>
+  * 
   * <p>
-  * A container that consists of components with certain coordinates (cell
-  * position) on a grid. It also maintains cursor for adding component in left to
-  * right, top to bottom order.
+  * Each component in a <code>GridLayout</code> uses a defined
+  * {@link GridLayout.Area area} (column1,row1,column2,row2) from the grid. The
+  * components may not overlap with the existing components - if you try to do so
+  * you will get an {@link OverlapsException}. Adding a component with cursor
+  * automatically extends the grid by increasing the grid height.
   * </p>
   * 
   * <p>