MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

merge: ensure tree and table models are in sync after rebuilding tree

Browse Source 
This is necessary to properly update selected interval in 'updateModelFromFiles'.

GitOrigin-RevId: e3246afce0097eb910478f9ee141ba46c02e3908
This commit is contained in:
Aleksey Pivovarov
2019-09-03 10:29:32 +00:00
committed by intellij-monorepo-bot
parent 916d192378
commit 47f93e52cc
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.kt
+2
View File
@@ -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() {