GHI-161: conflict between ZE and FM fixed

Signed-off-by: Denis Lisenkov <[email protected]>
zowe · Nov 9, 2023 · 79a7fc5 · 79a7fc5
1 parent 1afc8c0
commit 79a7fc5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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/...spectionDescriptions/MFLossyEncoding.html → ...tionDescriptions/ZoweMFLossyEncoding.html b/...spectionDescriptions/MFLossyEncoding.html → ...tionDescriptions/ZoweMFLossyEncoding.html