From d77a5fbfd95efaf22e964af96f824399b62ce7f0 Mon Sep 17 00:00:00 2001 From: Uladzislau Date: Wed, 17 May 2023 21:18:55 +0200 Subject: [PATCH 1/3] IJMP-1128 Preparing 1.0.2-223 --- .../eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt | 2 +- .../eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt index 21a4e45b0..9efe12adb 100644 --- a/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt +++ b/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt @@ -80,4 +80,4 @@ class MFPastePreprocessor : CopyPastePostProcessor() } super.processTransferableData(project, editor, bounds, caretOffset, indented, values) } -} \ No newline at end of file +} diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt index 92105d0ae..900d8142b 100644 --- a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt +++ b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt @@ -569,4 +569,3 @@ data class NodeData( /** Type alias for fetch node with any possible generic types. */ typealias FetchNode = FileFetchNode<*, *, *, *, *> - From 1b286c95cb4c85b5204155b3814882a104bb47ef Mon Sep 17 00:00:00 2001 From: Uladzislau Date: Wed, 17 May 2023 21:22:24 +0200 Subject: [PATCH 2/3] IJMP-1128 Preparing v1.0.2-223 --- .../formainframe/editor/MFPastePreprocessor.kt | 18 ------------------ .../explorer/actions/AddMemberAction.kt | 1 - .../explorer/actions/AllocateDatasetAction.kt | 1 - .../actions/ChangeContentModeAction.kt | 1 - .../explorer/actions/CreateUssEntityAction.kt | 1 - .../explorer/actions/PurgeJobAction.kt | 1 - .../explorer/actions/RenameAction.kt | 1 - .../explorer/ui/ExplorerTreeNode.kt | 1 - .../explorer/ui/ExplorerWindowFactory.kt | 3 +-- .../explorer/ui/FileExplorerView.kt | 1 - .../explorer/ui/FileLikeDatasetNode.kt | 1 - 11 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt b/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt index 215aa933b..d4439aca9 100644 --- a/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt +++ b/src/main/kotlin/eu/ibagroup/formainframe/editor/MFPastePreprocessor.kt @@ -43,24 +43,6 @@ class MFPastePreprocessor : CopyPastePostProcessor() return DATA_FLAVOR } - // This function is not needed to be overridden since v1.0.2-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 - @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 - @ApiStatus.ScheduledForRemoval(inVersion = "2.0.0") - override fun setOffsets(offsets: IntArray?, index: Int): Int { - return index - } - companion object { private val DATA_FLAVOR = DataFlavor(MFPastePreprocessor::class.java, "class: ChangeContentByPasteAction") } diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/AddMemberAction.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/actions/AddMemberAction.kt index 5ec8ed20f..920c8557e 100644 --- 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,6 @@ 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.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 index 04083df32..f5a0e2308 100644 --- 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,6 @@ 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.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 index c7ae014f2..0bb24ff65 100644 --- 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,6 @@ 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.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 index b182fa310..6efee375c 100644 --- 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,6 @@ 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.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 index 2ee218808..f6f7598e1 100644 --- 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,6 @@ 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.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 index 1ac0b6938..8b483f602 100644 --- 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,6 @@ 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 /** * 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 index 0a70c14aa..73fe0cc78 100644 --- 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,6 @@ 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.vfs.MFVirtualFile import javax.swing.tree.TreePath diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerWindowFactory.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerWindowFactory.kt index b42fdda32..74a9ab14f 100755 --- a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerWindowFactory.kt +++ b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/ExplorerWindowFactory.kt @@ -26,8 +26,7 @@ class ExplorerWindowFactory : ToolWindowFactory, DumbAware { } override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) { - // TODO: ContentFactory.SERVICE.getInstance() -> ContentFactory.getInstance() in new versions of the plugin - val contentFactory = ContentFactory.SERVICE.getInstance() + val contentFactory = ContentFactory.getInstance() UIComponentManager.INSTANCE.getExplorerContentProviders>().forEach { val content = contentFactory .createContent(it.buildExplorerContent(toolWindow.disposable, project), it.displayName, it.isLockable) diff --git a/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt b/src/main/kotlin/eu/ibagroup/formainframe/explorer/ui/FileExplorerView.kt index 70dbcd430..900d8142b 100644 --- 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,6 @@ 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.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 index f474120fb..deef63ca3 100644 --- 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,6 @@ 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.vfs.MFVirtualFile import icons.ForMainframeIcons From 3180578866a67d47fe912850802536cb79270ecb Mon Sep 17 00:00:00 2001 From: Uladzislau Date: Wed, 17 May 2023 21:28:17 +0200 Subject: [PATCH 3/3] IJMP-1128 Preparing v1.0.2-223 --- build.gradle.kts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 84b77167a..97f607016 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -21,7 +21,7 @@ apply(plugin = "kotlin") apply(plugin = "org.jetbrains.intellij") group = "eu.ibagroup" -version = "1.0.2-221" +version = "1.0.2-223" val remoteRobotVersion = "0.11.16" repositories { @@ -46,8 +46,8 @@ repositories { } java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } dependencies { @@ -73,23 +73,23 @@ dependencies { } intellij { - version.set("2022.1") + version.set("2022.3") } tasks { withType { kotlinOptions { - jvmTarget = JavaVersion.VERSION_11.toString() + jvmTarget = JavaVersion.VERSION_17.toString() languageVersion = org.jetbrains.kotlin.config.LanguageVersion.LATEST_STABLE.versionString } } patchPluginXml { - sinceBuild.set("221.5080") - untilBuild.set("222.*") + sinceBuild.set("223.7571") + untilBuild.set("223.*") changeNotes.set( """ - WARNING: version 1.0 introduces breaking change. You won't be able to use the plugin with IntelliJ version less than 2022.1 + WARNING: version 1.0 introduces breaking change. You won't be able to use the plugin with IntelliJ version less than 2022.3

New features: