Merge branch 'release/v1.0.2-221' into public-release/v1.0.2-221

for-mainframe · Jun 13, 2023 · 37d42a8 · 37d42a8
2 parents af056dd + f6723f3
commit 37d42a8
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 All notable changes to the Zowe IntelliJ Plugin will be documented in this file.
 
-## `1.0.2 (2023-xx-xx)`
+## `1.0.2 (2023-06-13)`
 
 * Feature: Returned support for IntelliJ 2022.1 ([6329c788](https://github.com/zowe/zowe-explorer-intellij/commit/6329c788))
 * Feature: Focus on dataset name field in allocation dialog ([fccb77f9](https://github.com/zowe/zowe-explorer-intellij/commit/fccb77f9))

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt
@@ -43,19 +43,19 @@ class MFPastePreprocessor : CopyPastePostProcessor<TextBlockTransferableData>()
       return DATA_FLAVOR
     }
 
-    // This function is not needed to be overridden since v1.0.2-223
+    // This function is not needed to be overridden since v1.*.*-223
     @ApiStatus.ScheduledForRemoval(inVersion = "2.0.0")
     override fun getOffsetCount(): Int {
       return 0
     }
 
-    // This function is not needed to be overridden since v1.0.2-223
+    // This function is not needed to be overridden since v1.*.*-223
     @ApiStatus.ScheduledForRemoval(inVersion = "2.0.0")
     override fun getOffsets(offsets: IntArray?, index: Int): Int {
       return index
     }
 
-    // This function is not needed to be overridden since v1.0.2-223
+    // This function is not needed to be overridden since v1.*.*-223
     @ApiStatus.ScheduledForRemoval(inVersion = "2.0.0")
     override fun setOffsets(offsets: IntArray?, index: Int): Int {
       return index
@@ -99,4 +99,4 @@ class MFPastePreprocessor : CopyPastePostProcessor<TextBlockTransferableData>()
     }
     super.processTransferableData(project, editor, bounds, caretOffset, indented, values)
   }
-}
+}
diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfEncodingPanel.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfEncodingPanel.kt
@@ -18,13 +18,16 @@ import com.intellij.openapi.wm.impl.status.EncodingPanel
 import eu.ibagroup.formainframe.editor.isMfVirtualFile
 import eu.ibagroup.formainframe.editor.zoweExplorerInstalled
 
