Skip to content

Commit

Permalink
Merge branch 'public-release/v1.0.2-223' into public-release/v1.0.2-231
Browse files Browse the repository at this point in the history
  • Loading branch information
Dzianis Lisiankou authored and Dzianis Lisiankou committed Jun 13, 2023
2 parents ffd17da + 5accc52 commit ce0378f
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@ import kotlinx.coroutines.CoroutineScope
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, scope: CoroutineScope): EncodingPanel(project, scope) {

// 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class MfEncodingPanelWidgetFactory: StatusBarEditorBasedWidgetFactory() {
return MfEncodingPanel(project, scope)
}

// 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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@ import eu.ibagroup.formainframe.editor.isUssVirtualFile
import eu.ibagroup.formainframe.editor.zoweExplorerInstalled
import kotlinx.coroutines.CoroutineScope

// 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, scope: CoroutineScope): LineSeparatorPanel(project, scope) {

// 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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class MfLineSeparatorWidgetFactory: StatusBarEditorBasedWidgetFactory() {
return MfLineSeparatorPanel(project, scope)
}

// 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) {
Expand Down
1 change: 1 addition & 0 deletions src/main/kotlin/eu/ibagroup/formainframe/editor/utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ce0378f

Please sign in to comment.