From: Automerge Date: Tue, 21 Feb 2012 10:41:43 +0000 (+0000) Subject: [merge from 6.7] Fixed typo causing one DateField to use different resolution X-Git-Tag: 7.0.0.alpha2~394^2~5 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1eafe768f30b4de27bf8f6748e9c169aba341af6;p=vaadin-framework.git [merge from 6.7] Fixed typo causing one DateField to use different resolution svn changeset:23074/svn branch:6.8 --- diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java index 474df7abcb..0ccff34f44 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java @@ -68,7 +68,7 @@ public class GridLayoutTests extends AbstractLayoutTests { glo.replaceComponent(row3, row3 = new DateField()); ((DateField) row1).setResolution(DateField.RESOLUTION_SEC); ((DateField) row2).setResolution(DateField.RESOLUTION_SEC); - ((DateField) row2).setResolution(DateField.RESOLUTION_SEC); + ((DateField) row3).setResolution(DateField.RESOLUTION_SEC); glo.setComponentAlignment(col2, alignments[6]); glo.setComponentAlignment(col3, alignments[7]); glo.setComponentAlignment(col1, alignments[8]);