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

Multi-file merge: Simplify action creation code

Browse Source 
IDEA-CR-32596
This commit is contained in:
Dmitry Jemerov
2018-05-30 11:38:57 +02:00
parent 6c0e222887
commit 140d841e5f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog2.kt
+3 -6
View File
@@ -213,7 +213,6 @@ open class MultipleFileMergeDialog2(
mergeButton.isEnabled = haveSelection && !haveUnmergeableFiles
}
private fun getSelectedFiles(): List<VirtualFile> {
return TreeUtil.collectSelectedObjectsOfType(table.tree, VirtualFile::class.java)
}
@@ -222,11 +221,9 @@ open class MultipleFileMergeDialog2(
return true
}
override fun createActions(): Array<Action> = arrayOf(cancelAction)
override fun getCancelAction(): Action = super.getCancelAction().apply {
putValue(Action.NAME, CommonBundle.getCloseButtonText())
override fun createActions(): Array<Action> {
cancelAction.putValue(Action.NAME, CommonBundle.getCloseButtonText())
return arrayOf(cancelAction)
}
override fun dispose() {