From e2a448a969d8f1a6c2660bc654bdf7a91507d620 Mon Sep 17 00:00:00 2001 From: chess-equality Date: Thu, 20 Jul 2023 09:56:56 +0800 Subject: [PATCH 1/3] Local protocol.jar --- build.gradle.kts | 7 +++++++ .../sourcemarker/view/window/LiveEndpointsWindow.kt | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 148e50448..ad5286b30 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -96,6 +96,13 @@ allprojects { } subprojects { + + configurations { create("externalLibs") } + + dependencies { + implementation(files("$rootDir/../../protocol/build/libs/protocol-0.7.10-SNAPSHOT.jar")) + } + repositories { mavenCentral() maven(url = "https://pkg.sourceplus.plus/sourceplusplus/protocol") diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt index b97e9b60b..41a4320ad 100644 --- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt +++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt @@ -16,6 +16,7 @@ */ package spp.jetbrains.sourcemarker.view.window +import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.project.Project import com.intellij.ui.components.JBScrollPane import com.intellij.ui.table.JBTable @@ -61,6 +62,8 @@ class LiveEndpointsWindow( service: Service ) : ResumableViewCollection() { + private val log = logger() + private val model = ListTableModel( arrayOf( ServiceEndpointColumnInfo("Name"), @@ -93,11 +96,14 @@ class LiveEndpointsWindow( val vertx = UserData.vertx(project) vertx.safeLaunch { - UserData.liveManagementService(project).getEndpoints(service, 1000).await().forEach { + log.info("########## START LiveEndpointsWindow getEndpoints") + UserData.liveManagementService(project).getEndpoints(service, 1000, true).await().forEach { val endpointRow = ServiceEndpointRow(it) + log.info(">>>>>>>>>> endpointRow = $endpointRow\n") model.addRow(endpointRow) addView(vertx, service, endpointRow) } + log.info("########## END LiveEndpointsWindow getEndpoints") } } From e476fae9ce4e285c7c849e2990dc99d014f3bb84 Mon Sep 17 00:00:00 2001 From: chess-equality Date: Tue, 25 Jul 2023 10:33:17 +0800 Subject: [PATCH 2/3] Cleanup --- build.gradle.kts | 7 ------- .../sourcemarker/view/window/LiveEndpointsWindow.kt | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ad5286b30..148e50448 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -96,13 +96,6 @@ allprojects { } subprojects { - - configurations { create("externalLibs") } - - dependencies { - implementation(files("$rootDir/../../protocol/build/libs/protocol-0.7.10-SNAPSHOT.jar")) - } - repositories { mavenCentral() maven(url = "https://pkg.sourceplus.plus/sourceplusplus/protocol") diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt index 41a4320ad..deaa6500f 100644 --- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt +++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt @@ -16,7 +16,6 @@ */ package spp.jetbrains.sourcemarker.view.window -import com.intellij.openapi.diagnostic.logger import com.intellij.openapi.project.Project import com.intellij.ui.components.JBScrollPane import com.intellij.ui.table.JBTable @@ -62,8 +61,6 @@ class LiveEndpointsWindow( service: Service ) : ResumableViewCollection() { - private val log = logger() - private val model = ListTableModel( arrayOf( ServiceEndpointColumnInfo("Name"), @@ -96,14 +93,11 @@ class LiveEndpointsWindow( val vertx = UserData.vertx(project) vertx.safeLaunch { - log.info("########## START LiveEndpointsWindow getEndpoints") - UserData.liveManagementService(project).getEndpoints(service, 1000, true).await().forEach { + UserData.liveManagementService(project).getEndpoints(service, 1000, false).await().forEach { val endpointRow = ServiceEndpointRow(it) - log.info(">>>>>>>>>> endpointRow = $endpointRow\n") model.addRow(endpointRow) addView(vertx, service, endpointRow) } - log.info("########## END LiveEndpointsWindow getEndpoints") } } From 93fab1d36bc6385132c1c1dfb74775fd8b251eca Mon Sep 17 00:00:00 2001 From: chess-equality Date: Sat, 29 Jul 2023 10:34:22 +0800 Subject: [PATCH 3/3] Filtered --- .../jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt index deaa6500f..7dfae76e4 100644 --- a/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt +++ b/plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt @@ -93,7 +93,7 @@ class LiveEndpointsWindow( val vertx = UserData.vertx(project) vertx.safeLaunch { - UserData.liveManagementService(project).getEndpoints(service, 1000, false).await().forEach { + UserData.liveManagementService(project).getEndpoints(service, 1000, true).await().forEach { val endpointRow = ServiceEndpointRow(it) model.addRow(endpointRow) addView(vertx, service, endpointRow)