mirror of
https://github.com/TermoraDev/termora.git
synced 2026-01-15 18:02:58 +08:00
fix: replace WindowScope with Window in context menu extensions
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
package app.termora.transfer
|
package app.termora.transfer
|
||||||
|
|
||||||
import app.termora.WindowScope
|
|
||||||
import app.termora.plugin.Extension
|
import app.termora.plugin.Extension
|
||||||
|
import java.awt.Window
|
||||||
import java.nio.file.FileSystem
|
import java.nio.file.FileSystem
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import javax.swing.JMenuItem
|
import javax.swing.JMenuItem
|
||||||
@@ -14,7 +14,7 @@ internal interface TransportContextMenuExtension : Extension {
|
|||||||
* @param fileSystem 为 null 表示可能已经断线,处于不可用状态
|
* @param fileSystem 为 null 表示可能已经断线,处于不可用状态
|
||||||
*/
|
*/
|
||||||
fun createJMenuItem(
|
fun createJMenuItem(
|
||||||
windowScope: WindowScope,
|
window: Window,
|
||||||
fileSystem: FileSystem?,
|
fileSystem: FileSystem?,
|
||||||
popupMenu: TransportPopupMenu,
|
popupMenu: TransportPopupMenu,
|
||||||
files: List<Pair<Path, TransportTableModel.Attributes>>
|
files: List<Pair<Path, TransportTableModel.Attributes>>
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ internal class TransportPopupMenu(
|
|||||||
for (extension in extensionManager.getExtensions(TransportContextMenuExtension::class.java)) {
|
for (extension in extensionManager.getExtensions(TransportContextMenuExtension::class.java)) {
|
||||||
try {
|
try {
|
||||||
val menu = extension.createJMenuItem(
|
val menu = extension.createJMenuItem(
|
||||||
ApplicationScope.forWindowScope(owner),
|
owner,
|
||||||
fileSystem,
|
fileSystem,
|
||||||
this,
|
this,
|
||||||
files
|
files
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package app.termora.transfer.internal.sftp
|
package app.termora.transfer.internal.sftp
|
||||||
|
|
||||||
import app.termora.I18n
|
import app.termora.I18n
|
||||||
import app.termora.WindowScope
|
|
||||||
import app.termora.actions.AnAction
|
import app.termora.actions.AnAction
|
||||||
import app.termora.actions.AnActionEvent
|
import app.termora.actions.AnActionEvent
|
||||||
import app.termora.randomUUID
|
import app.termora.randomUUID
|
||||||
@@ -9,6 +8,7 @@ import app.termora.transfer.*
|
|||||||
import org.apache.commons.lang3.StringUtils
|
import org.apache.commons.lang3.StringUtils
|
||||||
import org.apache.sshd.common.file.util.MockPath
|
import org.apache.sshd.common.file.util.MockPath
|
||||||
import org.apache.sshd.sftp.client.fs.SftpFileSystem
|
import org.apache.sshd.sftp.client.fs.SftpFileSystem
|
||||||
|
import java.awt.Window
|
||||||
import java.nio.file.FileSystem
|
import java.nio.file.FileSystem
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import javax.swing.JMenu
|
import javax.swing.JMenu
|
||||||
@@ -23,7 +23,7 @@ internal class CompressTransportContextMenuExtension private constructor() : Tra
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun createJMenuItem(
|
override fun createJMenuItem(
|
||||||
windowScope: WindowScope,
|
window: Window,
|
||||||
fileSystem: FileSystem?,
|
fileSystem: FileSystem?,
|
||||||
popupMenu: TransportPopupMenu,
|
popupMenu: TransportPopupMenu,
|
||||||
files: List<Pair<Path, TransportTableModel.Attributes>>
|
files: List<Pair<Path, TransportTableModel.Attributes>>
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
package app.termora.transfer.internal.sftp
|
package app.termora.transfer.internal.sftp
|
||||||
|
|
||||||
import app.termora.I18n
|
import app.termora.I18n
|
||||||
import app.termora.WindowScope
|
|
||||||
import app.termora.actions.AnAction
|
import app.termora.actions.AnAction
|
||||||
import app.termora.actions.AnActionEvent
|
import app.termora.actions.AnActionEvent
|
||||||
import app.termora.randomUUID
|
import app.termora.randomUUID
|
||||||
import app.termora.transfer.*
|
import app.termora.transfer.*
|
||||||
import org.apache.commons.lang3.StringUtils
|
import org.apache.commons.lang3.StringUtils
|
||||||
import org.apache.sshd.sftp.client.fs.SftpFileSystem
|
import org.apache.sshd.sftp.client.fs.SftpFileSystem
|
||||||
|
import java.awt.Window
|
||||||
import java.nio.file.FileSystem
|
import java.nio.file.FileSystem
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import javax.swing.JMenu
|
import javax.swing.JMenu
|
||||||
@@ -21,7 +21,7 @@ internal class ExtractTransportContextMenuExtension private constructor() : Tran
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun createJMenuItem(
|
override fun createJMenuItem(
|
||||||
windowScope: WindowScope,
|
window: Window,
|
||||||
fileSystem: FileSystem?,
|
fileSystem: FileSystem?,
|
||||||
popupMenu: TransportPopupMenu,
|
popupMenu: TransportPopupMenu,
|
||||||
files: List<Pair<Path, TransportTableModel.Attributes>>
|
files: List<Pair<Path, TransportTableModel.Attributes>>
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ package app.termora.transfer.internal.sftp
|
|||||||
import app.termora.I18n
|
import app.termora.I18n
|
||||||
import app.termora.Icons
|
import app.termora.Icons
|
||||||
import app.termora.OptionPane
|
import app.termora.OptionPane
|
||||||
import app.termora.WindowScope
|
|
||||||
import app.termora.transfer.TransportContextMenuExtension
|
import app.termora.transfer.TransportContextMenuExtension
|
||||||
import app.termora.transfer.TransportPopupMenu
|
import app.termora.transfer.TransportPopupMenu
|
||||||
import app.termora.transfer.TransportTableModel
|
import app.termora.transfer.TransportTableModel
|
||||||
import org.apache.sshd.sftp.client.fs.SftpFileSystem
|
import org.apache.sshd.sftp.client.fs.SftpFileSystem
|
||||||
|
import java.awt.Window
|
||||||
import java.nio.file.FileSystem
|
import java.nio.file.FileSystem
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import javax.swing.JMenuItem
|
import javax.swing.JMenuItem
|
||||||
@@ -19,7 +19,7 @@ internal class RmrfTransportContextMenuExtension private constructor() : Transpo
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun createJMenuItem(
|
override fun createJMenuItem(
|
||||||
windowScope: WindowScope,
|
window: Window,
|
||||||
fileSystem: FileSystem?,
|
fileSystem: FileSystem?,
|
||||||
popupMenu: TransportPopupMenu,
|
popupMenu: TransportPopupMenu,
|
||||||
files: List<Pair<Path, TransportTableModel.Attributes>>
|
files: List<Pair<Path, TransportTableModel.Attributes>>
|
||||||
@@ -31,7 +31,7 @@ internal class RmrfTransportContextMenuExtension private constructor() : Transpo
|
|||||||
val rmrfMenu = JMenuItem("rm -rf", Icons.warningIntroduction)
|
val rmrfMenu = JMenuItem("rm -rf", Icons.warningIntroduction)
|
||||||
rmrfMenu.addActionListener {
|
rmrfMenu.addActionListener {
|
||||||
if (OptionPane.showConfirmDialog(
|
if (OptionPane.showConfirmDialog(
|
||||||
windowScope.window,
|
window,
|
||||||
I18n.getString("termora.transport.table.contextmenu.rm-warning"),
|
I18n.getString("termora.transport.table.contextmenu.rm-warning"),
|
||||||
messageType = JOptionPane.ERROR_MESSAGE
|
messageType = JOptionPane.ERROR_MESSAGE
|
||||||
) == JOptionPane.YES_OPTION
|
) == JOptionPane.YES_OPTION
|
||||||
|
|||||||
Reference in New Issue
Block a user