Merge commit '591996b' into 7.2

Conflicts:
	build.properties

Change-Id: Ie3cf9bd0af8aba7debf4626d2db77afea37e7cb3

build.properties

@@ -1,9 +1,9 @@
 javadoc.doctitle=<h1>Vaadin</h1>
-javadoc.bottom=<i>Copyright &#169; 2000-2011 Vaadin Ltd. All Rights Reserved.</i>
+javadoc.bottom=<i>Copyright &#169; 2000-2014 Vaadin Ltd. All Rights Reserved.</i>
 ivy.organisation=com.vaadin
 vaadin.vendor=Vaadin Ltd
 vaadin.url=http://vaadin.com
 vaadin.java.version=1.6
 vaadin.version=0.0.0.unversioned-development-build
 vaadin.sass.version=0.9.0
-commons-io.version=2.4
+commons-io.version=2.4

client/src/com/vaadin/client/ui/VScrollTable.java

@@ -1132,6 +1132,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
         // cell to accomodate for the size of the sort arrow.
         HeaderCell sortedHeader = tHead.getHeaderCell(sortColumn);
         if (sortedHeader != null) {
+            // Mark header as sorted now. Any earlier marking would lead to
+            // columns with wrong sizes
+            sortedHeader.setSorted(true);
             tHead.resizeCaptionContainer(sortedHeader);
         }
         // Also recalculate the width of the captionContainer element in the
@@ -3344,11 +3347,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
 
                 if (col.hasAttribute("sortable")) {
                     c.setSortable(true);
-                    if (cid.equals(sortColumn)) {
-                        c.setSorted(true);
-                    } else {
-                        c.setSorted(false);
-                    }
+                    c.setSorted(false);
                 } else {
                     c.setSortable(false);
                 }

client/src/com/vaadin/client/ui/table/TableConnector.java

@@ -303,9 +303,13 @@ public class TableConnector extends AbstractHasComponentsConnector implements
         getWidget().tabIndex = getState().tabIndex;
         getWidget().setProperTabIndex();
 
-        if (getWidget().initializedAndAttached) {
-            getWidget().resizeSortedColumnForSortIndicator();
-        }
+        Scheduler.get().scheduleFinally(new ScheduledCommand() {
+
+            @Override
+            public void execute() {
+                getWidget().resizeSortedColumnForSortIndicator();
+            }
+        });
 
         // Remember this to detect situations where overflow hack might be
         // needed during scrolling

uitest/src/com/vaadin/tests/tb3/ScreenshotTB3Test.java

@@ -107,7 +107,7 @@ public abstract class ScreenshotTB3Test extends AbstractTB3Test {
         for (File referenceFile : referenceFiles) {
             if (testBench(driver).compareScreen(referenceFile)) {
                 // There might be failure files because of retries in TestBench.
-                deleteFailureFiles(referenceFile);
+                deleteFailureFiles(getErrorFileFromReference(referenceFile));
                 break;
             } else {
                 failedReferenceFiles.add(referenceFile);