Merge pull request #26 from SpringKill-team/feature/register

feature: Change SinkFinder windows to Problem window as a tab #5 #12

Author: springkill

src/main/kotlin/org/skgroup/securityinspector/ui/SecurityInspectorToolWindowFactory.kt

@@ -4,6 +4,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.wm.ToolWindow
 import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.content.ContentFactory
+import org.skgroup.securityinspector.ui.component.CallGraphUIComponents
 
 class SecurityInspectorToolWindowFactory : ToolWindowFactory {
 
@@ -17,5 +18,7 @@ class SecurityInspectorToolWindowFactory : ToolWindowFactory {
 
         // 把 Content 添加到 ToolWindow
         toolWindow.contentManager.addContent(content)
+
+        CallGraphUIComponents(project).addIssueProblemsTabToProblemsView()
     }
 }

src/main/kotlin/org/skgroup/securityinspector/ui/component/CallGraphUIComponents.kt

@@ -1,11 +1,14 @@
 package org.skgroup.securityinspector.ui.component
 
+import com.intellij.analysis.problemsView.toolWindow.ProblemsView
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ComboBox
+import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.ui.Gray
 import com.intellij.ui.JBSplitter
 import com.intellij.ui.components.*
+import com.intellij.ui.content.ContentFactory
 import com.intellij.ui.treeStructure.Tree
 import org.skgroup.securityinspector.analysis.ast.nodes.MethodNode
 import org.skgroup.securityinspector.enums.AnalysisScope
@@ -297,4 +300,21 @@ class CallGraphUIComponents(val project: Project) {
         }
     }
 
+    fun addIssueProblemsTabToProblemsView() {
+
+        val toolWindow = ToolWindowManager.getInstance(project).getToolWindow(ProblemsView.ID) ?: return
+        val contentManager = toolWindow.contentManager
+
+        val issueTab = IssueProblemsTab(project)
+        val content = ContentFactory.getInstance().createContent(issueTab.getComponent(), "Sink Finder", false)
+
+        contentManager.addContent(content)
+
+        if (!toolWindow.isVisible) {
+            toolWindow.show()
+        }
+
+        contentManager.setSelectedContent(content)
+    }
+
 }

…/securityinspector/ui/IssueViewWindow.kt …spector/ui/component/IssueProblemsTab.ktsrc/main/kotlin/org/skgroup/securityinspector/ui/IssueViewWindow.kt renamed to src/main/kotlin/org/skgroup/securityinspector/ui/component/IssueProblemsTab.kt src/main/kotlin/org/skgroup/securityinspector/ui/IssueViewWindow.kt renamed to src/main/kotlin/org/skgroup/securityinspector/ui/component/IssueProblemsTab.kt

@@ -1,20 +1,16 @@
-package org.skgroup.securityinspector.ui
+package org.skgroup.securityinspector.ui.component
 
+import com.intellij.analysis.problemsView.toolWindow.ProblemsViewTab
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.fileEditor.OpenFileDescriptor
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.wm.ToolWindow
-import com.intellij.openapi.wm.ToolWindowFactory
 import com.intellij.ui.components.JBPanel
 import com.intellij.ui.components.JBScrollPane
-import com.intellij.ui.content.ContentFactory
 import com.intellij.ui.table.JBTable
-import org.skgroup.securityinspector.ui.component.FirstColumnRenderer
-import org.skgroup.securityinspector.ui.component.HighlightRenderer
 import org.skgroup.securityinspector.utils.GraphUtils.collectProjectIssues
 import java.awt.BorderLayout
 import java.awt.event.MouseAdapter
@@ -23,28 +19,21 @@ import javax.swing.JButton
 import javax.swing.table.DefaultTableModel
 import javax.swing.table.TableRowSorter
 
-/**
- * 类描述：IssueViewWindow 类用于创建SinkFinder。
- *
- * @author springkill
- * @version 1.0
- */
-class IssueViewWindow : ToolWindowFactory {
+class IssueProblemsTab(project: Project) : ProblemsViewTab {
 
-    override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
-        val panel = JBPanel<JBPanel<*>>(BorderLayout())
-        val tableModel =
-            DefaultTableModel(arrayOf("File", "Line", "SinkClass", "SinkMethod", "Type", "SubType", "CallMode"), 0)
-        val refreshButton = JButton("Init Sink")
-        val table = object : JBTable(tableModel) {
-            override fun isCellEditable(row: Int, column: Int): Boolean {
-                return false
-            }
-        }
+    private val panel = JBPanel<JBPanel<*>>(BorderLayout())
 
-        val sorter = TableRowSorter(tableModel)
-        table.rowSorter = sorter
+    private val tableModel =
+        DefaultTableModel(arrayOf("File", "Line", "SinkClass", "SinkMethod", "Type", "SubType", "CallMode"), 0)
+    private val refreshButton = JButton("Init Sink")
+    private val table = object : JBTable(tableModel) {
+        override fun isCellEditable(row: Int, column: Int): Boolean = false
+    }
 
+    private val sorter = TableRowSorter(tableModel)
+
+    init {
+        table.rowSorter = sorter
         table.apply {
             columnModel.getColumn(0).cellRenderer = FirstColumnRenderer()
             columnModel.getColumn(4).cellRenderer = HighlightRenderer()
@@ -96,10 +85,13 @@ class IssueViewWindow : ToolWindowFactory {
 
         panel.add(JBScrollPane(table), BorderLayout.CENTER)
         panel.add(refreshButton, BorderLayout.SOUTH)
+    }
+
+    fun getComponent() = panel
 
-        val contentFactory = ContentFactory.getInstance()
-        val content = contentFactory.createContent(panel, "", false)
-        toolWindow.contentManager.addContent(content)
+    override fun getName(count: Int): String {
+        return "Sink Finder"
     }
 
+    override fun getTabId() = "Issue Problems Tab"
 }

src/main/resources/META-INF/plugin.xml

@@ -43,8 +43,6 @@
                     anchor="left"
                     icon="/icons/pluginIcon.svg"
         />
-        <toolWindow id="Sink Finder" anchor="bottom"
-                    factoryClass="org.skgroup.securityinspector.ui.IssueViewWindow"/>
 
         <!--<localInspection
                 language="JAVA" groupPath="Security"