From 47f93e52cc5ad47261e87ce91db1e396c0a783b8 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Mon, 2 Sep 2019 20:13:02 +0300 Subject: [PATCH] merge: ensure tree and table models are in sync after rebuilding tree This is necessary to properly update selected interval in 'updateModelFromFiles'. GitOrigin-RevId: e3246afce0097eb910478f9ee141ba46c02e3908 --- .../com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt index 2f56c492fbce..f05143ed1575 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt @@ -55,6 +55,7 @@ import javax.swing.AbstractAction import javax.swing.Action import javax.swing.JButton import javax.swing.JComponent +import javax.swing.table.AbstractTableModel import javax.swing.tree.DefaultMutableTreeNode import javax.swing.tree.TreeNode @@ -223,6 +224,7 @@ open class MultipleFileMergeDialog( val model = TreeModelBuilder.buildFromVirtualFiles(project, factory, unresolvedFiles) tableModel.setRoot(model.root as TreeNode) TreeUtil.expandAll(table.tree) + (table.model as? AbstractTableModel)?.fireTableDataChanged() } private fun updateButtonState() {