chore: clean up, maybe resolve "Project is already disposed"

allape · allape · commit 92c8aea4ecf3 · 2023-04-29T19:18:42.000+08:00
diff --git a/src/main/kotlin/net/allape/App.kt b/src/main/kotlin/net/allape/App.kt
@@ -1,14 +1,11 @@
 package net.allape
 
-import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.openapi.wm.ex.ToolWindowEx
 import com.intellij.ui.content.ContentFactory
-import com.intellij.ui.content.ContentManagerEvent
-import com.intellij.ui.content.ContentManagerListener
 import net.allape.action.NewWindowAction
 import net.allape.common.XFTPManager
 import net.allape.xftp.XFTP
@@ -22,7 +19,7 @@ class App: ToolWindowFactory, DumbAware {
             val window = XFTP(project, toolWindow)
 
             //获取内容工厂的实例
-            val contentFactory = ContentFactory.SERVICE.getInstance()
+            val contentFactory = ContentFactory.getInstance()
 
             //获取用于toolWindow显示的内容
             val content = contentFactory.createContent(window.getUI(), XFTPManager.DEFAULT_NAME, false)
@@ -36,31 +33,11 @@ class App: ToolWindowFactory, DumbAware {
 
             window.bindContext(content)
 
-            // 放入缓存
-            XFTPManager.windows[content] = window
-
             return window
         }
     }
 
