From 79a7fc50eedf50c44c89ce3ecbd90ab74fa83fc8 Mon Sep 17 00:00:00 2001
From: Denis Lisenkov <lisenkov.d.y@gmail.com>
Date: Thu, 9 Nov 2023 14:16:06 +0300
Subject: [PATCH] GHI-161: conflict between ZE and FM fixed

Signed-off-by: Denis Lisenkov <lisenkov.d.y@gmail.com>
---
 .../explorer/editor/inspection/MFLossyEncodingInspection.kt     | 2 +-
 src/main/kotlin/org/zowe/explorer/utils/encodingUtils.kt        | 2 +-
 src/main/resources/META-INF/plugin.xml                          | 2 +-
 .../{MFLossyEncoding.html => ZoweMFLossyEncoding.html}          | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/main/resources/inspectionDescriptions/{MFLossyEncoding.html => ZoweMFLossyEncoding.html} (100%)

diff --git a/src/main/kotlin/org/zowe/explorer/editor/inspection/MFLossyEncodingInspection.kt b/src/main/kotlin/org/zowe/explorer/editor/inspection/MFLossyEncodingInspection.kt
index 4a07fb515..8542696d2 100644
--- a/src/main/kotlin/org/zowe/explorer/editor/inspection/MFLossyEncodingInspection.kt
+++ b/src/main/kotlin/org/zowe/explorer/editor/inspection/MFLossyEncodingInspection.kt
@@ -39,7 +39,7 @@ import java.nio.charset.CodingErrorAction
 class MFLossyEncodingInspection : LocalInspectionTool() {
 
   override fun getShortName(): String {
-    return "MFLossyEncoding"
+    return "ZoweMFLossyEncoding"
   }
 
   override fun checkFile(file: PsiFile, manager: InspectionManager, isOnTheFly: Boolean): Array<ProblemDescriptor>? {
diff --git a/src/main/kotlin/org/zowe/explorer/utils/encodingUtils.kt b/src/main/kotlin/org/zowe/explorer/utils/encodingUtils.kt
index b77479663..ccda26a88 100644
--- a/src/main/kotlin/org/zowe/explorer/utils/encodingUtils.kt
+++ b/src/main/kotlin/org/zowe/explorer/utils/encodingUtils.kt
@@ -227,7 +227,7 @@ fun checkEncodingCompatibility(file: VirtualFile, project: Project): Boolean {
   val psiFile = PsiManager.getInstance(project).findFile(file)
   psiFile?.let {
     val inspectionProfile = InspectionProjectProfileManager.getInstance(project).currentProfile
-    val inspectionTool = inspectionProfile.getInspectionTool("MFLossyEncoding", project)
+    val inspectionTool = inspectionProfile.getInspectionTool("ZoweMFLossyEncoding", project)
     inspectionTool?.let { tool ->
       val inspectionManager = InspectionManager.getInstance(project)
       val descriptors =
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 36b8781be..ac5e6651e 100755
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -368,7 +368,7 @@ Thank you for considering IBA Group for your mainframe needs.
                                 order="after org.zowe.explorer.editor.status.MfLineSeparatorWidgetFactory, before powerStatus"/>
 
         <!-- TODO: define attribute language="" in v1.*.*-223 and greater -->
-        <localInspection shortName="MFLossyEncoding" displayName="MF lossy encoding"
+        <localInspection shortName="ZoweMFLossyEncoding" displayName="Zowe MF lossy encoding"
                          groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues"
                          enabledByDefault="true" level="WARNING"
                          implementationClass="org.zowe.explorer.editor.inspection.MFLossyEncodingInspection"/>
diff --git a/src/main/resources/inspectionDescriptions/MFLossyEncoding.html b/src/main/resources/inspectionDescriptions/ZoweMFLossyEncoding.html
similarity index 100%
rename from src/main/resources/inspectionDescriptions/MFLossyEncoding.html
rename to src/main/resources/inspectionDescriptions/ZoweMFLossyEncoding.html