+// This code should not be as described below in Zowe repo
+// Change MF to ZoweMF
 const val MF_ENCODING_PANEL_WIDGET = "MF" + StatusBar.StandardWidgets.ENCODING_PANEL
 
 /**
  * Encoding panel in status bar with correctly display for MF files.
  */
 class MfEncodingPanel(project: Project): EncodingPanel(project) {
 
+  // This code should not be present in Zowe repo
   /**
    * Returns the state of the widget for correct display in the status bar.
    * Always displayed except when the zowe-explorer plugin is installed.

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfEncodingPanelWidgetFactory.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfEncodingPanelWidgetFactory.kt
@@ -29,6 +29,7 @@ class MfEncodingPanelWidgetFactory: EncodingPanelWidgetFactory() {
     return MfEncodingPanel(project)
   }
 
+  // This code should not be present in Zowe repo
   /** Always enabled except when the zowe-explorer plugin is installed. */
   override fun canBeEnabledOn(statusBar: StatusBar): Boolean {
     if (zoweExplorerInstalled) {

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfLineSeparatorPanel.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfLineSeparatorPanel.kt
@@ -19,13 +19,16 @@ import eu.ibagroup.formainframe.editor.isMfVirtualFile
 import eu.ibagroup.formainframe.editor.isUssVirtualFile
 import eu.ibagroup.formainframe.editor.zoweExplorerInstalled
 
+// This code should not be as described below in Zowe repo
+// Change MF to ZoweMF
 const val MF_LINE_SEPARATOR_PANEL_WIDGET = "MF" + StatusBar.StandardWidgets.LINE_SEPARATOR_PANEL
 
 /**
  * Line separator panel in status bar with correctly display for MF files.
  */
 class MfLineSeparatorPanel(project: Project): LineSeparatorPanel(project) {
 
+  // This code should not be present in Zowe repo
   /**
    * Returns the state of the widget for correct display in the status bar.
    * Always displayed except when the zowe-explorer plugin is installed.

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfLineSeparatorWidgetFactory.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/status/MfLineSeparatorWidgetFactory.kt
@@ -29,6 +29,7 @@ class MfLineSeparatorWidgetFactory: LineSeparatorWidgetFactory() {
     return MfLineSeparatorPanel(project)
   }
 
+  // This code should not be present in Zowe repo
   /** Always enabled except when the zowe-explorer plugin is installed. */
   override fun canBeEnabledOn(statusBar: StatusBar): Boolean {
     if (zoweExplorerInstalled) {

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/utils.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/utils.kt
@@ -35,6 +35,7 @@ fun showSyncOnCloseDialog(fileName: String, project: Project): Boolean {
     .ask(project = project)
 }
 
+// This code should not be present in Zowe repo
 val zoweExplorerInstalled = PluginManager.isPluginInstalled(PluginId.getId("org.zowe.explorer"))
 
 const val MF_VIRTUAL_FILE_KEY_NAME = "mfVirtualFile"

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/AddMemberAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/AddMemberAction.kt
@@ -26,7 +26,7 @@ import eu.ibagroup.formainframe.dataops.getAttributesService
 import eu.ibagroup.formainframe.dataops.operations.*
 import eu.ibagroup.formainframe.explorer.FilesWorkingSet
 import eu.ibagroup.formainframe.explorer.ui.*
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.formainframe.vfs.MFVirtualFile
 
 /** Class that represents "Add member" action */

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/AllocateDatasetAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/AllocateDatasetAction.kt
@@ -37,7 +37,7 @@ import eu.ibagroup.formainframe.explorer.ui.*
 import eu.ibagroup.formainframe.utils.castOrNull
 import eu.ibagroup.formainframe.utils.clone
 import eu.ibagroup.formainframe.utils.crudable.getByUniqueKey
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.r2z.*
 
 /**

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/ChangeContentModeAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/ChangeContentModeAction.kt
@@ -20,7 +20,7 @@ import eu.ibagroup.formainframe.dataops.attributes.*
 import eu.ibagroup.formainframe.explorer.ui.FILE_EXPLORER_VIEW
 import eu.ibagroup.formainframe.explorer.ui.FileExplorerView
 import eu.ibagroup.formainframe.utils.sendTopic
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.formainframe.vfs.MFVirtualFile
 import eu.ibagroup.r2z.XIBMDataType
 

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/CreateUssEntityAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/CreateUssEntityAction.kt
@@ -32,7 +32,7 @@ import eu.ibagroup.formainframe.dataops.operations.UssChangeModeOperation
 import eu.ibagroup.formainframe.dataops.operations.UssChangeModeParams
 import eu.ibagroup.formainframe.explorer.ui.*
 import eu.ibagroup.formainframe.utils.castOrNull
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.formainframe.vfs.MFVirtualFile
 import eu.ibagroup.r2z.ChangeMode
 import eu.ibagroup.r2z.FileType

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/PurgeJobAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/PurgeJobAction.kt
@@ -15,7 +15,7 @@ import eu.ibagroup.formainframe.dataops.operations.jobs.PurgeJobOperation
 import eu.ibagroup.formainframe.explorer.ui.*
 import eu.ibagroup.formainframe.ui.build.jobs.JOBS_LOG_VIEW
 import eu.ibagroup.formainframe.ui.build.jobs.JobBuildTreeView
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.r2z.ExecData
 import eu.ibagroup.r2z.JESApi
 import eu.ibagroup.r2z.Job

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/RenameAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/RenameAction.kt
@@ -32,7 +32,7 @@ import eu.ibagroup.formainframe.explorer.FilesWorkingSet
 import eu.ibagroup.formainframe.explorer.ui.*
 import eu.ibagroup.formainframe.utils.clone
 import eu.ibagroup.formainframe.utils.crudable.getByUniqueKey
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 
 /**
  * Class which represents a rename action

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerTreeNode.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerTreeNode.kt
@@ -34,7 +34,7 @@ import eu.ibagroup.formainframe.explorer.Explorer
 import eu.ibagroup.formainframe.explorer.UIComponentManager
 import eu.ibagroup.formainframe.utils.isBeingEditingNow
 import eu.ibagroup.formainframe.utils.runWriteActionInEdtAndWait
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.formainframe.vfs.MFVirtualFile
 import javax.swing.tree.TreePath
 

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt
@@ -40,7 +40,7 @@ import eu.ibagroup.formainframe.explorer.Explorer
 import eu.ibagroup.formainframe.explorer.FilesWorkingSet
 import eu.ibagroup.formainframe.utils.getMinimalCommonParents
 import eu.ibagroup.formainframe.utils.getParentsChain
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.formainframe.vfs.MFVirtualFile
 import java.awt.Toolkit
 import java.awt.datatransfer.DataFlavor

diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileLikeDatasetNode.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileLikeDatasetNode.kt
@@ -24,7 +24,7 @@ import eu.ibagroup.formainframe.dataops.attributes.RemoteDatasetAttributes
 import eu.ibagroup.formainframe.dataops.attributes.RemoteMemberAttributes
 import eu.ibagroup.formainframe.dataops.getAttributesService
 import eu.ibagroup.formainframe.explorer.ExplorerUnit
-import eu.ibagroup.formainframe.utils.service // TODO: remove in 1.0.2-223 and greater
+import eu.ibagroup.formainframe.utils.service // TODO: remove in v1.*.*-223 and greater
 import eu.ibagroup.formainframe.vfs.MFVirtualFile
 import icons.ForMainframeIcons