diff options
| -rw-r--r-- | server/src/com/vaadin/ui/Grid.java | 2 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index 2d45dfef61..adb08e0fcc 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -3157,7 +3157,7 @@ public class Grid extends AbstractComponent implements SelectionNotifier, header.addColumn(datasourcePropertyId); footer.addColumn(datasourcePropertyId); - column.setHeaderCaption(SharedUtil.camelCaseToHumanFriendly(String + column.setHeaderCaption(SharedUtil.propertyIdToHumanFriendly(String .valueOf(datasourcePropertyId))); return column; diff --git a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java index 01b957ccf5..20fbb12749 100644 --- a/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/WidgetRenderersTest.java @@ -70,7 +70,7 @@ public class WidgetRenderersTest extends MultiBrowserTest { buttonCell.isFocused()); // avoid clicking on the button - buttonCell.click(150, 5); + buttonCell.click(buttonCell.getSize().getWidth() - 10, 5); assertTrue("cell should be focused after focusing", buttonCell.isFocused()); |