From 6359685556bdbc2f4ce129f41c4486b4d5b0fd5d Mon Sep 17 00:00:00 2001 From: Uladzislau Date: Fri, 19 Jan 2024 11:17:14 +0100 Subject: [PATCH 1/2] Fix for VFS Signed-off-by: Uladzislau --- CHANGELOG.md | 1 + build.gradle.kts | 1 + .../kotlin/org/zowe/explorer/vfs/MFVirtualFileSystemModel.kt | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5bbc45ab..b87af7836 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to the Zowe IntelliJ Plugin will be documented in this file. * Bugfix: Topics handling ([25606368](https://github.com/zowe/zowe-explorer-intellij/commit/25606368)) * Bugfix: Zowe config v2 handling ([fd79b908](https://github.com/zowe/zowe-explorer-intellij/commit/fd79b908)) * Bugfix: JES Explorer bug when ABEND job is being displayed ([614aa6cf](https://github.com/zowe/zowe-explorer-intellij/commit/614aa6cf)) +* Bugfix: Conflicting VFS name ([614aa6cf](https://github.com/zowe/zowe-explorer-intellij/commit/614aa6cf)) * Bugfix: GitHub issue #167: Zowe explorer config is not converted ([b5eae7a2](https://github.com/zowe/zowe-explorer-intellij/commit/b5eae7a2)) ## `1.1.1 (2023-11-23)` diff --git a/build.gradle.kts b/build.gradle.kts index 5c317e2df..0e36626eb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -117,6 +117,7 @@ tasks {
  • Topics handling
  • Zowe config v2 handling
  • JES Explorer bug when ABEND job is being displayed
    • +
  • Conflicting VFS name
  • GitHub issue #167: Zowe explorer config is not converted
    • """ ) diff --git a/src/main/kotlin/org/zowe/explorer/vfs/MFVirtualFileSystemModel.kt b/src/main/kotlin/org/zowe/explorer/vfs/MFVirtualFileSystemModel.kt index 9314ba12c..60381d2ef 100755 --- a/src/main/kotlin/org/zowe/explorer/vfs/MFVirtualFileSystemModel.kt +++ b/src/main/kotlin/org/zowe/explorer/vfs/MFVirtualFileSystemModel.kt @@ -53,7 +53,7 @@ enum class FSEdgeType { } } -private const val VFS_CONTENT_STORAGE_NAME = "mf_vfs_contents" +private const val VFS_CONTENT_STORAGE_NAME = "zowe_mf_vfs_contents" class FSEdge @JvmOverloads constructor(val type: FSEdgeType = FSEdgeType.DIR) From 202c213b1040775240d88f275e75bd72b35f8afd Mon Sep 17 00:00:00 2001 From: Uladzislau Date: Fri, 19 Jan 2024 11:17:57 +0100 Subject: [PATCH 2/2] CHANGELOG.md update Signed-off-by: Uladzislau --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b87af7836..773b6dbc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ All notable changes to the Zowe IntelliJ Plugin will be documented in this file. * Bugfix: Topics handling ([25606368](https://github.com/zowe/zowe-explorer-intellij/commit/25606368)) * Bugfix: Zowe config v2 handling ([fd79b908](https://github.com/zowe/zowe-explorer-intellij/commit/fd79b908)) * Bugfix: JES Explorer bug when ABEND job is being displayed ([614aa6cf](https://github.com/zowe/zowe-explorer-intellij/commit/614aa6cf)) -* Bugfix: Conflicting VFS name ([614aa6cf](https://github.com/zowe/zowe-explorer-intellij/commit/614aa6cf)) +* Bugfix: Conflicting VFS name ([63596855](https://github.com/zowe/zowe-explorer-intellij/commit/63596855)) * Bugfix: GitHub issue #167: Zowe explorer config is not converted ([b5eae7a2](https://github.com/zowe/zowe-explorer-intellij/commit/b5eae7a2)) ## `1.1.1 (2023-11-23)`