From 71a1f5db4b951d3834d9bf061af0948a4fe3016e Mon Sep 17 00:00:00 2001 From: hstyi Date: Tue, 28 Oct 2025 14:58:51 +0800 Subject: [PATCH] fix: replace WindowScope with Window in context menu extensions --- .../app/termora/transfer/TransportContextMenuExtension.kt | 4 ++-- src/main/kotlin/app/termora/transfer/TransportPopupMenu.kt | 2 +- .../internal/sftp/CompressTransportContextMenuExtension.kt | 4 ++-- .../internal/sftp/ExtractTransportContextMenuExtension.kt | 4 ++-- .../internal/sftp/RmrfTransportContextMenuExtension.kt | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/app/termora/transfer/TransportContextMenuExtension.kt b/src/main/kotlin/app/termora/transfer/TransportContextMenuExtension.kt index a0dc3c9..842c5f2 100644 --- a/src/main/kotlin/app/termora/transfer/TransportContextMenuExtension.kt +++ b/src/main/kotlin/app/termora/transfer/TransportContextMenuExtension.kt @@ -1,7 +1,7 @@ package app.termora.transfer -import app.termora.WindowScope import app.termora.plugin.Extension +import java.awt.Window import java.nio.file.FileSystem import java.nio.file.Path import javax.swing.JMenuItem @@ -14,7 +14,7 @@ internal interface TransportContextMenuExtension : Extension { * @param fileSystem 为 null 表示可能已经断线，处于不可用状态 */ fun createJMenuItem( - windowScope: WindowScope, + window: Window, fileSystem: FileSystem?, popupMenu: TransportPopupMenu, files: List> diff --git a/src/main/kotlin/app/termora/transfer/TransportPopupMenu.kt b/src/main/kotlin/app/termora/transfer/TransportPopupMenu.kt index 81abfd0..7063c64 100644 --- a/src/main/kotlin/app/termora/transfer/TransportPopupMenu.kt +++ b/src/main/kotlin/app/termora/transfer/TransportPopupMenu.kt @@ -108,7 +108,7 @@ internal class TransportPopupMenu( for (extension in extensionManager.getExtensions(TransportContextMenuExtension::class.java)) { try { val menu = extension.createJMenuItem( - ApplicationScope.forWindowScope(owner), + owner, fileSystem, this, files diff --git a/src/main/kotlin/app/termora/transfer/internal/sftp/CompressTransportContextMenuExtension.kt b/src/main/kotlin/app/termora/transfer/internal/sftp/CompressTransportContextMenuExtension.kt index 8ff5730..12b2dea 100644 --- a/src/main/kotlin/app/termora/transfer/internal/sftp/CompressTransportContextMenuExtension.kt +++ b/src/main/kotlin/app/termora/transfer/internal/sftp/CompressTransportContextMenuExtension.kt @@ -1,7 +1,6 @@ package app.termora.transfer.internal.sftp import app.termora.I18n -import app.termora.WindowScope import app.termora.actions.AnAction import app.termora.actions.AnActionEvent import app.termora.randomUUID @@ -9,6 +8,7 @@ import app.termora.transfer.* import org.apache.commons.lang3.StringUtils import org.apache.sshd.common.file.util.MockPath import org.apache.sshd.sftp.client.fs.SftpFileSystem +import java.awt.Window import java.nio.file.FileSystem import java.nio.file.Path import javax.swing.JMenu @@ -23,7 +23,7 @@ internal class CompressTransportContextMenuExtension private constructor() : Tra } override fun createJMenuItem( - windowScope: WindowScope, + window: Window, fileSystem: FileSystem?, popupMenu: TransportPopupMenu, files: List> diff --git a/src/main/kotlin/app/termora/transfer/internal/sftp/ExtractTransportContextMenuExtension.kt b/src/main/kotlin/app/termora/transfer/internal/sftp/ExtractTransportContextMenuExtension.kt index 01f7f3f..4ac7e6e 100644 --- a/src/main/kotlin/app/termora/transfer/internal/sftp/ExtractTransportContextMenuExtension.kt +++ b/src/main/kotlin/app/termora/transfer/internal/sftp/ExtractTransportContextMenuExtension.kt @@ -1,13 +1,13 @@ package app.termora.transfer.internal.sftp import app.termora.I18n -import app.termora.WindowScope import app.termora.actions.AnAction import app.termora.actions.AnActionEvent import app.termora.randomUUID import app.termora.transfer.* import org.apache.commons.lang3.StringUtils import org.apache.sshd.sftp.client.fs.SftpFileSystem +import java.awt.Window import java.nio.file.FileSystem import java.nio.file.Path import javax.swing.JMenu @@ -21,7 +21,7 @@ internal class ExtractTransportContextMenuExtension private constructor() : Tran } override fun createJMenuItem( - windowScope: WindowScope, + window: Window, fileSystem: FileSystem?, popupMenu: TransportPopupMenu, files: List> diff --git a/src/main/kotlin/app/termora/transfer/internal/sftp/RmrfTransportContextMenuExtension.kt b/src/main/kotlin/app/termora/transfer/internal/sftp/RmrfTransportContextMenuExtension.kt index be36165..67f77e0 100644 --- a/src/main/kotlin/app/termora/transfer/internal/sftp/RmrfTransportContextMenuExtension.kt +++ b/src/main/kotlin/app/termora/transfer/internal/sftp/RmrfTransportContextMenuExtension.kt @@ -3,11 +3,11 @@ package app.termora.transfer.internal.sftp import app.termora.I18n import app.termora.Icons import app.termora.OptionPane -import app.termora.WindowScope import app.termora.transfer.TransportContextMenuExtension import app.termora.transfer.TransportPopupMenu import app.termora.transfer.TransportTableModel import org.apache.sshd.sftp.client.fs.SftpFileSystem +import java.awt.Window import java.nio.file.FileSystem import java.nio.file.Path import javax.swing.JMenuItem @@ -19,7 +19,7 @@ internal class RmrfTransportContextMenuExtension private constructor() : Transpo } override fun createJMenuItem( - windowScope: WindowScope, + window: Window, fileSystem: FileSystem?, popupMenu: TransportPopupMenu, files: List> @@ -31,7 +31,7 @@ internal class RmrfTransportContextMenuExtension private constructor() : Transpo val rmrfMenu = JMenuItem("rm -rf", Icons.warningIntroduction) rmrfMenu.addActionListener { if (OptionPane.showConfirmDialog( - windowScope.window, + window, I18n.getString("termora.transport.table.contextmenu.rm-warning"), messageType = JOptionPane.ERROR_MESSAGE ) == JOptionPane.YES_OPTION