Skip to content

Commit 55db773

Browse files
Move duplicated code to PanelUtil file
1 parent cb01b1d commit 55db773

File tree

7 files changed

+27
-25
lines changed

7 files changed

+27
-25
lines changed

ide-common/src/main/java/org/digma/intellij/plugin/errors/ErrorsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public ErrorsListContainer getErrors(@NotNull MethodInfo methodInfo) {
5959
Log.log(LOGGER::debug, "UsageStatus for {}: {}", methodInfo.getId(), usageStatus);
6060

6161
return new ErrorsListContainer(errorsListViewItems, usageStatus);
62-
}catch (AnalyticsServiceException e){
62+
} catch (AnalyticsServiceException e){
6363
//if analyticsService.getErrorsOfCodeObject throws exception it means errors could not be loaded, usually when
6464
//the backend is not available. return an empty ErrorsListContainer to keep everything running and don't
6565
//crash the plugin. don't log the exception, it was logged in AnalyticsService, keep the log quite because

ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/ErrorsViewService.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ErrorsViewService(project: Project) : AbstractViewService(project) {
4949
Log.log(logger::debug, "contextChanged to {}. ", methodInfo)
5050

5151
val errorsListContainer = errorsProvider.getErrors(methodInfo)
52+
5253
model.listViewItems = errorsListContainer.listViewItems
5354
model.usageStatusResult = errorsListContainer.usageStatus
5455
model.scope = MethodScope(methodInfo)

ide-common/src/main/kotlin/org/digma/intellij/plugin/ui/service/SummaryViewService.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ class SummaryViewService(project: Project) : AbstractViewService(project) {
7474

7575
private fun reload() {
7676
Log.log(logger::debug, "reload called")
77-
val insights = summariesProvider.getGlobalInsights()
78-
val environmentStatuses = summariesProvider.getEnvironmentStatuses()
77+
val insights = summariesProvider.globalInsights
78+
val environmentStatuses = summariesProvider.environmentStatuses
7979
model.insights = insights
8080
model.usageStatusResult = UsageStatusResult(emptyList(), environmentStatuses)
81-
model.count = insights.sumOf { it.modelObject.count() }
81+
model.count = insights.size
8282
updateUi()
8383
}
8484

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package org.digma.intellij.plugin.ui.list
2+
3+
import com.intellij.openapi.project.Project
4+
import org.digma.intellij.plugin.service.InsightsActionsService
5+
6+
fun openWorkspaceFileForSpan(
7+
project: Project,
8+
moreData: HashMap<String, Any>,
9+
spanId: String,
10+
) {
11+
val actionListener: InsightsActionsService = project.getService(InsightsActionsService::class.java)
12+
13+
@Suppress("UNCHECKED_CAST")
14+
val workspaceUri: Pair<String, Int> = moreData[spanId] as Pair<String, Int>
15+
actionListener.openWorkspaceFileForSpan(workspaceUri.first, workspaceUri.second)
16+
}

src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/DurationBreakdownPanel.kt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import com.intellij.util.ui.JBUI.Borders.empty
77
import org.digma.intellij.plugin.document.CodeObjectsUtil
88
import org.digma.intellij.plugin.model.rest.insights.SpanDurationBreakdown
99
import org.digma.intellij.plugin.model.rest.insights.SpanDurationBreakdownInsight
10-
import org.digma.intellij.plugin.service.InsightsActionsService
1110
import org.digma.intellij.plugin.ui.common.*
1211
import org.digma.intellij.plugin.ui.list.PanelsLayoutHelper
12+
import org.digma.intellij.plugin.ui.list.openWorkspaceFileForSpan
1313
import org.digma.intellij.plugin.ui.panels.DigmaResettablePanel
1414
import java.awt.BorderLayout
1515
import java.awt.GridLayout
@@ -186,11 +186,7 @@ private fun getSpanDisplayNameLabel(
186186

187187
val messageLabel = if (moreData.contains(spanId)) {
188188
ActionLink(asHtml(displayName)) {
189-
val actionListener: InsightsActionsService = project.getService(InsightsActionsService::class.java)
190-
191-
@Suppress("UNCHECKED_CAST")
192-
val workspaceUri: Pair<String, Int> = moreData[spanId] as Pair<String, Int>
193-
actionListener.openWorkspaceFileForSpan(workspaceUri.first, workspaceUri.second)
189+
openWorkspaceFileForSpan(project, moreData, spanId)
194190
}
195191
} else {
196192
JLabel(asHtml(displayName), SwingConstants.LEFT)

src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/SlowestSpansPanel.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import com.intellij.ui.components.JBLabel
66
import com.intellij.util.ui.JBUI
77
import org.digma.intellij.plugin.document.CodeObjectsUtil
88
import org.digma.intellij.plugin.model.rest.insights.*
9-
import org.digma.intellij.plugin.service.InsightsActionsService
109
import org.digma.intellij.plugin.ui.common.Laf
1110
import org.digma.intellij.plugin.ui.common.asHtml
1211
import org.digma.intellij.plugin.ui.common.buildBoldTitleGrayedComment
1312
import org.digma.intellij.plugin.ui.common.buildLinkTextWithTitleAndGrayedComment
13+
import org.digma.intellij.plugin.ui.list.openWorkspaceFileForSpan
1414
import java.awt.GridLayout
1515
import java.math.BigDecimal
1616
import java.math.RoundingMode
@@ -31,10 +31,7 @@ fun slowestSpansPanel(project: Project, insight: SlowestSpansInsight, moreData:
3131
if (moreData.contains(spanId)) {
3232
val spanText = buildLinkTextWithTitleAndGrayedComment(displayName,description)
3333
val link = ActionLink(spanText) {
34-
val actionListener: InsightsActionsService = project.getService(InsightsActionsService::class.java)
35-
@Suppress("UNCHECKED_CAST")
36-
val workspaceUri: Pair<String, Int> = moreData[spanId] as Pair<String, Int>
37-
actionListener.openWorkspaceFileForSpan(workspaceUri.first, workspaceUri.second)
34+
openWorkspaceFileForSpan(project, moreData, spanId)
3835
}
3936
link.toolTipText = genToolTip(slowSpan)
4037
spansListPanel.add(link)

src/main/kotlin/org/digma/intellij/plugin/ui/list/summaries/SummaryPanelListCellRenderer.kt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,11 @@ import org.digma.intellij.plugin.model.rest.insights.SpanDurationChangeInsight
1111
import org.digma.intellij.plugin.model.rest.insights.SpanDurationsPercentile
1212
import org.digma.intellij.plugin.model.rest.insights.TopErrorFlowsInsight
1313
import org.digma.intellij.plugin.service.ErrorsActionsService
14-
import org.digma.intellij.plugin.service.InsightsActionsService
1514
import org.digma.intellij.plugin.ui.common.CopyableLabelHtml
1615
import org.digma.intellij.plugin.ui.common.Laf
1716
import org.digma.intellij.plugin.ui.common.asHtml
1817
import org.digma.intellij.plugin.ui.common.buildLinkTextWithGrayedAndDefaultLabelColorPart
19-
import org.digma.intellij.plugin.ui.list.AbstractPanelListCellRenderer
20-
import org.digma.intellij.plugin.ui.list.PanelsLayoutHelper
21-
import org.digma.intellij.plugin.ui.list.RoundedPanel
22-
import org.digma.intellij.plugin.ui.list.commonListItemPanel
18+
import org.digma.intellij.plugin.ui.list.*
2319
import org.digma.intellij.plugin.ui.list.errors.contentOfFirstAndLast
2420
import org.digma.intellij.plugin.ui.list.insights.genericPanelForSingleInsight
2521
import org.digma.intellij.plugin.ui.list.insights.percentileRowPanel
@@ -115,11 +111,7 @@ private fun buildSpanDuration(value: SpanDurationChangeInsight.Change, moreData:
115111
val spanId = CodeObjectsUtil.createSpanId(value.span.instrumentationLibrary, value.span.name)
116112
val title = if (moreData.contains(spanId)) {
117113
ActionLink(asHtml(value.span.displayName)) {
118-
val actionListener: InsightsActionsService = project.getService(InsightsActionsService::class.java)
119-
120-
@Suppress("UNCHECKED_CAST")
121-
val workspaceUri: Pair<String, Int> = moreData[spanId] as Pair<String, Int>
122-
actionListener.openWorkspaceFileForSpan(workspaceUri.first, workspaceUri.second)
114+
openWorkspaceFileForSpan(project, moreData, spanId)
123115
}
124116
} else{
125117
JLabel(asHtml(value.span.displayName), SwingConstants.LEFT)

0 commit comments

Comments
 (0)