From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 12 Jul 2007 07:39:32 +0000 (+0000)
Subject: fix for reordering logick
X-Git-Tag: 6.7.0.beta1~6182
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=937cd6a8e9371c45f4b30f32dde6f55b9653c205;p=vaadin-framework.git

fix for reordering logick

svn changeset:1846/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 44fb53b2d1..1dc8ad1995 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -379,13 +379,15 @@ public class IScrollTable extends Composite implements Paintable, ITable, Scroll
 		}
 		// finally we can build the new columnOrder for server
 		String[] newOrder = new String[columnOrder.length];
-		for(int i = 0, j = 0; i < newOrder.length; i++) {
-			if(columnOrder[i].equals(columnKey))
-				continue;
+		for(int i = 0, j = 0; j < newOrder.length; i++) {
 			if(j == newIndex) {
 				newOrder[j] = columnKey;
 				j++;
 			}
+			if(i == columnOrder.length)
+				break;
+			if(columnOrder[i].equals(columnKey))
+				continue;
 			newOrder[j] = columnOrder[i];
 			j++;
 		}