diff --git a/src/main/kotlin/org/zowe/explorer/config/ZoweOldConfigConvertPreloadingActivity.kt b/src/main/kotlin/org/zowe/explorer/config/ZoweOldConfigConvertPreloadingActivity.kt index c4bf1b5c6..5a7441ca7 100644 --- a/src/main/kotlin/org/zowe/explorer/config/ZoweOldConfigConvertPreloadingActivity.kt +++ b/src/main/kotlin/org/zowe/explorer/config/ZoweOldConfigConvertPreloadingActivity.kt @@ -14,7 +14,6 @@ import com.intellij.openapi.application.PathManager import com.intellij.openapi.application.PreloadingActivity import com.intellij.openapi.components.impl.stores.IComponentStore import com.intellij.openapi.components.service -import com.intellij.openapi.progress.ProgressIndicator import org.zowe.explorer.config.connect.ConnectionConfig import org.zowe.explorer.config.connect.CredentialService import org.zowe.explorer.utils.crudable.nextUniqueValue @@ -97,8 +96,9 @@ class ZoweOldConfigConvertPreloadingActivity : PreloadingActivity() { } } - override fun preload(indicator: ProgressIndicator) { + override suspend fun execute() { convertOldVersionConfig() + super.execute() } } diff --git a/src/main/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetAction.kt b/src/main/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetAction.kt index 76ac09f01..37513b6f7 100644 --- a/src/main/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetAction.kt +++ b/src/main/kotlin/org/zowe/explorer/explorer/actions/AllocateDatasetAction.kt @@ -32,6 +32,7 @@ import org.zowe.explorer.explorer.ui.* import org.zowe.explorer.utils.castOrNull import org.zowe.explorer.utils.clone import org.zowe.explorer.utils.crudable.getByUniqueKey +import org.zowe.explorer.utils.service import org.zowe.kotlinsdk.* /** @@ -106,7 +107,7 @@ private fun doAllocateAction(e: AnActionEvent, initialState: DatasetAllocationPa while (p !is DSMaskNode) { p = p?.parent ?: break } - val nodeToClean = p?.castOrNull>() + val nodeToClean = p?.castOrNull>() nodeToClean?.let { cleanInvalidateOnExpand(nodeToClean, view) } var nodeCleaned = false @@ -259,8 +260,8 @@ class AllocateLikeAction : AnAction() { } val selected = view.mySelectedNodesData e.presentation.isEnabledAndVisible = selected.size == 1 - && selected[0].attributes is RemoteDatasetAttributes - && !(selected[0].attributes as RemoteDatasetAttributes).isMigrated + && selected[0].attributes is RemoteDatasetAttributes + && !(selected[0].attributes as RemoteDatasetAttributes).isMigrated e.presentation.icon = IconUtil.addText(AllIcons.FileTypes.Any_type, "DS") }