ItemStyleGenerator.getStyle now includes source component (#5822)

3 files changed, 9 insertions, 6 deletions

diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
index 039f867fff..be0158e0fb 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket1857.java
@@ -7,8 +7,8 @@ import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Table;
+import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.VerticalLayout;
 
 public class Ticket1857 extends Application.LegacyApplication implements
@@ -60,7 +60,8 @@ public class Ticket1857 extends Application.LegacyApplication implements
                 if (cellStylesEnabler.getValue().booleanValue()) {
                     t.setCellStyleGenerator(new Table.CellStyleGenerator() {
                         @Override
-                        public String getStyle(Object itemId, Object propertyId) {
+                        public String getStyle(Table source, Object itemId,
+                                Object propertyId) {
                             Object cell = t.getContainerProperty(itemId,
                                     propertyId).getValue();
                             if (!(cell instanceof Integer)) {
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
index bc1f886418..defd7f4a22 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2125.java
@@ -5,10 +5,10 @@ import com.vaadin.data.util.MethodProperty;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.CellStyleGenerator;
 import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.ui.UI.LegacyWindow;
 
 public class Ticket2125 extends Application.LegacyApplication {
 
@@ -42,7 +42,8 @@ public class Ticket2125 extends Application.LegacyApplication {
             });
             table.setCellStyleGenerator(new CellStyleGenerator() {
                 @Override
-                public String getStyle(Object itemId, Object propertyId) {
+                public String getStyle(Table source, Object itemId,
+                        Object propertyId) {
                     if (new Integer(4).equals(itemId)) {
                         if (propertyId == null) {
                             return "MYROW";
diff --git a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
index f622f093ee..98cd6724d4 100644
--- a/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
+++ b/uitest/src/com/vaadin/tests/tickets/Ticket2208.java
@@ -4,10 +4,10 @@ import com.vaadin.Application;
 import com.vaadin.data.Item;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.Label;
-import com.vaadin.ui.UI.LegacyWindow;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.Table.CellStyleGenerator;
 import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.ui.UI.LegacyWindow;
 
 public class Ticket2208 extends Application.LegacyApplication {
 
@@ -40,7 +40,8 @@ public class Ticket2208 extends Application.LegacyApplication {
         t.setCellStyleGenerator(new CellStyleGenerator() {
 
             @Override
-            public String getStyle(Object itemId, Object propertyId) {
+            public String getStyle(Table source, Object itemId,
+                    Object propertyId) {
                 if ("col 1 (red)".equals(propertyId)) {
                     return "red";
                 }