chore: remove unused icons (#804)

Author: BFergerson

common/src/main/kotlin/spp/jetbrains/icons/PluginIcons.kt

@@ -18,6 +18,11 @@ package spp.jetbrains.icons
 
 import com.intellij.openapi.util.IconLoader
 
+/**
+ * Defines the various visual icons Source++ may display.
+ *
+ * @author [Brandon Fergerson](mailto:[email protected])
+ */
 object PluginIcons {
     object Nodes {
         @JvmField
@@ -27,90 +32,6 @@ object PluginIcons {
     object Command {
         @JvmField
         val logo = IconLoader.getIcon("/icons/command/logo.svg", PluginIcons::class.java)
-
-        @JvmField
-        val clearInstrumentSelected =
-            IconLoader.getIcon("/icons/command/clear-instruments_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val clearInstrumentUnSelected =
-            IconLoader.getIcon("/icons/command/clear-instruments_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveBreakpointSelected =
-            IconLoader.getIcon("/icons/command/live-breakpoint_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveBreakpointUnSelected =
-            IconLoader.getIcon("/icons/command/live-breakpoint_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveLogSelected = IconLoader.getIcon("/icons/command/live-log_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveLogUnSelected =
-            IconLoader.getIcon("/icons/command/live-log_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveMeterSelected =
-            IconLoader.getIcon("/icons/command/live-meter_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveMeterUnSelected =
-            IconLoader.getIcon("/icons/command/live-meter_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveSpanSelected = IconLoader.getIcon("/icons/command/live-span_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val liveSpanUnSelected =
-            IconLoader.getIcon("/icons/command/live-span_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewOverviewSelected =
-            IconLoader.getIcon("/icons/command/view-overview_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewOverviewUnSelected =
-            IconLoader.getIcon("/icons/command/view-overview_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewActivitySelected =
-            IconLoader.getIcon("/icons/command/view-activity_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewActivityUnSelected =
-            IconLoader.getIcon("/icons/command/view-activity_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewTracesSelected =
-            IconLoader.getIcon("/icons/command/view-traces_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewTracesUnSelected =
-            IconLoader.getIcon("/icons/command/view-traces_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewLogsSelected = IconLoader.getIcon("/icons/command/view-logs_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val viewLogsUnSelected =
-            IconLoader.getIcon("/icons/command/view-logs_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val quickStatsSelected =
-            IconLoader.getIcon("/icons/command/quick-stats_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val quickStatsUnSelected =
-            IconLoader.getIcon("/icons/command/quick-stats_unselected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val watchLogSelected = IconLoader.getIcon("/icons/command/watch-log_selected.svg", PluginIcons::class.java)
-
-        @JvmField
-        val watchLogUnSelected =
-            IconLoader.getIcon("/icons/command/watch-log_unselected.svg", PluginIcons::class.java)
     }
 
     object Instrument {
@@ -192,24 +113,6 @@ object PluginIcons {
     @JvmField
     val spanConfig = IconLoader.getIcon("/icons/span-config.svg", PluginIcons::class.java)
 
-    @JvmField
-    val config = IconLoader.getIcon("/icons/configIcon.svg", PluginIcons::class.java)
-
-    @JvmField
-    val configHovered = IconLoader.getIcon("/icons/configIconHovered.svg", PluginIcons::class.java)
-
-    @JvmField
-    val configPressed = IconLoader.getIcon("/icons/configIconPressed.svg", PluginIcons::class.java)
-
-    @JvmField
-    val exclamationTriangle = IconLoader.getIcon("/icons/exclamation-triangle.svg", PluginIcons::class.java)
-
-    @JvmField
-    val performanceRamp = IconLoader.getIcon("/icons/sort-amount-up.svg", PluginIcons::class.java)
-
-    @JvmField
-    val activeException = IconLoader.getIcon("/icons/map-marker-exclamation.svg", PluginIcons::class.java)
-
     @JvmField
     val count = IconLoader.getIcon("/icons/count.svg", PluginIcons::class.java)
 
@@ -218,10 +121,4 @@ object PluginIcons {
 
     @JvmField
     val histogram = IconLoader.getIcon("/icons/histogram.svg", PluginIcons::class.java)
-
-    @JvmField
-    val code = IconLoader.getIcon("/icons/code.svg", PluginIcons::class.java)
-
-    @JvmField
-    val tachometer = IconLoader.getIcon("/icons/tachometer-alt.svg", PluginIcons::class.java)
 }

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/icons/SourceMarkerIcons.kt

@@ -19,7 +19,7 @@ package spp.jetbrains.sourcemarker.service.instrument.breakpoint
 import com.intellij.util.ui.ColumnInfo
 import com.intellij.util.ui.table.IconTableCellRenderer
 import kotlinx.datetime.toJavaInstant
-import spp.jetbrains.sourcemarker.icons.SourceMarkerIcons
+import spp.jetbrains.icons.PluginIcons
 import spp.protocol.artifact.exception.methodName
 import spp.protocol.artifact.exception.qualifiedClassName
 import spp.protocol.artifact.exception.shortQualifiedClassName
@@ -50,7 +50,7 @@ class BreakpointEventColumnInfo(name: String) : ColumnInfo<LiveBreakpointHit, St
 
     override fun getCustomizedRenderer(o: LiveBreakpointHit, renderer: TableCellRenderer): TableCellRenderer {
         return when (name) {
-            "Breakpoint Data" -> IconTableCellRenderer.create(SourceMarkerIcons.LIVE_BREAKPOINT_ACTIVE_ICON)
+            "Breakpoint Data" -> IconTableCellRenderer.create(PluginIcons.Breakpoint.active)
             else -> super.getCustomizedRenderer(o, renderer)
         }
     }

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/BreakpointEventColumnInfo.kt

@@ -29,7 +29,7 @@ import com.intellij.ui.content.ContentManager
 import com.intellij.ui.content.ContentManagerEvent
 import com.intellij.ui.content.ContentManagerListener
 import com.intellij.xdebugger.impl.ui.ExecutionPointHighlighter
-import spp.jetbrains.sourcemarker.icons.SourceMarkerIcons.LIVE_BREAKPOINT_DISABLED_ICON
+import spp.jetbrains.icons.PluginIcons
 import spp.jetbrains.sourcemarker.service.instrument.breakpoint.LiveBreakpointConstants.LIVE_BREAKPOINT_NAME
 import spp.jetbrains.sourcemarker.service.instrument.breakpoint.ui.BreakpointHitWindow
 import spp.jetbrains.sourcemarker.service.instrument.breakpoint.ui.EventsWindow
@@ -61,11 +61,11 @@ class BreakpointHitWindowService(private val project: Project) : Disposable {
         try {
             _toolWindow = ToolWindowManager.getInstance(project) //2019.3+
                 .registerToolWindow(LIVE_BREAKPOINT_NAME, true, ToolWindowAnchor.BOTTOM, this, true)
-            _toolWindow!!.setIcon(LIVE_BREAKPOINT_DISABLED_ICON)
+            _toolWindow!!.setIcon(PluginIcons.Breakpoint.disabled)
         } catch (ignored: Throwable) {
             _toolWindow = ToolWindowManager.getInstance(project) //2020+
                 .registerToolWindow(
-                    RegisterToolWindowTask.closable(LIVE_BREAKPOINT_NAME, LIVE_BREAKPOINT_DISABLED_ICON)
+                    RegisterToolWindowTask.closable(LIVE_BREAKPOINT_NAME, PluginIcons.Breakpoint.disabled)
                 )
         }
 

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/BreakpointHitWindowService.kt

@@ -24,8 +24,8 @@ import com.intellij.ui.components.JBScrollPane
 import com.intellij.ui.table.JBTable
 import com.intellij.util.ui.ListTableModel
 import com.intellij.util.ui.table.IconTableCellRenderer
+import spp.jetbrains.icons.PluginIcons
 import spp.jetbrains.sourcemarker.activities.PluginSourceMarkerStartupActivity
-import spp.jetbrains.sourcemarker.icons.SourceMarkerIcons.LIVE_BREAKPOINT_ACTIVE_ICON
 import spp.jetbrains.sourcemarker.service.instrument.breakpoint.BreakpointEventColumnInfo
 import spp.jetbrains.sourcemarker.service.instrument.breakpoint.BreakpointHitWindowService
 import spp.protocol.instrument.event.LiveBreakpointHit
@@ -70,7 +70,7 @@ class EventsTab(val project: Project) : Disposable {
         val table = JBTable(model)
         table.isStriped = true
         table.setShowColumns(true)
-        table.setDefaultRenderer(Icon::class.java, IconTableCellRenderer.create(LIVE_BREAKPOINT_ACTIVE_ICON))
+        table.setDefaultRenderer(Icon::class.java, IconTableCellRenderer.create(PluginIcons.Breakpoint.active))
         table.addMouseListener(object : MouseAdapter() {
             override fun mousePressed(mouseEvent: MouseEvent) {
                 val point: Point = mouseEvent.point

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/service/instrument/breakpoint/ui/EventsTab.kt

@@ -27,6 +27,7 @@ import io.vertx.core.json.Json
 import io.vertx.core.json.JsonObject
 import kotlinx.coroutines.runBlocking
 import spp.jetbrains.UserData
+import spp.jetbrains.icons.PluginIcons
 import spp.jetbrains.plugin.LiveStatusManager
 import spp.jetbrains.marker.impl.ArtifactCreationService
 import spp.jetbrains.marker.impl.ArtifactNamingService
@@ -41,9 +42,6 @@ import spp.jetbrains.marker.source.mark.api.event.SourceMarkEventCode
 import spp.jetbrains.marker.source.mark.api.event.SourceMarkEventListener
 import spp.jetbrains.marker.source.mark.inlay.InlayMark
 import spp.jetbrains.sourcemarker.SourceMarkerPlugin
-import spp.jetbrains.sourcemarker.icons.SourceMarkerIcons.LIVE_METER_COUNT_ICON
-import spp.jetbrains.sourcemarker.icons.SourceMarkerIcons.LIVE_METER_GAUGE_ICON
-import spp.jetbrains.sourcemarker.icons.SourceMarkerIcons.LIVE_METER_HISTOGRAM_ICON
 import spp.jetbrains.sourcemarker.mark.SourceMarkKeys
 import spp.jetbrains.sourcemarker.mark.SourceMarkKeys.INSTRUMENT_EVENT_LISTENERS
 import spp.jetbrains.sourcemarker.mark.SourceMarkKeys.INSTRUMENT_ID
@@ -427,9 +425,9 @@ class LiveStatusManagerImpl(val project: Project, val vertx: Vertx) : LiveStatus
             if (gutterMark.isPresent) {
                 gutterMark.get().putUserData(INSTRUMENT_ID, liveMeter.id!!)
                 when (liveMeter.meterType) {
-                    MeterType.COUNT -> gutterMark.get().configuration.icon = LIVE_METER_COUNT_ICON
-                    MeterType.GAUGE -> gutterMark.get().configuration.icon = LIVE_METER_GAUGE_ICON
-                    MeterType.HISTOGRAM -> gutterMark.get().configuration.icon = LIVE_METER_HISTOGRAM_ICON
+                    MeterType.COUNT -> gutterMark.get().configuration.icon = PluginIcons.count
+                    MeterType.GAUGE -> gutterMark.get().configuration.icon = PluginIcons.gauge
+                    MeterType.HISTOGRAM -> gutterMark.get().configuration.icon = PluginIcons.histogram
                 }
                 gutterMark.get().configuration.activateOnMouseHover = true
                 gutterMark.get().configuration.activateOnMouseClick = true