From da773250ca4b50a2994ef07dbb0b4cf1fa9da4ac Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com>
Date: Tue, 16 May 2017 15:53:49 +0300
Subject: Remove unnecessary rowmode prefix from TreeGrid focus styles (#9327)

---
 .../src/main/java/com/vaadin/client/widget/treegrid/TreeGrid.java | 5 -----
 client/src/main/java/com/vaadin/client/widgets/Grid.java          | 8 ++------
 2 files changed, 2 insertions(+), 11 deletions(-)

(limited to 'client')

diff --git a/client/src/main/java/com/vaadin/client/widget/treegrid/TreeGrid.java b/client/src/main/java/com/vaadin/client/widget/treegrid/TreeGrid.java
index 86c7f7c53e..fb66bebb7d 100644
--- a/client/src/main/java/com/vaadin/client/widget/treegrid/TreeGrid.java
+++ b/client/src/main/java/com/vaadin/client/widget/treegrid/TreeGrid.java
@@ -54,9 +54,4 @@ public class TreeGrid extends Grid<JsonObject> {
     public HandlerRegistration addBodyClickHandler(BodyClickHandler handler) {
         return addHandler(handler, TreeGridClickEvent.TYPE);
     }
-
-    @Override
-    protected String getFocusPrimaryStyleName() {
-        return getStylePrimaryName() + "-rowmode";
-    }
 }
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index f94c45f780..fb59329883 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -6217,8 +6217,8 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         rowSelectedStyleName = rowStyle + "-selected";
         rowStripeStyleName = rowStyle + "-stripe";
 
-        cellFocusStyleName = getFocusPrimaryStyleName() + "-cell-focused";
-        rowFocusStyleName = getFocusPrimaryStyleName() + "-row-focused";
+        cellFocusStyleName = getStylePrimaryName() + "-cell-focused";
+        rowFocusStyleName = getStylePrimaryName() + "-row-focused";
 
         if (isAttached()) {
             refreshHeader();
@@ -6227,10 +6227,6 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
         }
     }
 
-    protected String getFocusPrimaryStyleName() {
-        return getStylePrimaryName();
-    }
-
     /**
      * Creates the escalator updater used to update the header rows in this
      * grid. The updater is invoked when header rows or columns are added or
-- 
cgit v1.2.3