Merge remote-tracking branch 'origin/grid' into 7.4

78 files changed, 152 insertions, 105 deletions

diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
index bf1e11c9e3..b0b947e3bf 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/RendererVisitor.java
@@ -37,7 +37,7 @@ import com.vaadin.client.connectors.AbstractRendererConnector;
  * 
  * @see WidgetInitVisitor
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class RendererVisitor extends TypeVisitor {
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index 783d6db36f..ed9cfce062 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -700,6 +700,7 @@ public class Util {
      * @param element
      *            the element of which to calculate the width
      * @return the subpixel-accurate width of the element
+     * @since 7.4
      */
     public static native double getRequiredWidthBoundingClientRectDouble(
             com.google.gwt.dom.client.Element element)
@@ -777,6 +778,7 @@ public class Util {
      * @param element
      *            the element of which to calculate the height
      * @return the subpixel-accurate height of the element
+     * @since 7.4
      */
     public static native double getRequiredHeightBoundingClientRectDouble(
             com.google.gwt.dom.client.Element element)
@@ -1588,6 +1590,9 @@ public class Util {
      *            the first value for which to compare equality
      * @param num2
      *            the second value for which to compare equality
+     * @since 7.4
+     * 
+     * @return true if the values are considered equals; false otherwise
      */
     public static boolean pixelValuesEqual(final double num1, final double num2) {
         return Math.abs(num1 - num2) <= PIXEL_EPSILON;
diff --git a/client/src/com/vaadin/client/communication/RpcManager.java b/client/src/com/vaadin/client/communication/RpcManager.java
index 753db4a19b..f5c3ca9ffb 100644
--- a/client/src/com/vaadin/client/communication/RpcManager.java
+++ b/client/src/com/vaadin/client/communication/RpcManager.java
@@ -70,7 +70,7 @@ public class RpcManager {
      * @param invocation
      *            the method invocation to get the method for
      * 
-     * @since
+     * @since 7.4
      * @return the method targeted by this invocation
      */
     public static Method getMethod(MethodInvocation invocation) {
diff --git a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
index 26b60bd2ae..6799c0bd23 100644
--- a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
+++ b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
@@ -502,7 +502,16 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
 
         size += count;
 
-        if (cached.contains(firstRowIndex)) {
+        if (firstRowIndex < cached.getStart()) {
+            Range oldCached = cached;
+            cached = cached.offsetBy(count);
+
+            for (int i = 1; i <= indexToRowMap.size(); i++) {
+                int oldIndex = oldCached.getEnd() - i;
+                int newIndex = cached.getEnd() - i;
+                moveRowFromIndexToIndex(oldIndex, newIndex);
+            }
+        } else if (cached.contains(firstRowIndex)) {
             int oldCacheEnd = cached.getEnd();
             /*
              * We need to invalidate the cache from the inserted row onwards,
@@ -519,18 +528,6 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
                 keyToIndexMap.remove(getRowKey(row));
             }
         }
-
-        else if (firstRowIndex < cached.getStart()) {
-            Range oldCached = cached;
-            cached = cached.offsetBy(count);
-
-            for (int i = 0; i < indexToRowMap.size(); i++) {
-                int oldIndex = oldCached.getEnd() - i;
-                int newIndex = cached.getEnd() - i;
-                moveRowFromIndexToIndex(oldIndex, newIndex);
-            }
-        }
-
         assertDataChangeHandlerIsInjected();
         dataChangeHandler.dataAdded(firstRowIndex, count);
         ensureCoverageCheck();
@@ -545,7 +542,9 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
             keyToIndexMap.remove(getRowKey(indexToRowMap.get(newIndex)));
         }
         indexToRowMap.put(newIndex, row);
-        keyToIndexMap.put(getRowKey(row), newIndex);
+        if (row != null) {
+            keyToIndexMap.put(getRowKey(row), newIndex);
+        }
     }
 
     /**
diff --git a/client/src/com/vaadin/client/metadata/Method.java b/client/src/com/vaadin/client/metadata/Method.java
index d88dbf876e..8757a9de20 100644
--- a/client/src/com/vaadin/client/metadata/Method.java
+++ b/client/src/com/vaadin/client/metadata/Method.java
@@ -105,7 +105,7 @@ public class Method {
     /**
      * Checks whether this method is annotated with {@link NoLayout}.
      * 
-     * @since
+     * @since 7.4
      * 
      * @return <code>true</code> if this method has a NoLayout annotation;
      *         otherwise <code>false</code>
diff --git a/client/src/com/vaadin/client/metadata/Property.java b/client/src/com/vaadin/client/metadata/Property.java
index 5825cf12d3..90b29b32b7 100644
--- a/client/src/com/vaadin/client/metadata/Property.java
+++ b/client/src/com/vaadin/client/metadata/Property.java
@@ -131,7 +131,7 @@ public class Property {
     /**
      * Checks whether this property is annotated with {@link NoLayout}.
      * 
-     * @since
+     * @since 7.4
      * 
      * @return <code>true</code> if this property has a NoLayout annotation;
      *         otherwise <code>false</code>
diff --git a/client/src/com/vaadin/client/metadata/TypeDataStore.java b/client/src/com/vaadin/client/metadata/TypeDataStore.java
index a402973651..6d46ed1365 100644
--- a/client/src/com/vaadin/client/metadata/TypeDataStore.java
+++ b/client/src/com/vaadin/client/metadata/TypeDataStore.java
@@ -444,7 +444,7 @@ public class TypeDataStore {
      * @param method
      *            the rpc method to check
      * 
-     * @since
+     * @since 7.4
      * 
      * @return <code>true</code> if the method has a NoLayout annotation;
      *         otherwise <code>false</code>
@@ -456,7 +456,7 @@ public class TypeDataStore {
     /**
      * Defines that a method is annotated with {@link NoLayout}.
      * 
-     * @since
+     * @since 7.4
      * 
      * @param type
      *            the where the method is defined
@@ -474,7 +474,7 @@ public class TypeDataStore {
      * @param property
      *            the property to check
      * 
-     * @since
+     * @since 7.4
      * 
      * @return <code>true</code> if the property has a NoLayout annotation;
      *         otherwise <code>false</code>
diff --git a/client/src/com/vaadin/client/widget/escalator/Cell.java b/client/src/com/vaadin/client/widget/escalator/Cell.java
index 9ee6030f32..08dbcf6955 100644
--- a/client/src/com/vaadin/client/widget/escalator/Cell.java
+++ b/client/src/com/vaadin/client/widget/escalator/Cell.java
@@ -26,7 +26,7 @@ import com.google.gwt.dom.client.TableCellElement;
  * Unlike the {@link FlyweightRow}, an instance of {@link Cell} can be stored in
  * a field.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class Cell {
diff --git a/client/src/com/vaadin/client/widget/escalator/ColumnConfiguration.java b/client/src/com/vaadin/client/widget/escalator/ColumnConfiguration.java
index 2a58fe7f66..af49dcd64f 100644
--- a/client/src/com/vaadin/client/widget/escalator/ColumnConfiguration.java
+++ b/client/src/com/vaadin/client/widget/escalator/ColumnConfiguration.java
@@ -16,10 +16,12 @@
 
 package com.vaadin.client.widget.escalator;
 
+import com.vaadin.client.widgets.Escalator;
+
 /**
  * A representation of the columns in an instance of {@link Escalator}.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  * @see Escalator#getColumnConfiguration()
  */
diff --git a/client/src/com/vaadin/client/widget/escalator/EscalatorUpdater.java b/client/src/com/vaadin/client/widget/escalator/EscalatorUpdater.java
index 03587b4569..6109c5e51d 100644
--- a/client/src/com/vaadin/client/widget/escalator/EscalatorUpdater.java
+++ b/client/src/com/vaadin/client/widget/escalator/EscalatorUpdater.java
@@ -16,6 +16,8 @@
 
 package com.vaadin.client.widget.escalator;
 
+import com.vaadin.client.widgets.Escalator;
+
 /**
  * An interface that allows client code to define how a certain row in Escalator
  * will be displayed. The contents of an escalator's header, body and footer are
@@ -27,7 +29,7 @@ package com.vaadin.client.widget.escalator;
  * This has a similar function to {@link Grid Grid's} {@link Renderer Renderers}
  * , although they operate on different abstraction levels.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  * @see RowContainer#setEscalatorUpdater(EscalatorUpdater)
  * @see Escalator#getHeader()
diff --git a/client/src/com/vaadin/client/widget/escalator/FlyweightCell.java b/client/src/com/vaadin/client/widget/escalator/FlyweightCell.java
index 42fa245e59..b77b752327 100644
--- a/client/src/com/vaadin/client/widget/escalator/FlyweightCell.java
+++ b/client/src/com/vaadin/client/widget/escalator/FlyweightCell.java
@@ -33,7 +33,7 @@ import com.vaadin.client.widgets.Escalator;
  * and so should not be stored anywhere outside of the method providing these
  * instances.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class FlyweightCell {
diff --git a/client/src/com/vaadin/client/widget/escalator/FlyweightRow.java b/client/src/com/vaadin/client/widget/escalator/FlyweightRow.java
index faa1440c24..6e25e82235 100644
--- a/client/src/com/vaadin/client/widget/escalator/FlyweightRow.java
+++ b/client/src/com/vaadin/client/widget/escalator/FlyweightRow.java
@@ -29,7 +29,7 @@ import com.vaadin.client.widgets.Escalator;
  * There is only one instance per Escalator. This is designed to be re-used when
  * rendering rows.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  * @see Escalator.AbstractRowContainer#refreshRow(Node, int)
  */
diff --git a/client/src/com/vaadin/client/widget/escalator/PositionFunction.java b/client/src/com/vaadin/client/widget/escalator/PositionFunction.java
index 7727e73de3..929f27df37 100644
--- a/client/src/com/vaadin/client/widget/escalator/PositionFunction.java
+++ b/client/src/com/vaadin/client/widget/escalator/PositionFunction.java
@@ -22,7 +22,7 @@ import com.google.gwt.dom.client.Style.Unit;
 /**
  * A functional interface that can be used for positioning elements in the DOM.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface PositionFunction {
diff --git a/client/src/com/vaadin/client/widget/escalator/Row.java b/client/src/com/vaadin/client/widget/escalator/Row.java
index bd66837a18..bcb3e163e4 100644
--- a/client/src/com/vaadin/client/widget/escalator/Row.java
+++ b/client/src/com/vaadin/client/widget/escalator/Row.java
@@ -17,11 +17,12 @@
 package com.vaadin.client.widget.escalator;
 
 import com.google.gwt.dom.client.TableRowElement;
+import com.vaadin.client.widgets.Escalator;
 
 /**
  * A representation of a row in an {@link Escalator}.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface Row {
diff --git a/client/src/com/vaadin/client/widget/escalator/RowContainer.java b/client/src/com/vaadin/client/widget/escalator/RowContainer.java
index be80e97d05..2fe2070b0d 100644
--- a/client/src/com/vaadin/client/widget/escalator/RowContainer.java
+++ b/client/src/com/vaadin/client/widget/escalator/RowContainer.java
@@ -18,12 +18,13 @@ package com.vaadin.client.widget.escalator;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.TableRowElement;
+import com.vaadin.client.widgets.Escalator;
 
 /**
  * A representation of the rows in each of the sections (header, body and
  * footer) in an {@link Escalator}.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  * @see Escalator#getHeader()
  * @see Escalator#getBody()
diff --git a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java b/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
index 6807e98039..968013b401 100644
--- a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
+++ b/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeEvent.java
@@ -21,7 +21,7 @@ import com.google.gwt.event.shared.GwtEvent;
 /**
  * Event fired when the range of visible rows changes e.g. because of scrolling.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class RowVisibilityChangeEvent extends
diff --git a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java b/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java
index 31afe66adb..80a30184c0 100644
--- a/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java
+++ b/client/src/com/vaadin/client/widget/escalator/RowVisibilityChangeHandler.java
@@ -22,7 +22,7 @@ import com.google.gwt.event.shared.EventHandler;
  * Event handler that gets notified when the range of visible rows changes e.g.
  * because of scrolling.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface RowVisibilityChangeHandler extends EventHandler {
diff --git a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java
index 5699d994c0..96ebd811fb 100644
--- a/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java
+++ b/client/src/com/vaadin/client/widget/escalator/ScrollbarBundle.java
@@ -39,7 +39,7 @@ import com.vaadin.client.widget.grid.events.ScrollHandler;
  * An element-like bundle representing a configurable and visual scrollbar in
  * one axis.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  * @see VerticalScrollbarBundle
  * @see HorizontalScrollbarBundle
diff --git a/client/src/com/vaadin/client/widget/grid/CellReference.java b/client/src/com/vaadin/client/widget/grid/CellReference.java
index bddb24d8fc..a2e841de43 100644
--- a/client/src/com/vaadin/client/widget/grid/CellReference.java
+++ b/client/src/com/vaadin/client/widget/grid/CellReference.java
@@ -26,8 +26,10 @@ import com.vaadin.client.widgets.Grid;
  * this object is subject to change without the user knowing it and so should
  * not be stored anywhere outside of the method providing these instances.
  * 
+ * @author Vaadin Ltd
  * @param <T>
  *            the type of the row object containing this cell
+ * @since 7.4
  */
 public class CellReference<T> {
     private int columnIndex;
diff --git a/client/src/com/vaadin/client/widget/grid/CellStyleGenerator.java b/client/src/com/vaadin/client/widget/grid/CellStyleGenerator.java
index e29148d76b..bbc540de64 100644
--- a/client/src/com/vaadin/client/widget/grid/CellStyleGenerator.java
+++ b/client/src/com/vaadin/client/widget/grid/CellStyleGenerator.java
@@ -20,10 +20,11 @@ import com.vaadin.client.widgets.Grid;
 /**
  * Callback interface for generating custom style names for cells
  * 
+ * @author Vaadin Ltd
  * @param <T>
  *            the row type of the target grid
- * 
  * @see Grid#setCellStyleGenerator(CellStyleGenerator)
+ * @since 7.4
  */
 public interface CellStyleGenerator<T> {
 
diff --git a/client/src/com/vaadin/client/widget/grid/DataAvailableEvent.java b/client/src/com/vaadin/client/widget/grid/DataAvailableEvent.java
index 270abcbed6..d88fce4e11 100644
--- a/client/src/com/vaadin/client/widget/grid/DataAvailableEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/DataAvailableEvent.java
@@ -21,7 +21,7 @@ import com.vaadin.shared.ui.grid.Range;
 /**
  * Event object describing a change of row availability in DataSource of a Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class DataAvailableEvent extends GwtEvent<DataAvailableHandler> {
diff --git a/client/src/com/vaadin/client/widget/grid/DataAvailableHandler.java b/client/src/com/vaadin/client/widget/grid/DataAvailableHandler.java
index a76306d38b..5e0650bc41 100644
--- a/client/src/com/vaadin/client/widget/grid/DataAvailableHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/DataAvailableHandler.java
@@ -20,7 +20,7 @@ import com.google.gwt.event.shared.EventHandler;
 /**
  * Handler for {@link DataAvailableEvent}s.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface DataAvailableHandler extends EventHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/EditorHandler.java b/client/src/com/vaadin/client/widget/grid/EditorHandler.java
index 79e1a73bcb..f834143a45 100644
--- a/client/src/com/vaadin/client/widget/grid/EditorHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/EditorHandler.java
@@ -26,7 +26,7 @@ import com.vaadin.client.widgets.Grid;
  * @param <T>
  *            the row data type
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface EditorHandler<T> {
@@ -181,7 +181,7 @@ public interface EditorHandler<T> {
      * request.startAsync()} to signal the caller that the request is handled
      * asynchronously. In that case, {@link EditorRequest#complete()} must be
      * called once the cancel operation is complete.
-     *
+     * 
      * @param request
      *            the cancel request
      * 
@@ -197,7 +197,7 @@ public interface EditorHandler<T> {
      * request.startAsync()} to signal the caller that the request is handled
      * asynchronously. In that case, {@link EditorRequest#complete()} must be
      * called once the commit operation is complete.
-     *
+     * 
      * @param request
      *            the save request
      * 
diff --git a/client/src/com/vaadin/client/widget/grid/EventCellReference.java b/client/src/com/vaadin/client/widget/grid/EventCellReference.java
index 86c3bcb5b6..cf13798e11 100644
--- a/client/src/com/vaadin/client/widget/grid/EventCellReference.java
+++ b/client/src/com/vaadin/client/widget/grid/EventCellReference.java
@@ -27,7 +27,7 @@ import com.vaadin.client.widgets.Grid;
  * this object is subject to change without the user knowing it and so should
  * not be stored anywhere outside of the method providing these instances.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class EventCellReference<T> extends CellReference<T> {
diff --git a/client/src/com/vaadin/client/widget/grid/GridUtil.java b/client/src/com/vaadin/client/widget/grid/GridUtil.java
index a49dd36a57..25e29f52dc 100644
--- a/client/src/com/vaadin/client/widget/grid/GridUtil.java
+++ b/client/src/com/vaadin/client/widget/grid/GridUtil.java
@@ -27,7 +27,7 @@ import com.vaadin.client.widgets.Grid;
 /**
  * Utilities for working with Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class GridUtil {
diff --git a/client/src/com/vaadin/client/widget/grid/RendererCellReference.java b/client/src/com/vaadin/client/widget/grid/RendererCellReference.java
index 6457ecb32d..07ca462293 100644
--- a/client/src/com/vaadin/client/widget/grid/RendererCellReference.java
+++ b/client/src/com/vaadin/client/widget/grid/RendererCellReference.java
@@ -27,7 +27,7 @@ import com.vaadin.client.widgets.Grid;
  * this object is subject to change without the user knowing it and so should
  * not be stored anywhere outside of the method providing these instances.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class RendererCellReference extends CellReference<Object> {
@@ -63,6 +63,7 @@ public class RendererCellReference extends CellReference<Object> {
      * 
      * @return the element of the cell
      */
+    @Override
     public TableCellElement getElement() {
         return cell.getElement();
     }
diff --git a/client/src/com/vaadin/client/widget/grid/RowReference.java b/client/src/com/vaadin/client/widget/grid/RowReference.java
index 4298d05756..8874fcc5cc 100644
--- a/client/src/com/vaadin/client/widget/grid/RowReference.java
+++ b/client/src/com/vaadin/client/widget/grid/RowReference.java
@@ -26,8 +26,10 @@ import com.vaadin.client.widgets.Grid;
  * this object is subject to change without the user knowing it and so should
  * not be stored anywhere outside of the method providing these instances.
  * 
+ * @author Vaadin Ltd
  * @param <T>
  *            the row object type
+ * @since 7.4
  */
 public class RowReference<T> {
     private final Grid<T> grid;
diff --git a/client/src/com/vaadin/client/widget/grid/RowStyleGenerator.java b/client/src/com/vaadin/client/widget/grid/RowStyleGenerator.java
index 67abda0be6..a12a9ff47d 100644
--- a/client/src/com/vaadin/client/widget/grid/RowStyleGenerator.java
+++ b/client/src/com/vaadin/client/widget/grid/RowStyleGenerator.java
@@ -20,10 +20,11 @@ import java.io.Serializable;
 /**
  * Callback interface for generating custom style names for data rows
  * 
+ * @author Vaadin Ltd
  * @param <T>
  *            the row type of the target grid
- * 
  * @see Grid#setRowStyleGenerator(RowStyleGenerator)
+ * @since 7.4
  */
 public interface RowStyleGenerator<T> extends Serializable {
 
diff --git a/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java b/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
index 1b1e182411..56e1db5c36 100644
--- a/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
+++ b/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
@@ -51,7 +51,7 @@ import com.vaadin.shared.util.SharedUtil;
  * ds.asList().addAll(Arrays.asList(5, 6, 7));
  * </pre>
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class ListDataSource<T> implements DataSource<T> {
diff --git a/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java b/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java
index 016f4aa7b3..69bea629b0 100644
--- a/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java
+++ b/client/src/com/vaadin/client/widget/grid/datasources/ListSorter.java
@@ -32,10 +32,10 @@ import com.vaadin.shared.data.sort.SortDirection;
  * Provides sorting facility from Grid for the {@link ListDataSource} in-memory
  * data source.
  * 
- * @since
  * @author Vaadin Ltd
  * @param <T>
  *            Grid row data type
+ * @since 7.4
  */
 public class ListSorter<T> {
 
diff --git a/client/src/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java b/client/src/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java
index a0a02ef865..120c32d380 100644
--- a/client/src/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/AbstractGridKeyEventHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widgets.Grid.AbstractGridKeyEvent;
 /**
  * Base interface of all handlers for {@link AbstractGridKeyEvent}s.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public abstract interface AbstractGridKeyEventHandler extends EventHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java b/client/src/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java
index 3b920800aa..f72dcc37d2 100644
--- a/client/src/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/AbstractGridMouseEventHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widgets.Grid.AbstractGridMouseEvent;
 /**
  * Base interface of all handlers for {@link AbstractGridMouseEvent}s.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public abstract interface AbstractGridMouseEventHandler extends EventHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyClickHandler.java b/client/src/com/vaadin/client/widget/grid/events/BodyClickHandler.java
index 6bcdf7662b..a66e170524 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyClickHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/BodyClickHandler.java
@@ -20,7 +20,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler.GridCl
 /**
  * Handler for {@link GridClickEvent}s that happen in the body of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface BodyClickHandler extends GridClickHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java b/client/src/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java
index 312cea4c76..ff1ae82d2e 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/BodyKeyDownHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyD
  * Handler for {@link GridKeyDownEvent}s that happen when the focused cell is in
  * the body of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface BodyKeyDownHandler extends GridKeyDownHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java b/client/src/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java
index 273a5a45be..245250d4c0 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/BodyKeyPressHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyP
  * Handler for {@link GridKeyPressEvent}s that happen when the focused cell is
  * in the body of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface BodyKeyPressHandler extends GridKeyPressHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java b/client/src/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java
index 5f86f52cd1..2c0951ea40 100644
--- a/client/src/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/BodyKeyUpHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyU
  * Handler for {@link GridKeyUpEvent}s that happen when the focused cell is in
  * the body of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface BodyKeyUpHandler extends GridKeyUpHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterClickHandler.java b/client/src/com/vaadin/client/widget/grid/events/FooterClickHandler.java
index ad86f1e5df..51fa38c948 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterClickHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/FooterClickHandler.java
@@ -20,7 +20,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler.GridCl
 /**
  * Handler for {@link GridClickEvent}s that happen in the footer of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface FooterClickHandler extends GridClickHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java b/client/src/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java
index 9e3c6a4241..85f83970f2 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/FooterKeyDownHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyD
  * Handler for {@link GridKeyDownEvent}s that happen when the focused cell is in
  * the footer of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface FooterKeyDownHandler extends GridKeyDownHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java b/client/src/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java
index b2995f743b..09778f6873 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/FooterKeyPressHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyP
  * Handler for {@link GridKeyPressEvent}s that happen when the focused cell is
  * in the footer of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface FooterKeyPressHandler extends GridKeyPressHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java b/client/src/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java
index dcf8f5cfc0..688f89880f 100644
--- a/client/src/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/FooterKeyUpHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyU
  * Handler for {@link GridKeyUpEvent}s that happen when the focused cell is in
  * the footer of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface FooterKeyUpHandler extends GridKeyUpHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridClickEvent.java b/client/src/com/vaadin/client/widget/grid/events/GridClickEvent.java
index 0e4b4b71de..ade878abc6 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridClickEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/events/GridClickEvent.java
@@ -25,7 +25,7 @@ import com.vaadin.client.widgets.Grid.Section;
 /**
  * Represents native mouse click event in Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class GridClickEvent extends AbstractGridMouseEvent<GridClickHandler> {
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java b/client/src/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java
index 0e4ea107d0..2ca7448849 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/events/GridKeyDownEvent.java
@@ -26,7 +26,7 @@ import com.vaadin.client.widgets.Grid.Section;
 /**
  * Represents native key down event in Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class GridKeyDownEvent extends AbstractGridKeyEvent<GridKeyDownHandler> {
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java b/client/src/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java
index 9d96d9175c..7171814262 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/events/GridKeyPressEvent.java
@@ -25,7 +25,7 @@ import com.vaadin.client.widgets.Grid.Section;
 /**
  * Represents native key press event in Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class GridKeyPressEvent extends
diff --git a/client/src/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java b/client/src/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java
index 60b7553d53..2b761a7039 100644
--- a/client/src/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/events/GridKeyUpEvent.java
@@ -26,7 +26,7 @@ import com.vaadin.client.widgets.Grid.Section;
 /**
  * Represents native key up event in Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class GridKeyUpEvent extends AbstractGridKeyEvent<GridKeyUpHandler> {
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderClickHandler.java b/client/src/com/vaadin/client/widget/grid/events/HeaderClickHandler.java
index 6f9158df0d..da20e80905 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderClickHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/HeaderClickHandler.java
@@ -20,7 +20,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridMouseEventHandler.GridCl
 /**
  * Handler for {@link GridClickEvent}s that happen in the header of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface HeaderClickHandler extends GridClickHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java b/client/src/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java
index c3824c9b63..555eb936af 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/HeaderKeyDownHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyD
  * Handler for {@link GridKeyDownEvent}s that happen when the focused cell is in
  * the header of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface HeaderKeyDownHandler extends GridKeyDownHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java b/client/src/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java
index 2d30838f38..c4dd312f93 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/HeaderKeyPressHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyP
  * Handler for {@link GridKeyPressEvent}s that happen when the focused cell is
  * in the header of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface HeaderKeyPressHandler extends GridKeyPressHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java b/client/src/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java
index fee147398a..4dbe1c681e 100644
--- a/client/src/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/HeaderKeyUpHandler.java
@@ -21,7 +21,7 @@ import com.vaadin.client.widget.grid.events.AbstractGridKeyEventHandler.GridKeyU
  * Handler for {@link GridKeyUpEvent}s that happen when the focused cell is in
  * the header of the Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface HeaderKeyUpHandler extends GridKeyUpHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/events/ScrollEvent.java b/client/src/com/vaadin/client/widget/grid/events/ScrollEvent.java
index 7e190821c8..08e1e07eab 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ScrollEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/events/ScrollEvent.java
@@ -21,6 +21,7 @@ import com.google.gwt.event.shared.GwtEvent;
  * An event that signifies that a scrollbar bundle has been scrolled
  * 
  * @author Vaadin Ltd
+ * @since 7.4
  */
 public class ScrollEvent extends GwtEvent<ScrollHandler> {
 
diff --git a/client/src/com/vaadin/client/widget/grid/events/ScrollHandler.java b/client/src/com/vaadin/client/widget/grid/events/ScrollHandler.java
index 74fe05ec05..1ce901e707 100644
--- a/client/src/com/vaadin/client/widget/grid/events/ScrollHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/ScrollHandler.java
@@ -21,6 +21,7 @@ import com.google.gwt.event.shared.EventHandler;
  * A handler that gets called whenever a scrollbar bundle is scrolled
  * 
  * @author Vaadin Ltd
+ * @since 7.4
  */
 public interface ScrollHandler extends EventHandler {
     /**
diff --git a/client/src/com/vaadin/client/widget/grid/events/SelectAllEvent.java b/client/src/com/vaadin/client/widget/grid/events/SelectAllEvent.java
index 2198441ae0..43c2055e95 100644
--- a/client/src/com/vaadin/client/widget/grid/events/SelectAllEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/events/SelectAllEvent.java
@@ -22,7 +22,7 @@ import com.vaadin.client.widget.grid.selection.SelectionModel;
  * A select all event, fired by the Grid when it needs all rows in data source
  * to be selected.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class SelectAllEvent<T> extends GwtEvent<SelectAllHandler<T>> {
diff --git a/client/src/com/vaadin/client/widget/grid/events/SelectAllHandler.java b/client/src/com/vaadin/client/widget/grid/events/SelectAllHandler.java
index ee30497a65..2cdee8d1b3 100644
--- a/client/src/com/vaadin/client/widget/grid/events/SelectAllHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/events/SelectAllHandler.java
@@ -21,7 +21,7 @@ import com.google.gwt.event.shared.EventHandler;
  * Handler for a Grid select all event, called when the Grid needs all rows in
  * data source to be selected.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface SelectAllHandler<T> extends EventHandler {
diff --git a/client/src/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java b/client/src/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
index 7458bf61a1..6b7bbb6294 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/AbstractRowHandleSelectionModel.java
@@ -27,6 +27,7 @@ import com.vaadin.client.data.DataSource.RowHandle;
  * @author Vaadin Ltd
  * @param <T>
  *            The grid's row type
+ * @since 7.4
  */
 public abstract class AbstractRowHandleSelectionModel<T> implements
         SelectionModel<T> {
diff --git a/client/src/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java b/client/src/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java
index dce5a3586d..0a1154e787 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/ClickSelectHandler.java
@@ -23,7 +23,7 @@ import com.vaadin.client.widgets.Grid;
 /**
  * Generic class to perform selections when clicking on cells in body of Grid.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class ClickSelectHandler<T> {
diff --git a/client/src/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java b/client/src/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java
index 0666e8fa30..ffcad4c903 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/HasSelectionHandlers.java
@@ -21,7 +21,7 @@ import com.google.gwt.event.shared.HandlerRegistration;
  * Marker interface for widgets that fires selection events.
  * 
  * @author Vaadin Ltd
- * @since
+ * @since 7.4
  */
 public interface HasSelectionHandlers<T> {
 
diff --git a/client/src/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java b/client/src/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
index b8e7c1f252..ea19e04c8e 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/MultiSelectionRenderer.java
@@ -39,7 +39,14 @@ import com.vaadin.client.widget.grid.RendererCellReference;
 import com.vaadin.client.widget.grid.selection.SelectionModel.Multi.Batched;
 import com.vaadin.client.widgets.Grid;
 
-/* This class will probably not survive the final merge of all selection functionality. */
+/**
+ * Renderer showing multi selection check boxes.
+ * 
+ * @author Vaadin Ltd
+ * @param <T>
+ *            the type of the associated grid
+ * @since 7.4
+ */
 public class MultiSelectionRenderer<T> extends ComplexRenderer<Boolean> {
 
     /** The size of the autoscroll area, both top and bottom. */
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionEvent.java b/client/src/com/vaadin/client/widget/grid/selection/SelectionEvent.java
index 9a3275cbad..7796425612 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/SelectionEvent.java
@@ -26,7 +26,7 @@ import com.vaadin.client.widgets.Grid;
 /**
  * Event object describing a change in Grid row selection state.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 @SuppressWarnings("rawtypes")
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionHandler.java b/client/src/com/vaadin/client/widget/grid/selection/SelectionHandler.java
index 9eba6b4c57..4f939fa798 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/SelectionHandler.java
@@ -20,10 +20,10 @@ import com.google.gwt.event.shared.EventHandler;
 /**
  * Handler for {@link SelectionEvent}s.
  * 
- * @since
  * @author Vaadin Ltd
  * @param <T>
  *            The row data type
+ * @since 7.4
  */
 public interface SelectionHandler<T> extends EventHandler {
 
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModel.java b/client/src/com/vaadin/client/widget/grid/selection/SelectionModel.java
index b711dd22a7..37f6fb48c3 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModel.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/SelectionModel.java
@@ -27,9 +27,9 @@ import com.vaadin.client.widgets.Grid;
  * dispatching events when the selection state changes.
  * 
  * @author Vaadin Ltd
- * @since
  * @param <T>
  *            Grid's row type
+ * @since 7.4
  */
 public interface SelectionModel<T> {
 
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java b/client/src/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
index 2fa1b7c9d9..d654a28b7d 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/SelectionModelMulti.java
@@ -30,7 +30,7 @@ import com.vaadin.client.widgets.Grid;
  * Multi-row selection model.
  * 
  * @author Vaadin Ltd
- * @since
+ * @since 7.4
  */
 public class SelectionModelMulti<T> extends AbstractRowHandleSelectionModel<T>
         implements SelectionModel.Multi.Batched<T> {
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelNone.java b/client/src/com/vaadin/client/widget/grid/selection/SelectionModelNone.java
index 68d547e54e..4a8b203a94 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelNone.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/SelectionModelNone.java
@@ -26,7 +26,7 @@ import com.vaadin.client.widgets.Grid;
  * No-row selection model.
  * 
  * @author Vaadin Ltd
- * @since
+ * @since 7.4
  */
 public class SelectionModelNone<T> extends AbstractRowHandleSelectionModel<T>
         implements SelectionModel.None<T> {
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java b/client/src/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
index 387c4d75e3..20eb3c1e63 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/SelectionModelSingle.java
@@ -26,7 +26,7 @@ import com.vaadin.client.widgets.Grid;
  * Single-row selection model.
  * 
  * @author Vaadin Ltd
- * @since
+ * @since 7.4
  */
 public class SelectionModelSingle<T> extends AbstractRowHandleSelectionModel<T>
         implements SelectionModel.Single<T> {
diff --git a/client/src/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java b/client/src/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java
index 1f9eafa42a..7a1bf2dc06 100644
--- a/client/src/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/selection/SpaceSelectHandler.java
@@ -29,10 +29,10 @@ import com.vaadin.shared.ui.grid.ScrollDestination;
 /**
  * Generic class to perform selections when pressing space key.
  * 
- * @since
  * @author Vaadin Ltd
  * @param <T>
  *            row data type
+ * @since 7.4
  */
 public class SpaceSelectHandler<T> {
 
diff --git a/client/src/com/vaadin/client/widget/grid/sort/Sort.java b/client/src/com/vaadin/client/widget/grid/sort/Sort.java
index eb174921fd..b1f3c6e39a 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/Sort.java
+++ b/client/src/com/vaadin/client/widget/grid/sort/Sort.java
@@ -24,7 +24,7 @@ import com.vaadin.shared.data.sort.SortDirection;
 /**
  * Fluid Sort descriptor object.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class Sort {
diff --git a/client/src/com/vaadin/client/widget/grid/sort/SortEvent.java b/client/src/com/vaadin/client/widget/grid/sort/SortEvent.java
index 3473e1e258..2aad6e4f95 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/SortEvent.java
+++ b/client/src/com/vaadin/client/widget/grid/sort/SortEvent.java
@@ -24,7 +24,7 @@ import com.vaadin.client.widgets.Grid;
  * A sort event, fired by the Grid when it needs its data source to provide data
  * sorted in a specific manner.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class SortEvent<T> extends GwtEvent<SortHandler<?>> {
diff --git a/client/src/com/vaadin/client/widget/grid/sort/SortHandler.java b/client/src/com/vaadin/client/widget/grid/sort/SortHandler.java
index bc7d78e97f..330cbe9d58 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/SortHandler.java
+++ b/client/src/com/vaadin/client/widget/grid/sort/SortHandler.java
@@ -20,8 +20,8 @@ import com.google.gwt.event.shared.EventHandler;
 /**
  * Handler for a Grid sort event, called when the Grid needs its data source to
  * provide data sorted in a specific manner.
- *
- * @since
+ * 
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public interface SortHandler<T> extends EventHandler {
@@ -29,7 +29,7 @@ public interface SortHandler<T> extends EventHandler {
     /**
      * Handle sorting of the Grid. This method is called when a re-sorting of
      * the Grid's data is requested.
-     *
+     * 
      * @param event
      *            the sort event
      */
diff --git a/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java b/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java
index 51013f3a8b..8166f1e6ed 100644
--- a/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java
+++ b/client/src/com/vaadin/client/widget/grid/sort/SortOrder.java
@@ -21,10 +21,8 @@ import com.vaadin.shared.data.sort.SortDirection;
 /**
  * Sort order descriptor. Contains column and direction references.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
- * @param T
- *            grid data type
  */
 public class SortOrder {
 
diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/com/vaadin/client/widgets/Escalator.java
index f1f0b9f845..74fb28bbd2 100644
--- a/client/src/com/vaadin/client/widgets/Escalator.java
+++ b/client/src/com/vaadin/client/widgets/Escalator.java
@@ -258,7 +258,7 @@ abstract class JsniWorkaround {
  * A low-level table-like widget that features a scrolling virtual viewport and
  * lazily generated rows.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class Escalator extends Widget implements RequiresResize, DeferredWorker {
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 76d0901168..50a41cd324 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -167,7 +167,7 @@ import com.vaadin.shared.util.SharedUtil;
  * @param <T>
  *            The row type of the grid. The row type is the POJO type from where
  *            the data is retrieved into the column cells.
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class Grid<T> extends ResizeComposite implements
@@ -1779,8 +1779,7 @@ public class Grid<T> extends ResizeComposite implements
             boolean bodyHasFocus = (containerWithFocus == escalator.getBody());
             boolean insertionIsAboveFocusedCell = (added.getStart() <= rowWithFocus);
             if (bodyHasFocus && insertionIsAboveFocusedCell) {
-                setCellFocus(rowWithFocus + added.length(),
-                        cellFocusRange.getStart(), containerWithFocus);
+                rowWithFocus += added.length();
             }
         }
 
diff --git a/server/src/com/vaadin/data/Container.java b/server/src/com/vaadin/data/Container.java
index c58d37d5fe..fb7a93e832 100644
--- a/server/src/com/vaadin/data/Container.java
+++ b/server/src/com/vaadin/data/Container.java
@@ -585,6 +585,8 @@ public interface Container extends Serializable {
         /**
          * An <code>Event</code> object specifying information about the added
          * items.
+         * 
+         * @since 7.4
          */
         public interface ItemAddEvent extends ItemSetChangeEvent {
 
@@ -613,6 +615,8 @@ public interface Container extends Serializable {
         /**
          * An <code>Event</code> object specifying information about the removed
          * items.
+         * 
+         * @since 7.4
          */
         public interface ItemRemoveEvent extends ItemSetChangeEvent {
             /**
diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index 5e56643d6e..8e119f0d94 100644
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -68,7 +68,7 @@ import elemental.json.JsonValue;
  * This will be changed once framework support for something more flexible has
  * been implemented.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class RpcDataProviderExtension extends AbstractExtension {
diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
index be42ee26e0..baef89f48d 100644
--- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
+++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java
@@ -148,8 +148,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
         }
     }
 
-    private static abstract class BaseItemAddOrRemoveEvent extends
-            EventObject implements Serializable {
+    private static abstract class BaseItemAddOrRemoveEvent extends EventObject
+            implements Serializable {
         protected Object itemId;
         protected int index;
         protected int count;
@@ -187,10 +187,11 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * This class provides information about the first added item and the number
      * of added items.
      * </p>
+     * 
+     * @since 7.4
      */
-    protected static class BaseItemAddEvent extends
-            BaseItemAddOrRemoveEvent implements
-            Container.Indexed.ItemAddEvent {
+    protected static class BaseItemAddEvent extends BaseItemAddOrRemoveEvent
+            implements Container.Indexed.ItemAddEvent {
 
         public BaseItemAddEvent(Container source, Object itemId, int index,
                 int count) {
@@ -211,13 +212,14 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      * This class provides information about the first removed item and the
      * number of removed items.
      * </p>
+     * 
+     * @since 7.4
      */
-    protected static class BaseItemRemoveEvent extends
-            BaseItemAddOrRemoveEvent implements
-            Container.Indexed.ItemRemoveEvent {
+    protected static class BaseItemRemoveEvent extends BaseItemAddOrRemoveEvent
+            implements Container.Indexed.ItemRemoveEvent {
 
-        public BaseItemRemoveEvent(Container source, Object itemId,
-                int index, int count) {
+        public BaseItemRemoveEvent(Container source, Object itemId, int index,
+                int count) {
             super(source, itemId, index, count);
         }
 
@@ -1005,8 +1007,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
      */
     protected void fireItemsAdded(int firstPosition, ITEMIDTYPE firstItemId,
             int numberOfItems) {
-        BaseItemAddEvent addEvent = new BaseItemAddEvent(this,
-                firstItemId, firstPosition, numberOfItems);
+        BaseItemAddEvent addEvent = new BaseItemAddEvent(this, firstItemId,
+                firstPosition, numberOfItems);
         fireItemSetChange(addEvent);
     }
 
@@ -1066,9 +1068,11 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE
     /**
      * Returns the item id of the first visible item after filtering. 'Null' is
      * returned if there is no visible items.
-     * 
+     * <p>
      * For internal use only.
      * 
+     * @since 7.4
+     * 
      * @return item id of the first visible item
      */
     protected ITEMIDTYPE getFirstVisibleItem() {
diff --git a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
index 3c4506c109..fd2ce609b8 100644
--- a/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
+++ b/server/src/com/vaadin/data/util/GeneratedPropertyContainer.java
@@ -57,7 +57,7 @@ import com.vaadin.shared.data.sort.SortDirection;
  * properties. Generated properties are always read-only. Trying to make them
  * editable throws an exception.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class GeneratedPropertyContainer extends AbstractContainer implements
diff --git a/server/src/com/vaadin/data/util/PropertyValueGenerator.java b/server/src/com/vaadin/data/util/PropertyValueGenerator.java
index c535803ee1..453e45b1db 100644
--- a/server/src/com/vaadin/data/util/PropertyValueGenerator.java
+++ b/server/src/com/vaadin/data/util/PropertyValueGenerator.java
@@ -28,7 +28,7 @@ import com.vaadin.data.util.filter.UnsupportedFilterException;
  * 
  * @param <T>
  *            Property data type
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public abstract class PropertyValueGenerator<T> implements Serializable {
diff --git a/server/src/com/vaadin/event/SelectionEvent.java b/server/src/com/vaadin/event/SelectionEvent.java
index f852ea0949..b6ade2aa9c 100644
--- a/server/src/com/vaadin/event/SelectionEvent.java
+++ b/server/src/com/vaadin/event/SelectionEvent.java
@@ -27,7 +27,7 @@ import com.google.gwt.thirdparty.guava.common.collect.Sets;
  * An event that specifies what in a selection has changed, and where the
  * selection took place.
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class SelectionEvent extends EventObject {
diff --git a/server/src/com/vaadin/event/SortEvent.java b/server/src/com/vaadin/event/SortEvent.java
index 968d2f6d83..b331f37efa 100644
--- a/server/src/com/vaadin/event/SortEvent.java
+++ b/server/src/com/vaadin/event/SortEvent.java
@@ -27,7 +27,7 @@ import com.vaadin.ui.Component;
  * 
  * @see SortListener
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class SortEvent extends Component.Event {
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java
index 8aee5ac19e..7d8ec59533 100644
--- a/server/src/com/vaadin/ui/Grid.java
+++ b/server/src/com/vaadin/ui/Grid.java
@@ -151,7 +151,7 @@ import elemental.json.JsonValue;
  * grid.setSelectionModel(new MyTwoSelectionModel());
  * </pre></code>
  * 
- * @since
+ * @since 7.4
  * @author Vaadin Ltd
  */
 public class Grid extends AbstractComponent implements SelectionNotifier,
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
index 3603d62e78..337293d687 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridStructureTest.java
@@ -367,6 +367,21 @@ public class GridStructureTest extends GridBasicFeaturesTest {
                 "overflow-y"));
     }
 
+    @Test
+    public void testAddRowAboveViewport() {
+        setDebug(true);
+        openTestURL();
+
+        GridCellElement cell = getGridElement().getCell(500, 1);
+        String cellContent = cell.getText();
+        selectMenuPath("Component", "Body rows", "Add first row");
+
+        assertFalse("Error notification was present",
+                isElementPresent(NotificationElement.class));
+
+        assertEquals("Grid scrolled unexpectedly", cellContent, cell.getText());
+    }
+
     private void assertPrimaryStylename(String stylename) {
         assertTrue(getGridElement().getAttribute("class").contains(stylename));