From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 18 Jun 2008 10:49:45 +0000 (+0000)
Subject: The order of the headers was not updated in some instances.
X-Git-Tag: 6.7.0.beta1~4571
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4bcd00d7094f8517cf99477e10eaf0fdd90d9a02;p=vaadin-framework.git

The order of the headers was not updated in some instances.

svn changeset:4914/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index 0dc7ebac21..b668fd0fa6 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -1311,7 +1311,7 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
 
         public void enableColumn(String cid, int index) {
             final HeaderCell c = getHeaderCell(cid);
-            if (!c.isEnabled()) {
+            if (!c.isEnabled() || getHeaderCell(index) != c) {
                 setHeaderCell(index, c);
                 if (c.getWidth() == -1) {
                     if (initializedAndAttached) {
@@ -1351,6 +1351,11 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
         }
 
         public void setHeaderCell(int index, HeaderCell cell) {
+            if (cell.isEnabled()) {
+                // we're moving the cell
+                DOM.removeChild(tr, cell.getElement());
+                orphan(cell);
+            }
             if (index < visibleCells.size()) {
                 // insert to right slot
                 DOM.insertChild(tr, cell.getElement(), index);