IJMP-1555 Depricated DialogWrapper.DoNotAskOption has been removed

zowe · Apr 3, 2024 · 0d6b5d5 · 0d6b5d5
1 parent a50c3aa
commit 0d6b5d5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProvider.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProvider.kt
@@ -482,8 +482,7 @@ class ExplorerPasteProvider : PasteProvider {
           "Decide for Each"
         ),
         0,
-        AllIcons.General.QuestionDialog,
-        null
+        AllIcons.General.QuestionDialog
       )
 
       when (choice) {
@@ -516,8 +515,7 @@ class ExplorerPasteProvider : PasteProvider {
               "Not Resolvable Conflicts",
               arrayOf("Ok"),
               0,
-              Messages.getErrorIcon(),
-              null
+              Messages.getErrorIcon()
             )
           }
         }

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerTreeNode.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerTreeNode.kt
@@ -115,8 +115,7 @@ abstract class ExplorerTreeNode<Connection : ConnectionConfigBase, Value : Any>(
                     "Error While Opening File ${file.name}",
                     arrayOf("Ok"),
                     0,
-                    AllIcons.General.ErrorDialog,
-                    null
+                    AllIcons.General.ErrorDialog
                   )
                 }
               } else {

diff --git a/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProviderTestSpec.kt b/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProviderTestSpec.kt
@@ -462,12 +462,12 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
         isPastePerformed = false
 
         val showDialogMock: (
-          Project?, String, String, Array<String>, Int, Icon?, DialogWrapper.DoNotAskOption?
+          Project?, String, String, Array<String>, Int, Icon?
         ) -> Int = Messages::showDialog
         mockkStatic(showDialogMock as KFunction<*>)
         every {
           showDialogMock(
-            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?, any()
+            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?
           )
         } answers {
           isShowDialogCalled = true
@@ -583,12 +583,12 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
         }
 
         val showDialogMock: (
-          Project?, String, String, Array<String>, Int, Icon?, DialogWrapper.DoNotAskOption?
+          Project?, String, String, Array<String>, Int, Icon?
         ) -> Int = Messages::showDialog
         mockkStatic(showDialogMock as KFunction<*>)
         every {
           showDialogMock(
-            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?, any()
+            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?
           )
         } answers {
           isShowDialogCalled = true
@@ -605,12 +605,12 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
       should("return if unrecognized dialog message") {
         isPastePerformed = true
         val showDialogSpecificMock: (
-          Project?, String, String, Array<String>, Int, Icon?, DialogWrapper.DoNotAskOption?
+          Project?, String, String, Array<String>, Int, Icon?
         ) -> Int = Messages::showDialog
         mockkStatic(showDialogSpecificMock as KFunction<*>)
         every {
           showDialogSpecificMock(
-            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?, any()
+            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?
           )
         } answers {
           isPastePerformed = false
@@ -692,12 +692,12 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
         every { mockedFileExplorerView.isCut } returns AtomicBoolean(false)
 
         val showDialogSpecificMock: (
-          Project?, String, String, Array<String>, Int, Icon?, DialogWrapper.DoNotAskOption?
+          Project?, String, String, Array<String>, Int, Icon?
         ) -> Int = Messages::showDialog
         mockkStatic(showDialogSpecificMock as KFunction<*>)
         every {
           showDialogSpecificMock(
-            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?, any()
+            any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?
           )
         } answers {
           isShowYesNoDialogCalled = true

diff --git a/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/UssFileNodeTestSpec.kt b/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/UssFileNodeTestSpec.kt
@@ -208,11 +208,11 @@ class UssFileNodeTestSpec : WithApplicationShouldSpec({
 
         var isErrorMessageInDialogCalled = false
         val showDialogSpecificMock: (
-          Project?, String, String, Array<String>, Int, Icon?, DialogWrapper.DoNotAskOption?
+          Project?, String, String, Array<String>, Int, Icon?
         ) -> Int = Messages::showDialog
         mockkStatic(showDialogSpecificMock as KFunction<*>)
         every {
-          showDialogSpecificMock(any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any(), any())
+          showDialogSpecificMock(any(), any<String>(), any<String>(), any<Array<String>>(), any<Int>(), any() as Icon?)
         } answers {
           isErrorMessageInDialogCalled = true
           1