-    private val logger = Logger.getInstance(App::class.java)
-
     override fun init(toolWindow: ToolWindow) {
-        XFTPManager.toolWindow = toolWindow
-        toolWindow.addContentManagerListener(object : ContentManagerListener {
-            override fun contentRemoved(event: ContentManagerEvent) {
-                super.contentRemoved(event)
-                val window = XFTPManager.windows[event.content]
-                if (window == null) {
-                    logger.warn("closed an un-cached window: $event")
-                } else {
-                    XFTPManager.windows.remove(event.content)
-                }
-                if (toolWindow.contentManager.contents.isEmpty()) {
-                    toolWindow.hide()
-                }
-            }
-        })
         if (toolWindow is ToolWindowEx) {
             toolWindow.setTabActions(NewWindowAction())
         }
diff --git a/src/main/kotlin/net/allape/action/MakeAConnectAction.kt b/src/main/kotlin/net/allape/action/MakeAConnectAction.kt
@@ -1,6 +1,7 @@
 package net.allape.action
 
 import com.intellij.icons.AllIcons
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
 import com.intellij.openapi.project.DumbAwareAction
@@ -10,6 +11,10 @@ import net.allape.xftp.XFTP
 class MakeAConnectAction: DumbAwareAction(
     AllIcons.Webreferences.Server,
 ) {
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.EDT
+    }
+
     override fun update(e: AnActionEvent) {
         val window = XFTPManager.getCurrentSelectedWindow()
         if (window != null && window.isConnected()) {
diff --git a/src/main/kotlin/net/allape/action/MutableAction.kt b/src/main/kotlin/net/allape/action/MutableAction.kt
@@ -1,5 +1,6 @@
 package net.allape.action
 
+import com.intellij.openapi.actionSystem.ActionUpdateThread
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.ShortcutSet
@@ -40,6 +41,9 @@ class SimpleMutableAction(
     from?.templatePresentation?.icon,
     from?.shortcutSet,
 ) {
+    override fun getActionUpdateThread(): ActionUpdateThread {
+        return ActionUpdateThread.EDT
+    }
 
     override fun update(e: AnActionEvent) {
         super.update(e)
diff --git a/src/main/kotlin/net/allape/common/XFTPManager.kt b/src/main/kotlin/net/allape/common/XFTPManager.kt
@@ -2,29 +2,27 @@ package net.allape.common
 
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.Notifications
-import com.intellij.openapi.project.ProjectManager
+import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.MessageType
 import com.intellij.openapi.ui.popup.Balloon
+import com.intellij.openapi.wm.IdeFocusManager
 import com.intellij.openapi.wm.ToolWindow
+import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.ui.GotItTooltip
-import com.intellij.ui.content.Content
 import net.allape.xftp.XFTP
+import net.allape.xftp.XFTPPanel
 import java.awt.Point
 import javax.swing.JComponent
 
 
 class XFTPManager {
 
     companion object {
-
-        lateinit var toolWindow: ToolWindow
+        const val TOOL_WINDOW_ID = "XFTP"
 
         // 默认的窗口名称
         const val DEFAULT_NAME = "Explorer"
 
-        // 当前打开的窗口
-        val windows: HashMap<Content, XFTP> = HashMap(10)
-
         /**
          * message中用到的group
          */
@@ -49,7 +47,7 @@ class XFTPManager {
         fun gotIt(component: JComponent, message: String) {
 //            JBPopupFactory.getInstance().createComponentPopupBuilder(component, component).setTitle("啊哈").setAdText(message)
 //            GotItMessage.createMessage("A", message).setShowCallout(false).show(RelativePoint(component, Point(0,0)), Balloon.Position.above)
-            val tooltips = GotItTooltip(GOT_IT_ID, message, ProjectManager.getInstance().defaultProject)
+            val tooltips = GotItTooltip(GOT_IT_ID, message, getCurrentSelectedWindow())
             tooltips.showCondition =  { true }
             tooltips
                 .withTimeout(3000)
@@ -59,15 +57,22 @@ class XFTPManager {
                 }
         }
 
-        /**
-         * 获取当前选中的窗口, 可能为null
-         */
         fun getCurrentSelectedWindow(): XFTP? {
-            return toolWindow.contentManager.selectedContent?.let { content ->
-                windows[content]
+            return getCurrentProjectToolWindow()?.let { toolWindow ->
+                val selectedComponent = toolWindow.contentManager.selectedContent?.component as XFTPPanel?
+                return selectedComponent?.xftp
             }
         }
 
+        fun getCurrentProject(): Project? {
+            return IdeFocusManager.getGlobalInstance().lastFocusedFrame?.project
+        }
+
+        fun getCurrentProjectToolWindow(): ToolWindow? {
+            return getCurrentProject()?.let { project ->
+                return ToolWindowManager.getInstance(project).getToolWindow(TOOL_WINDOW_ID)
+            }
+        }
     }
 
 }
diff --git a/src/main/kotlin/net/allape/xftp/ExplorerWindowTabCloseListener.kt b/src/main/kotlin/net/allape/xftp/ExplorerWindowTabCloseListener.kt
@@ -5,7 +5,6 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.MessageDialogBuilder
 import com.intellij.ui.content.Content
-import net.allape.common.XFTPManager
 
 class ExplorerWindowTabCloseListener(
     private val project: Project,
@@ -15,16 +14,16 @@ class ExplorerWindowTabCloseListener(
 
     override fun disposeContent(content: Content) {
         try {
-            XFTPManager.windows[content]?.dispose()
+            (content.component as XFTPPanel).xftp.dispose()
         } catch (e: Exception) {
             e.printStackTrace()
         }
     }
 
     override fun closeQuery(content: Content, projectClosing: Boolean): Boolean {
         if (projectClosing) return true
-        val window = XFTPManager.windows[content]
-        return if (window?.sftpClient != null) {
+        val window = (content.component as XFTPPanel).xftp
+        return if (window.sftpClient != null) {
             MessageDialogBuilder.yesNo("A server is connected", "Do you really want to close this tab?")
                 .asWarning()
                 .yesText("Close")
diff --git a/src/main/kotlin/net/allape/xftp/XFTP.kt b/src/main/kotlin/net/allape/xftp/XFTP.kt
@@ -12,6 +12,7 @@ import com.intellij.openapi.vfs.VirtualFileManager
 import com.intellij.openapi.vfs.newvfs.BulkFileListener
 import com.intellij.openapi.vfs.newvfs.events.VFileEvent
 import com.intellij.openapi.wm.ToolWindow
+import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.remote.RemoteCredentials
 import com.intellij.ssh.RemoteFileObject
 import com.intellij.ssh.connectionBuilder
@@ -58,7 +59,7 @@ class XFTP(
         val XFTP_KEY: Key<XFTP> = Key.create(XFTP::javaClass.name)
 
         fun createWindowWithAnActionEvent(project: Project, showToolWindow: Boolean = true, consumer: Consumer<XFTP>? = null) {
-            XFTPManager.toolWindow.let { toolWindow ->
+            ToolWindowManager.getInstance(project).getToolWindow(XFTPManager.TOOL_WINDOW_ID)?.let { toolWindow ->
                 if (showToolWindow) toolWindow.show()
                 App.createTheToolWindowContent(project, toolWindow).let { window -> consumer?.accept(window) }
             }
@@ -90,6 +91,8 @@ class XFTP(
             }
         })
 
+
+        panelWrapper = XFTPPanel(this)
         buildUI()
     }
 
diff --git a/src/main/kotlin/net/allape/xftp/XFTPCore.kt b/src/main/kotlin/net/allape/xftp/XFTPCore.kt
@@ -55,11 +55,6 @@ abstract class XFTPCore(
     companion object {
         // 服务器文件系统分隔符
         const val FILE_SEP = "/"
-        init {
-            if (FILE_SEP.length != 1) {
-                throw IllegalArgumentException("FILE_SEP Only accepts one character")
-            }
-        }
 
         // 分隔符重复替换正则
         val duplicateRegex = Regex("$FILE_SEP$FILE_SEP+")
@@ -72,7 +67,7 @@ abstract class XFTPCore(
         const val COLLECTION_SIZE = 100
 
         // 当前用户本地home目录
-        val USER_HOME: String = System.getProperty("user.home")
+//        val USER_HOME: String = System.getProperty("user.home")
 
         // 最大可打开文件
         const val EDITABLE_FILE_SIZE = (2 * 1024 * 1024).toLong()
@@ -525,7 +520,7 @@ abstract class XFTPCore(
                 }
             try {
                 val formattedFileName = remoteFile.name()
-                // 所有点"."开头的文件名可能导致本地fs错误
+                // 所有点 "." 开头的文件名可能导致本地fs错误
 //                if (remoteFile.name().startsWith(".")) {
 //                    formattedFileName = remoteFile.name().replaceAll("\\.", "-");
 //                } else {
diff --git a/src/main/kotlin/net/allape/xftp/XFTPPanel.kt b/src/main/kotlin/net/allape/xftp/XFTPPanel.kt
@@ -0,0 +1,6 @@
+package net.allape.xftp
+
+import java.awt.BorderLayout
+import javax.swing.JPanel
+
+class XFTPPanel(val xftp: XFTP): JPanel(BorderLayout())
diff --git a/src/main/kotlin/net/allape/xftp/XFTPWidget.kt b/src/main/kotlin/net/allape/xftp/XFTPWidget.kt
@@ -107,7 +107,7 @@ abstract class XFTPWidget(
 
     // region UI组件
 
-    private var panelWrapper = JPanel(BorderLayout())
+    protected lateinit var panelWrapper: XFTPPanel
     private val splitter: JBSplitter = OnePixelSplitter("xftp-main-window", .5f)
 
     private var localWrapper = JPanel(GridBagLayout())
@@ -151,7 +151,9 @@ abstract class XFTPWidget(
     val explore: MutableAction = SimpleMutableAction(globalExplorer) {
         if (!isConnected()) {
             connect {
-                if (!XFTPManager.toolWindow.isVisible) XFTPManager.toolWindow.show()
+                XFTPManager.getCurrentProjectToolWindow()?.let { toolWindow ->
+                    if (!toolWindow.isVisible) toolWindow.show()
+                }
             }
         }
     }
diff --git a/src/main/kotlin/net/allape/xftp/component/FileNameTextFieldDialog.kt b/src/main/kotlin/net/allape/xftp/component/FileNameTextFieldDialog.kt
@@ -60,7 +60,7 @@ class FileNameValidator(
     private var errorText: String? = null
 
     override fun checkInput(inputString: String?): Boolean {
-        if (inputString == null || inputString.isEmpty()) {
+        if (inputString.isNullOrEmpty()) {
             errorText = "$objectName name can NOT be empty"
             return false
         }
diff --git a/src/main/kotlin/net/allape/xftp/component/MemoComboBox.kt b/src/main/kotlin/net/allape/xftp/component/MemoComboBox.kt
@@ -70,7 +70,7 @@ class MemoComboBox<E>(
     /**
      * 当前组件是否获取了焦点
      */
-    private var focued: Boolean = false
+    private var focused: Boolean = false
 
     init {
         setRenderer(ComboBoxCellRenderer())
@@ -80,7 +80,7 @@ class MemoComboBox<E>(
         val propertiesComponent = PropertiesComponent.getInstance()
         try {
             val persistedJson = propertiesComponent.getValue(persistenceKey)
-            if (persistedJson != null && persistedJson.isNotEmpty()) {
+            if (!persistedJson.isNullOrEmpty()) {
                 val listType = object : TypeToken<List<MemoComboBoxPersistenceModel<E>?>?>() {}.type
                 (dataModel as DefaultComboBoxModel<MemoComboBoxPersistenceModel<E>?>)
                     .addAll(Gson().fromJson(persistedJson, listType))
@@ -93,7 +93,7 @@ class MemoComboBox<E>(
         // 初始化focus监听
         addFocusListener(object : FocusListener {
             override fun focusGained(e: FocusEvent?) {
-                focued = true
+                focused = true
                 if (popupAfterGainedFocus) {
                     popupAfterGainedFocus = false
                     // FIXME 因为马上设置为true时, 因为焦点获取延时的问题, 会导致popup马上关闭
@@ -103,7 +103,7 @@ class MemoComboBox<E>(
                 }
             }
             override fun focusLost(e: FocusEvent?) {
-                focued = false
+                focused = false
             }
         })
     }
@@ -170,7 +170,7 @@ class MemoComboBox<E>(
         if (isPopupVisible) {
             isPopupVisible = false
         } else {
-            if (focued) {
+            if (focused) {
                 isPopupVisible = true
             } else {
                 popupAfterGainedFocus = true

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ abstract class XFTPWidget(`
`107`	`107`
`108`	`108`	`// region UI组件`
`109`	`109`
`110`		`- private var panelWrapper = JPanel(BorderLayout())`
	`110`	`+ protected lateinit var panelWrapper: XFTPPanel`
`111`	`111`	`private val splitter: JBSplitter = OnePixelSplitter("xftp-main-window", .5f)`
`112`	`112`
`113`	`113`	`private var localWrapper = JPanel(GridBagLayout())`
`@@ -151,7 +151,9 @@ abstract class XFTPWidget(`
`151`	`151`	`val explore: MutableAction = SimpleMutableAction(globalExplorer) {`
`152`	`152`	`if (!isConnected()) {`
`153`	`153`	`connect {`
`154`		`- if (!XFTPManager.toolWindow.isVisible) XFTPManager.toolWindow.show()`
	`154`	`+ XFTPManager.getCurrentProjectToolWindow()?.let { toolWindow ->`
	`155`	`+ if (!toolWindow.isVisible) toolWindow.show()`
	`156`	`+ }`
`155`	`157`	`}`
`156`	`158`	`}`
`157`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class FileNameValidator(`
`60`	`60`	`private var errorText: String? = null`
`61`	`61`
`62`	`62`	`override fun checkInput(inputString: String?): Boolean {`
`63`		`- if (inputString == null \|\| inputString.isEmpty()) {`
	`63`	`+ if (inputString.isNullOrEmpty()) {`
`64`	`64`	`errorText = "$objectName name can NOT be empty"`
`65`	`65`	`return false`
`66`	`66`	`}`