From 459c873170faedb559f25296aff12882ea958d9c Mon Sep 17 00:00:00 2001
From: Krus_V <vkrus@ibagroup.eu>
Date: Thu, 16 Nov 2023 18:19:45 +0100
Subject: [PATCH 1/3] upgraded plugin version to 1.1.2.

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 63ccfa91f..25f0f96fb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -22,7 +22,7 @@ apply(plugin = "kotlin")
 apply(plugin = "org.jetbrains.intellij")
 
 group = "eu.ibagroup"
-version = "1.1.1-221"
+version = "1.1.2-221"
 val remoteRobotVersion = "0.11.19"
 val okHttp3Version = "4.10.0"
 val kotestVersion = "5.6.2"

From 749b2d4b82eab7f3ea08e07c848a7af714d72aed Mon Sep 17 00:00:00 2001
From: Valiantsin Krus <vkrus@ibagroup.eu>
Date: Tue, 21 Nov 2023 12:56:30 +0100
Subject: [PATCH 2/3] Bugfix/ijmp 1339 skip this files doesnt work when
 uploading local file to pds

---
 .../ibagroup/formainframe/explorer/ui/ExplorerPasteProvider.kt  | 2 +-
 .../formainframe/explorer/ui/ExplorerPasteProviderTestSpec.kt   | 2 +-
 2 files changed, 2 insertions(+), 2 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
index 566e67006..ad7817708 100644
--- a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProvider.kt
+++ b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProvider.kt
@@ -340,7 +340,7 @@ class ExplorerPasteProvider : PasteProvider {
         )
       ) {
         conflictsResolutions.addAll(
-          ussToPdsWarnings.map { ConflictResolution(it.first, it.second).apply { resolveBySkip() } }
+          ussToPdsWarnings.map { ConflictResolution(it.second, it.first).apply { resolveBySkip() } }
         )
       }
       // specific conflicts resolution end
diff --git a/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProviderTestSpec.kt b/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProviderTestSpec.kt
index 6d4468eee..500d6c0b8 100644
--- a/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProviderTestSpec.kt
+++ b/src/test/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerPasteProviderTestSpec.kt
@@ -362,7 +362,7 @@ class ExplorerPasteProviderTestSpec : WithApplicationShouldSpec({
         mockedExplorerPasteProvider.performPaste(mockedDataContext)
         assertSoftly {
           isShowYesNoDialogCalled shouldBe true
-          isPastePerformed shouldBe true
+          isPastePerformed shouldBe false
         }
       }
 

From bfb125d7ab5798b60c254a4cb6b59734c73fd38a Mon Sep 17 00:00:00 2001
From: Dzianis Lisiankou <DLisiankou@iba.by>
Date: Fri, 17 Nov 2023 19:11:34 +0300
Subject: [PATCH 3/3] IJMP-1209: fix sync action

---
 .../dataops/content/synchronizer/DocumentedSyncProvider.kt      | 2 --
 src/main/resources/META-INF/plugin.xml                          | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/dataops/content/synchronizer/DocumentedSyncProvider.kt b/src/main/kotlin/eu/ibagroup/formainframe/dataops/content/synchronizer/DocumentedSyncProvider.kt
index 8fd5850d9..29abaf2e0 100644
--- a/src/main/kotlin/eu/ibagroup/formainframe/dataops/content/synchronizer/DocumentedSyncProvider.kt
+++ b/src/main/kotlin/eu/ibagroup/formainframe/dataops/content/synchronizer/DocumentedSyncProvider.kt
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.text.StringUtilRt
 import com.intellij.openapi.vfs.VirtualFile
 import eu.ibagroup.formainframe.dataops.DataOpsManager
 import eu.ibagroup.formainframe.dataops.attributes.RemoteUssAttributes
-import eu.ibagroup.formainframe.editor.DocumentChangeListener
 import eu.ibagroup.formainframe.utils.castOrNull
 import eu.ibagroup.formainframe.vfs.MFVirtualFile
 import java.nio.charset.Charset
@@ -100,7 +99,6 @@ class DocumentedSyncProvider(
           it.write(content)
         }
         loadNewContent(content)
-        getDocument()?.addDocumentListener(DocumentChangeListener())
       }.onFailure {
         isInitialContentSet.set(false)
       }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 1f55f7260..29b393509 100755
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -387,6 +387,8 @@ Example of how to see the output:<br/>
                          groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues"
                          enabledByDefault="true" level="WARNING"
                          implementationClass="eu.ibagroup.formainframe.editor.inspection.MFLossyEncodingInspection"/>
+
+        <editorFactoryDocumentListener implementation="eu.ibagroup.formainframe.editor.DocumentChangeListener"/>
     </extensions>
 
     <actions>