Merge branch 'private-release/v2.0.0' into zowe-release/v2.0.0

Signed-off-by: Uladzislau <[email protected]>
zowe · Sep 26, 2024 · dc98d25 · dc98d25
2 parents d370bde + 5561f86
commit dc98d25
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 26 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -113,7 +113,7 @@ val plugins = listOf(
   PluginDescriptor(
     since = properties("pluginSinceBuild").get(),
     until = "232.*",
-    sdkVersion = "IC-2023.1",
+    sdkVersion = "IC-2023.1.7",
     sourceFolder = "IC-231",
     deps = listOf("java", "org.jetbrains.plugins.gradle", "org.jetbrains.kotlin")
   ),

diff --git a/gradle.properties b/gradle.properties
@@ -11,23 +11,20 @@
 #   IBA Group
 #   Zowe Community
 #
-
-org.gradle.jvmargs = -Xss1M
-
+org.gradle.jvmargs=-Xss1M
 # SemVer format -> https://semver.org
-pluginVersion = 2.0.0
-pluginGroup = org.zowe
-pluginRepositoryUrl = https://github.com/zowe/zowe-explorer-intellij
-
+pluginVersion=2.0.0
+pluginGroup=eu.ibagroup
+pluginGroup=org.zowe
+pluginRepositoryUrl=https://github.com/zowe/zowe-explorer-intellij
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 231.9423
-pluginUntilBuild =
+pluginSinceBuild=231.9423
+pluginUntilBuild=
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 8.7
-
-systemProp.ideLaunchFolder = ".\\ide_for_launch"
-systemProp.forMainframePath = "build\\distributions\\for-mainframe-2.0.0-IC-2023.1.zip"
-systemProp.remoteRobotUrl = "http://127.0.0.1"
-systemProp.ideaBuildVersionForTest = ".\\ideaIC-231.8770.17"
-systemProp.robotServerForTest = "robot-server-plugin-0.11.23"
-systemProp.ideaVersionForTest = "2023.1.1"
+gradleVersion=8.7
+systemProp.ideLaunchFolder=".\\ide_for_launch"
+systemProp.forMainframePath="build\\distributions\\for-mainframe-2.0.0-IC-2023.1.zip"
+systemProp.remoteRobotUrl="http://127.0.0.1"
+systemProp.ideaBuildVersionForTest=".\\ideaIC-231.8770.17"
+systemProp.robotServerForTest="robot-server-plugin-0.11.23"
+systemProp.ideaVersionForTest="2023.1.1"
diff --git a/src/main/kotlin/org/zowe/explorer/dataops/attributes/MFRemoteAttributesServiceBase.kt b/src/main/kotlin/org/zowe/explorer/dataops/attributes/MFRemoteAttributesServiceBase.kt
@@ -17,7 +17,6 @@ package org.zowe.explorer.dataops.attributes
 import com.intellij.openapi.util.io.FileAttributes
 import org.zowe.explorer.config.connect.ConnectionConfigBase
 import org.zowe.explorer.dataops.DataOpsManager
-import org.zowe.explorer.utils.runWriteActionInEdtAndWait
 import org.zowe.explorer.utils.sendTopic
 import org.zowe.explorer.vfs.MFVirtualFile
 import org.zowe.explorer.vfs.MFVirtualFileSystem
@@ -102,9 +101,7 @@ abstract class MFRemoteAttributesServiceBase<Connection : ConnectionConfigBase,
    */
   private fun reassignAttributesToFile(file: MFVirtualFile, oldAttributes: Attributes, newAttributes: Attributes) {
     obtainAndRenameUrlDirIfNeeded(newAttributes)
-    runWriteActionInEdtAndWait {
-      reassignAttributesAfterUrlFolderRenaming(file, oldAttributes, newAttributes)
-    }
+    reassignAttributesAfterUrlFolderRenaming(file, oldAttributes, newAttributes)
   }
 
   /**

diff --git a/src/main/kotlin/org/zowe/explorer/dataops/fetch/RemoteFileFetchProviderBase.kt b/src/main/kotlin/org/zowe/explorer/dataops/fetch/RemoteFileFetchProviderBase.kt
@@ -130,8 +130,10 @@ abstract class RemoteFileFetchProviderBase<Connection : ConnectionConfigBase, Re
     progressIndicator: ProgressIndicator
   ): List<File> {
     val fetched = fetchResponse(query, progressIndicator)
-    return fetched.mapNotNull {
-      convertResponseToFile(it)
+    return runWriteActionInEdtAndWait {
+      fetched.mapNotNull {
+        convertResponseToFile(it)
+      }
     }
   }
 

diff --git a/src/main/kotlin/org/zowe/explorer/utils/openapiUtils.kt b/src/main/kotlin/org/zowe/explorer/utils/openapiUtils.kt
@@ -186,10 +186,12 @@ fun runWriteActionInEdt(block: () -> Unit) {
   }
 }
 
-fun runWriteActionInEdtAndWait(block: () -> Unit) {
+fun <T> runWriteActionInEdtAndWait(block: () -> T): T {
+  var result: T? = null
   runInEdtAndWait {
-    runWriteAction(block)
+    result = runWriteAction(block)
   }
+  return result ?: throw Exception("runWriteAction did not return any result")
 }
 
 /** Return the specified logger instance */