ItemStyleGenerator.getStyle now includes source component (#5822)

5 files changed, 10 insertions, 7 deletions

diff --git a/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java b/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
index 35f35c1407..fb4bc5a045 100644
--- a/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
+++ b/uitest/src/com/vaadin/tests/components/table/CellStyleGeneratorTest.java
@@ -17,7 +17,8 @@ public class CellStyleGeneratorTest extends TestBase {
         CellStyleGenerator g = new CellStyleGenerator() {
 
             @Override
-            public String getStyle(Object itemId, Object propertyId) {
+            public String getStyle(Table source, Object itemId,
+                    Object propertyId) {
                 if (propertyId != null && propertyId.equals("red")) {
                     return "red";
                 } else if (itemId.equals("blue") && propertyId == null) {
diff --git a/uitest/src/com/vaadin/tests/components/table/Tables.java b/uitest/src/com/vaadin/tests/components/table/Tables.java
index 1431155b1a..a08533fdbd 100644
--- a/uitest/src/com/vaadin/tests/components/table/Tables.java
+++ b/uitest/src/com/vaadin/tests/components/table/Tables.java
@@ -335,7 +335,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
                 c.setCellStyleGenerator(new CellStyleGenerator() {
 
                     @Override
-                    public String getStyle(Object itemId, Object propertyId) {
+                    public String getStyle(Table source, Object itemId,
+                            Object propertyId) {
                         if (cellStyleInfo.appliesTo(itemId, propertyId)) {
                             return cellStyleInfo.styleName;
                         }
diff --git a/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java b/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
index 33bd4cef65..c561781d2b 100644
--- a/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
+++ b/uitest/src/com/vaadin/tests/components/tree/ItemStyleGenerator.java
@@ -33,7 +33,7 @@ public class ItemStyleGenerator extends TestBase {
 
         tree.setItemStyleGenerator(new Tree.ItemStyleGenerator() {
             @Override
-            public String getStyle(Object itemId) {
+            public String getStyle(Tree source, Object itemId) {
                 // simple return itemId as css style name
                 return itemId.toString();
             }
diff --git a/uitest/src/com/vaadin/tests/components/tree/Trees.java b/uitest/src/com/vaadin/tests/components/tree/Trees.java
index 3ee1d7b0de..8796fb854c 100644
--- a/uitest/src/com/vaadin/tests/components/tree/Trees.java
+++ b/uitest/src/com/vaadin/tests/components/tree/Trees.java
@@ -27,7 +27,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements
     private ItemStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Tree.ItemStyleGenerator() {
 
         @Override
-        public String getStyle(Object itemId) {
+        public String getStyle(Tree source, Object itemId) {
             Hierarchical c = (Container.Hierarchical) getComponent()
                     .getContainerDataSource();
             if (c.isRoot(itemId)) {
@@ -52,7 +52,7 @@ public class Trees extends AbstractSelectTestCase<Tree> implements
     private ItemStyleGenerator evenItemsBold = new com.vaadin.ui.Tree.ItemStyleGenerator() {
 
         @Override
-        public String getStyle(Object itemId) {
+        public String getStyle(Tree source, Object itemId) {
             Hierarchical c = (Container.Hierarchical) getComponent()
                     .getContainerDataSource();
             int idx = 0;
diff --git a/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java b/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
index f27a47f12b..8fafdb2d26 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
+++ b/uitest/src/com/vaadin/tests/components/treetable/TreeTableTest.java
@@ -9,6 +9,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Container.Hierarchical;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.tests.components.table.Tables;
+import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.CellStyleGenerator;
 import com.vaadin.ui.Tree.CollapseEvent;
 import com.vaadin.ui.Tree.CollapseListener;
@@ -28,7 +29,7 @@ public class TreeTableTest extends Tables<TreeTable> implements
     private CellStyleGenerator rootGreenSecondLevelRed = new com.vaadin.ui.Table.CellStyleGenerator() {
 
         @Override
-        public String getStyle(Object itemId, Object propertyId) {
+        public String getStyle(Table source, Object itemId, Object propertyId) {
             if (propertyId != null) {
                 return null;
             }
@@ -56,7 +57,7 @@ public class TreeTableTest extends Tables<TreeTable> implements
     private CellStyleGenerator evenItemsBold = new CellStyleGenerator() {
 
         @Override
-        public String getStyle(Object itemId, Object propertyId) {
+        public String getStyle(Table source, Object itemId, Object propertyId) {
             if (propertyId != null) {
                 return null;
             }