Rename TableView#setModel(ListTableModel) -> setModelAndUpdateColumns to avoid confusion with the overridden setModel(TableModel).

platform/platform-api/src/com/intellij/ui/dualView/DualView.java

@@ -337,7 +337,7 @@ public class DualView extends JPanel {
   public void changeColumnSet(DualViewColumnInfo[] columns) {
     myTreeView.setTableModel(new ListTreeTableModelOnColumns((TreeNode)myTreeView.getTreeViewModel().getRoot(),
                                                              createTreeColumns(columns)));
-    myFlatView.setModel(new ListTableModel(columns));
+    myFlatView.setModelAndUpdateColumns(new ListTableModel(columns));
     if (myTreeCellRenderer != null) myTreeView.setTreeCellRenderer(myTreeCellRenderer);
     setRootVisible(myRootVisible);
 

platform/platform-api/src/com/intellij/ui/table/TableView.java

@@ -33,7 +33,7 @@ public class TableView<Item> extends BaseTableView implements ItemsProvider, Sel
 
   public TableView(final ListTableModel<Item> model) {
     super(model);
-    setModel(model);
+    setModelAndUpdateColumns(model);
   }
 
   public void setModel(final TableModel dataModel) {
@@ -41,7 +41,7 @@ public class TableView<Item> extends BaseTableView implements ItemsProvider, Sel
     super.setModel(dataModel);
   }
 
-  public void setModel(final ListTableModel<Item> model) {
+  public void setModelAndUpdateColumns(final ListTableModel<Item> model) {
     super.setModel(model);
     updateColumnSizes();
   }

platform/platform-impl/src/com/intellij/diagnostic/errordialog/AttachmentsTabForm.java

@@ -1,7 +1,6 @@
 package com.intellij.diagnostic.errordialog;
 
 import com.intellij.diagnostic.DiagnosticBundle;
-import com.intellij.ide.plugins.InstalledPluginsTableModel;
 import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.table.TableView;
 import com.intellij.util.EventDispatcher;
@@ -107,7 +106,7 @@ public class AttachmentsTabForm {
   }
 
   public void setAttachments(List<Attachment> attachments) {
-    myTable.setModel(new ListTableModel<Attachment>(new ColumnInfo[]{ENABLED_COLUMN, PATH_COLUMN}, attachments, 1));
+    myTable.setModelAndUpdateColumns(new ListTableModel<Attachment>(new ColumnInfo[]{ENABLED_COLUMN, PATH_COLUMN}, attachments, 1));
     myTable.setBorder(IdeBorderFactory.createBorder());
     myTable.setSelection(Collections.singletonList(attachments.get(0)));
   }

platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java

@@ -303,7 +303,7 @@ public abstract class ValidatingTableEditor<Item> implements ComponentWithEmptyT
     }
 
     myTable.stopEditing();
-    myTable.setModel(new ListTableModel<Item>(columns));
+    myTable.setModelAndUpdateColumns(new ListTableModel<Item>(columns));
     if (maxHeight > 0) {
       myTable.setRowHeight(maxHeight);
     }

platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java

@@ -63,7 +63,7 @@ public class StatisticsPanel implements DataProvider {
   public StatisticsPanel(final Project project, final TestFrameworkRunningModel model) {
     myProject = project;
     myTableModel = new StatisticsTableModel();
-    myStatisticsTableView.setModel(myTableModel);
+    myStatisticsTableView.setModelAndUpdateColumns(myTableModel);
     myFrameworkRunningModel = model;
 
     final Runnable gotoSuiteOrParentAction = createGotoSuiteOrParentAction();

platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java

@@ -194,7 +194,7 @@ public class CommittedChangesBrowser extends JPanel {
 
   public void setModel(CommittedChangesTableModel tableModel) {
     myTableModel = tableModel;
-    myChangeListsView.setModel(tableModel);
+    myChangeListsView.setModelAndUpdateColumns(tableModel);
     tableModel.fireTableStructureChanged();
   }
 

platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java

@@ -227,7 +227,7 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements
       mappings.add(new VcsDirectoryMapping(mapping.getDirectory(), mapping.getVcs(), mapping.getRootSettings()));
     }
     myModel = new ListTableModel<VcsDirectoryMapping>(new ColumnInfo[]{DIRECTORY, VCS_SETTING}, mappings, 0);
-    myDirectoryMappingTable.setModel(myModel);
+    myDirectoryMappingTable.setModelAndUpdateColumns(myModel);
 
     myRecentlyChangedConfigurable.reset();
     myBaseRevisionTexts.setSelected(myVcsConfiguration.INCLUDE_TEXT_INTO_SHELF);

platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java

@@ -136,7 +136,7 @@ public class MultipleFileMergeDialog extends DialogWrapper {
     }
     myModel = new ListTableModel<VirtualFile>(columns.toArray(new ColumnInfo[columns.size()]));
     myModel.setItems(files);
-    myTable.setModel(myModel);
+    myTable.setModelAndUpdateColumns(myModel);
     myVirtualFileRenderer.setFont(UIUtil.getListFont());
     myTable.setRowHeight(myVirtualFileRenderer.getPreferredSize().height);
     setTitle(myMergeDialogCustomizer.getMultipleFileDialogTitle());

plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java

@@ -134,7 +134,7 @@ class StatisticsPanel extends JPanel implements DataProvider{
 
     public void doDispose() {
       BaseTableView.store(myStorage, myTable);
-      myTable.setModel(new ListTableModel(TestColumnInfo.COLUMN_NAMES));
+      myTable.setModelAndUpdateColumns(new ListTableModel(TestColumnInfo.COLUMN_NAMES));
       myModel = null;
       myChildInfo = null;
       myCurrentTest = null;

plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/ToBeMergedDialog.java

@@ -190,7 +190,7 @@ public class ToBeMergedDialog extends DialogWrapper {
       }
     };
     final ListTableModel<CommittedChangeList> flatModel = new ListTableModel<CommittedChangeList>(FAKE_COLUMN);
-    myRevisionsList.setModel(flatModel);
+    myRevisionsList.setModelAndUpdateColumns(flatModel);
     myRevisionsList.setTableHeader(null);
     myRevisionsList.setShowGrid(false);
     final AbstractBaseTagMouseListener mouseListener = new AbstractBaseTagMouseListener() {

plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java

@@ -190,7 +190,7 @@ public class ToBeMergedDialog extends DialogWrapper {
       }
     };
     final ListTableModel<CommittedChangeList> flatModel = new ListTableModel<CommittedChangeList>(FAKE_COLUMN);
-    myRevisionsList.setModel(flatModel);
+    myRevisionsList.setModelAndUpdateColumns(flatModel);
     myRevisionsList.setTableHeader(null);
     myRevisionsList.setShowGrid(false);
     final AbstractBaseTagMouseListener mouseListener = new AbstractBaseTagMouseListener() {

plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java

@@ -459,7 +459,7 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
     textFieldWithBrowseButton
         .addBrowseFolderListener("TestNG", "Select .properties file for test properties", project, propertiesFileDescriptor);
 
-    propertiesTableView.setModel(propertiesTableModel);
+    propertiesTableView.setModelAndUpdateColumns(propertiesTableModel);
     propertiesTableView.setShowGrid(true);
 
     listenersTable.setModel(listenerModel);

xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java

@@ -157,7 +157,7 @@ public abstract class AbstractTableView<T> extends JPanel implements TypeSafeDat
   }
 
   protected final void initializeTable() {
-    myTable.setModel(myTableModel);
+    myTable.setModelAndUpdateColumns(myTableModel);
     if (getEmptyPaneText() != null) {
       final CardLayout cardLayout = ((CardLayout)myInnerPanel.getLayout());
       myTable.getModel().addTableModelListener(new TableModelListener() {