Merge branch 'bugfix/IJMP-1534' into 'release/v1.2.1-221'

IJMP-1534: fix renaming of open files See merge request ijmp/for-mainframe!495
zowe · Mar 26, 2024 · a50c3aa · a50c3aa
2 parents 919aebb + 0945331
commit a50c3aa
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 15 deletions.
diff --git a/...main/kotlin/eu/ibagroup/formainframe/dataops/attributes/RemoteDatasetAttributesService.kt b/...main/kotlin/eu/ibagroup/formainframe/dataops/attributes/RemoteDatasetAttributesService.kt
@@ -100,10 +100,10 @@ class RemoteDatasetAttributesService(
       val volserDir = fsModel.findOrCreate(
         this, subDirectory, newAttributes.volser ?: MIGRATED, createAttributes(directory = true)
       )
-      fsModel.moveFile(this, file, volserDir)
+      file.move(this, volserDir)
     }
     if (oldAttributes.name != newAttributes.name) {
-      fsModel.renameFile(this, file, newAttributes.name)
+      file.rename(this, newAttributes.name)
     }
   }
 

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/dataops/attributes/RemoteJobAttributesService.kt b/src/main/kotlin/eu/ibagroup/formainframe/dataops/attributes/RemoteJobAttributesService.kt
@@ -94,7 +94,7 @@ class RemoteJobAttributesService(
     newAttributes: RemoteJobAttributes
   ) {
     if (oldAttributes.name != newAttributes.name) {
-      fsModel.renameFile(this, file, newAttributes.name)
+      file.rename(this, newAttributes.name)
       fsModel.setWritable(file, false)
     }
   }

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/dataops/attributes/RemoteUssAttributesService.kt b/src/main/kotlin/eu/ibagroup/formainframe/dataops/attributes/RemoteUssAttributesService.kt
@@ -100,14 +100,14 @@ class RemoteUssAttributesService(
     fsModel.setWritable(file, newAttributes.isWritable)
     file.isReadable = newAttributes.isReadable
     if (oldAttributes.name != newAttributes.name) {
-      fsModel.renameFile(this, file, newAttributes.name)
+      file.rename(this, newAttributes.name)
     }
     if (oldAttributes.parentDirPath != newAttributes.parentDirPath) {
-      var current = subDirectory
+      var current = fsRoot
       createPathChain(newAttributes).dropLast(1).map { nameWithFileAttr ->
         findOrCreate(current, nameWithFileAttr).also { current = it }
       }
-      fsModel.moveFile(this, file, current)
+      file.move(this, current)
     }
   }
 

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/dataops/operations/RenameOperationRunner.kt b/src/main/kotlin/eu/ibagroup/formainframe/dataops/operations/RenameOperationRunner.kt
@@ -21,7 +21,7 @@ import eu.ibagroup.formainframe.dataops.exceptions.CallException
 import eu.ibagroup.formainframe.explorer.actions.DuplicateMemberAction
 import eu.ibagroup.formainframe.utils.cancelByIndicator
 import eu.ibagroup.formainframe.utils.log
-import eu.ibagroup.formainframe.vfs.sendMFVfsChangesTopic
+import eu.ibagroup.formainframe.utils.runWriteActionInEdtAndWait
 import org.zowe.kotlinsdk.*
 
 /**
@@ -81,7 +81,9 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
               toDatasetName = operation.newName
             ).cancelByIndicator(progressIndicator).execute()
             if (response.isSuccessful) {
-              sendMFVfsChangesTopic()
+              runWriteActionInEdtAndWait {
+                operation.file.rename(this, operation.newName)
+              }
             } else {
               throw CallException(response, "Unable to rename the selected dataset")
             }
@@ -113,9 +115,7 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
                 toDatasetName = parentAttributes.datasetInfo.name,
                 memberName = operation.newName
               ).cancelByIndicator(progressIndicator).execute()
-              if (response.isSuccessful) {
-                sendMFVfsChangesTopic()
-              } else {
+              if (!response.isSuccessful) {
                 throw CallException(response, "Unable to duplicate the selected member")
               }
             } else {
@@ -131,7 +131,9 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
                 memberName = operation.newName
               ).cancelByIndicator(progressIndicator).execute()
               if (response.isSuccessful) {
-                sendMFVfsChangesTopic()
+                runWriteActionInEdtAndWait {
+                  operation.file.rename(this, operation.newName)
+                }
               } else {
                 throw CallException(response, "Unable to rename the selected member")
               }
@@ -158,7 +160,9 @@ class RenameOperationRunner(private val dataOpsManager: DataOpsManager) : Operat
               filePath = FilePath("$parentDirPath/${operation.newName}")
             ).cancelByIndicator(progressIndicator).execute()
             if (response.isSuccessful) {
-              sendMFVfsChangesTopic()
+              runWriteActionInEdtAndWait {
+                operation.file.rename(this, operation.newName)
+              }
             } else {
               throw CallException(response, "Unable to rename the selected file or directory")
             }

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/vfs/MFVirtualFileSystemModel.kt b/src/main/kotlin/eu/ibagroup/formainframe/vfs/MFVirtualFileSystemModel.kt
@@ -311,13 +311,13 @@ class MFVirtualFileSystemModel {
   @Throws(IOException::class)
   fun renameFile(requestor: Any?, vFile: MFVirtualFile, newName: String) {
     val event = listOf(VFilePropertyChangeEvent(requestor, vFile, VirtualFile.PROP_NAME, vFile.name, newName, false))
-    sendMFVfsChangesTopic().before(event)
+    sendVfsChangesTopic().before(event)
     vFile.validReadLock {
       if (vFile.filenameInternal != newName) {
         vFile.filenameInternal = newName
       }
     }
-    sendMFVfsChangesTopic().after(event)
+    sendVfsChangesTopic().after(event)
   }
 
   @Throws(IOException::class)