commit efc7e5a47ebb743ec3fb9c3fc96c8b3644faf470
author mszal@google.com <mszal@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Jun 01 18:16:17 2011 +0000
committer mszal@google.com <mszal@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Jun 01 18:16:17 2011 +0000
tree 19252c9907800d738b27c6fbea6991d8141d1102
parent 05db3e6b069689f2f1754dae962c9af96b95550c

Removed an extraneous copy of the columns variable in CellTable.  CellTable now uses getColumnCount to set the colspan of the empty-table widget.

Review by: jlabanca@google.com

git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10263 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/user/cellview/client/CellTable.java

diff --git a/user/src/com/google/gwt/user/cellview/client/CellTable.java b/user/src/com/google/gwt/user/cellview/client/CellTable.java
index db38900..09bf30a 100644
--- a/user/src/com/google/gwt/user/cellview/client/CellTable.java
+++ b/user/src/com/google/gwt/user/cellview/client/CellTable.java
@@ -37,9 +37,7 @@
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.view.client.ProvidesKey;
 
-import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -485,7 +483,6 @@
   }
 
   final TableColElement colgroup;
-  private final List<Column<T, ?>> columns = new ArrayList<Column<T, ?>>();
   private final SimplePanel emptyTableWidgetContainer = new SimplePanel();
   private final SimplePanel loadingIndicatorContainer = new SimplePanel();
 
@@ -805,7 +802,7 @@
     }
 
     // Adjust the colspan of the messages panel container.
-    tbodyLoadingCell.setColSpan(Math.max(1, columns.size()));
+    tbodyLoadingCell.setColSpan(Math.max(1, getColumnCount()));
 
     // Show the correct container.
     showOrHide(getChildContainer(), message == null);