From 26b46b2bda4a78a8e48fe8f2c4a1afdc35a840c6 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Tue, 21 Feb 2012 19:41:17 +0400 Subject: [PATCH] Rename TableView#setModel(ListTableModel) -> setModelAndUpdateColumns to avoid confusion with the overridden setModel(TableModel). --- .../platform-api/src/com/intellij/ui/dualView/DualView.java | 2 +- .../platform-api/src/com/intellij/ui/table/TableView.java | 4 ++-- .../intellij/diagnostic/errordialog/AttachmentsTabForm.java | 3 +-- .../src/com/intellij/util/ui/ValidatingTableEditor.java | 2 +- .../sm/runner/ui/statistics/StatisticsPanel.java | 2 +- .../vcs/changes/committed/CommittedChangesBrowser.java | 2 +- .../vcs/configurable/VcsDirectoryConfigurationPanel.java | 2 +- .../intellij/openapi/vcs/merge/MultipleFileMergeDialog.java | 2 +- .../src/com/intellij/execution/junit2/ui/StatisticsPanel.java | 2 +- .../org/jetbrains/idea/svn17/dialogs/ToBeMergedDialog.java | 2 +- .../src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java | 2 +- .../testng/configuration/TestNGConfigurationEditor.java | 2 +- .../src/com/intellij/util/xml/ui/AbstractTableView.java | 2 +- 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java b/platform/platform-api/src/com/intellij/ui/dualView/DualView.java index aaff59062cb6..2e43a2ee903d 100644 --- a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java +++ b/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); diff --git a/platform/platform-api/src/com/intellij/ui/table/TableView.java b/platform/platform-api/src/com/intellij/ui/table/TableView.java index 2526e0f935a3..b62334b42962 100644 --- a/platform/platform-api/src/com/intellij/ui/table/TableView.java +++ b/platform/platform-api/src/com/intellij/ui/table/TableView.java @@ -33,7 +33,7 @@ public class TableView extends BaseTableView implements ItemsProvider, Sel public TableView(final ListTableModel model) { super(model); - setModel(model); + setModelAndUpdateColumns(model); } public void setModel(final TableModel dataModel) { @@ -41,7 +41,7 @@ public class TableView extends BaseTableView implements ItemsProvider, Sel super.setModel(dataModel); } - public void setModel(final ListTableModel model) { + public void setModelAndUpdateColumns(final ListTableModel model) { super.setModel(model); updateColumnSizes(); } diff --git a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/AttachmentsTabForm.java b/platform/platform-impl/src/com/intellij/diagnostic/errordialog/AttachmentsTabForm.java index 312f8ea67c93..793dfd25ca53 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/errordialog/AttachmentsTabForm.java +++ b/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 attachments) { - myTable.setModel(new ListTableModel(new ColumnInfo[]{ENABLED_COLUMN, PATH_COLUMN}, attachments, 1)); + myTable.setModelAndUpdateColumns(new ListTableModel(new ColumnInfo[]{ENABLED_COLUMN, PATH_COLUMN}, attachments, 1)); myTable.setBorder(IdeBorderFactory.createBorder()); myTable.setSelection(Collections.singletonList(attachments.get(0))); } diff --git a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java index 7560d5a59b31..150f7bfaef26 100644 --- a/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java +++ b/platform/platform-impl/src/com/intellij/util/ui/ValidatingTableEditor.java @@ -303,7 +303,7 @@ public abstract class ValidatingTableEditor implements ComponentWithEmptyT } myTable.stopEditing(); - myTable.setModel(new ListTableModel(columns)); + myTable.setModelAndUpdateColumns(new ListTableModel(columns)); if (maxHeight > 0) { myTable.setRowHeight(maxHeight); } diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java index 77f56b8b4216..fe619082edda 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java +++ b/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(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java index cb6e2da344c4..c68f39de4839 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesBrowser.java +++ b/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(); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java index d1fc70a345d4..60f82788b771 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java +++ b/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(new ColumnInfo[]{DIRECTORY, VCS_SETTING}, mappings, 0); - myDirectoryMappingTable.setModel(myModel); + myDirectoryMappingTable.setModelAndUpdateColumns(myModel); myRecentlyChangedConfigurable.reset(); myBaseRevisionTexts.setSelected(myVcsConfiguration.INCLUDE_TEXT_INTO_SHELF); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java index 4c0eb90ef6f8..66077ceb42bd 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java @@ -136,7 +136,7 @@ public class MultipleFileMergeDialog extends DialogWrapper { } myModel = new ListTableModel(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()); diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java b/plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java index 990105589d1e..d19e488f4210 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/ui/StatisticsPanel.java +++ b/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; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/ToBeMergedDialog.java index b398ed9a3d1b..1ca7234205f9 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn17/dialogs/ToBeMergedDialog.java @@ -190,7 +190,7 @@ public class ToBeMergedDialog extends DialogWrapper { } }; final ListTableModel flatModel = new ListTableModel(FAKE_COLUMN); - myRevisionsList.setModel(flatModel); + myRevisionsList.setModelAndUpdateColumns(flatModel); myRevisionsList.setTableHeader(null); myRevisionsList.setShowGrid(false); final AbstractBaseTagMouseListener mouseListener = new AbstractBaseTagMouseListener() { diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java index 60a2b21f6d1a..ee05bb45841d 100644 --- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java +++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java @@ -190,7 +190,7 @@ public class ToBeMergedDialog extends DialogWrapper { } }; final ListTableModel flatModel = new ListTableModel(FAKE_COLUMN); - myRevisionsList.setModel(flatModel); + myRevisionsList.setModelAndUpdateColumns(flatModel); myRevisionsList.setTableHeader(null); myRevisionsList.setShowGrid(false); final AbstractBaseTagMouseListener mouseListener = new AbstractBaseTagMouseListener() { diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java index e1a709993f97..df43dfc9dbf6 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java @@ -459,7 +459,7 @@ public class TestNGConfigurationEditor extends SettingsEditor 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() {