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

IDEA-CR-56535 resolved merge conflict with master

Browse Source 
GitOrigin-RevId: 2ce539bb76fe0da33e2a2d0e48fa5f8ca2ce3e34
This commit is contained in:
Sergei Vorobyov
2019-12-19 14:08:32 +00:00
committed by intellij-monorepo-bot
parent 66eebb40ba
commit 1a65dd741d
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/SdkComboBox.kt
+5 -8
View File
@@ -15,14 +15,11 @@ class SdkComboBox(model: SdkComboBoxModel) : SdkComboBoxBase<SdkListItem>(model.
setModel(model.copyAndSetListModel(listModel))
}
override fun onNewSdkAdded(sdk: Sdk) {
setSelectedSdk(sdk)
}
override fun setSelectedItem(anObject: Any?) {
if (anObject is SdkListItem.ActionableItem) {
anObject.executeAction()
return
if (anObject is SdkListItem) {
if (myModel.executeAction(this, anObject, ::setSelectedItem)) {
return
}
}
reloadModel()
super.setSelectedItem(anObject)
@@ -62,7 +59,7 @@ class SdkComboBox(model: SdkComboBoxModel) : SdkComboBoxBase<SdkListItem>(model.
override fun popupMenuWillBecomeVisible(e: PopupMenuEvent) {
val disposable = Disposer.newDisposable()
setReloadDisposable(disposable)
myModel.reloadActions(this@SdkComboBox, getSelectedSdk())
myModel.reloadActions()
myModel.detectItems(this@SdkComboBox, disposable)
}