Merge branch 'master' into grid

Change-Id: If5f2f438715da97592a61cad7fd292554d8c5ea9

5 files changed, 23 insertions, 19 deletions

diff --git a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
index 0ad1631e19..bd676e4ee9 100644
--- a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
+++ b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java
@@ -362,7 +362,16 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> {
         return indexToRowMap.get(Integer.valueOf(rowIndex));
     }
 
-    @Override
+    /**
+     * Retrieves the index for given row object.
+     * <p>
+     * <em>Note:</em> This method does not verify that the given row object
+     * exists at all in this DataSource.
+     * 
+     * @param row
+     *            the row object
+     * @return index of the row; or <code>-1</code> if row is not available
+     */
     public int indexOf(T row) {
         Object key = getRowKey(row);
         if (keyToIndexMap.containsKey(key)) {
diff --git a/client/src/com/vaadin/client/data/DataSource.java b/client/src/com/vaadin/client/data/DataSource.java
index 076226bf5c..f3711c3c68 100644
--- a/client/src/com/vaadin/client/data/DataSource.java
+++ b/client/src/com/vaadin/client/data/DataSource.java
@@ -194,16 +194,4 @@ public interface DataSource<T> {
      *        means that the row is not currently in this data source's cache.
      */
     public RowHandle<T> getHandle(T row);
-
-    /**
-     * Retrieves the index for given row object.
-     * <p>
-     * <em>Note:</em> This method does not verify that the given row object
-     * exists at all in this DataSource.
-     * 
-     * @param row
-     *            the row object
-     * @return index of the row; or <code>-1</code> if row is not available
-     */
-    int indexOf(T row);
 }
diff --git a/client/src/com/vaadin/client/ui/VTree.java b/client/src/com/vaadin/client/ui/VTree.java
index 6539eb49a9..8729de4a43 100644
--- a/client/src/com/vaadin/client/ui/VTree.java
+++ b/client/src/com/vaadin/client/ui/VTree.java
@@ -1737,8 +1737,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler,
                         selectNode(node, true);
                     }
                 }
+                showTooltipForKeyboardNavigation(node);
             }
-            showTooltipForKeyboardNavigation(node);
             return true;
         }
 
@@ -1763,8 +1763,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler,
                         selectNode(node, true);
                     }
                 }
+                showTooltipForKeyboardNavigation(node);
             }
-            showTooltipForKeyboardNavigation(node);
             return true;
         }
 
diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java
index 6977cf9e7f..501dedbaa8 100644
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/com/vaadin/client/ui/VWindow.java
@@ -1338,9 +1338,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
 
     @Override
     public void onKeyUp(KeyUpEvent event) {
-        if (isClosable() && event.getNativeKeyCode() == KeyCodes.KEY_ESCAPE) {
-            onCloseClick();
-        }
+        // do nothing
     }
 
     @Override
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 56e1db5c36..47e072490e 100644
--- a/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
+++ b/client/src/com/vaadin/client/widget/grid/datasources/ListDataSource.java
@@ -443,7 +443,16 @@ public class ListDataSource<T> implements DataSource<T> {
         }
     }
 
-    @Override
+    /**
+     * Retrieves the index for given row object.
+     * <p>
+     * <em>Note:</em> This method does not verify that the given row object
+     * exists at all in this DataSource.
+     * 
+     * @param row
+     *            the row object
+     * @return index of the row; or <code>-1</code> if row is not available
+     */
     public int indexOf(T row) {
         return ds.indexOf(row);
     }