From bdb97ed46a91017b841ed31458209ca6dd463e7f Mon Sep 17 00:00:00 2001 From: Dmitry Gridin Date: Wed, 17 Apr 2019 18:00:00 +0700 Subject: [PATCH] Replace deprecated icons with actual --- idea/fir-view/src/FirExplorerToolWindow.kt | 2 +- .../breakpoints/KotlinFieldBreakpoint.kt | 16 ++-------------- .../jetbrains/kotlin/console/gutter/ReplIcons.kt | 6 +++--- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/idea/fir-view/src/FirExplorerToolWindow.kt b/idea/fir-view/src/FirExplorerToolWindow.kt index 8e909d04c38..b2498912216 100644 --- a/idea/fir-view/src/FirExplorerToolWindow.kt +++ b/idea/fir-view/src/FirExplorerToolWindow.kt @@ -242,7 +242,7 @@ class FirExplorerToolWindow(private val project: Project, private val toolWindow override fun update(presentation: PresentationData) { super.update(presentation) - presentation.setIcon(AllIcons.General.Recursive) + presentation.setIcon(AllIcons.Actions.ShowAsTree) } override fun getChildren(): Array { diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt index f93f02876d1..987212ef6b4 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpoint.kt @@ -361,26 +361,14 @@ class KotlinFieldBreakpoint( } } - override fun getInvalidIcon(isMuted: Boolean): Icon { - return when { - isMuted -> AllIcons.Debugger.Db_muted_invalid_field_breakpoint - else -> AllIcons.Debugger.Db_invalid_field_breakpoint - } - } - override fun getVerifiedIcon(isMuted: Boolean): Icon { return when { - isMuted -> AllIcons.Debugger.Db_muted_verified_field_breakpoint + isMuted -> AllIcons.Debugger.Db_muted_field_breakpoint else -> AllIcons.Debugger.Db_verified_field_breakpoint } } - override fun getVerifiedWarningsIcon(isMuted: Boolean): Icon { - return when { - isMuted -> AllIcons.Debugger.Db_muted_field_warning_breakpoint - else -> AllIcons.Debugger.Db_field_warning_breakpoint - } - } + override fun getVerifiedWarningsIcon(isMuted: Boolean): Icon = AllIcons.Debugger.Db_exception_breakpoint override fun getCategory() = CATEGORY diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ReplIcons.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ReplIcons.kt index 3ed8c4d27a4..c44e9d089bf 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ReplIcons.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/gutter/ReplIcons.kt @@ -24,14 +24,14 @@ data class IconWithTooltip(val icon: Icon, val tooltip: String?) object ReplIcons { val BUILD_WARNING_INDICATOR: IconWithTooltip = IconWithTooltip(AllIcons.Ide.Warning_notifications, null) - val HISTORY_INDICATOR: IconWithTooltip = IconWithTooltip(AllIcons.General.MessageHistory, "History of executed commands") + val HISTORY_INDICATOR: IconWithTooltip = IconWithTooltip(AllIcons.Vcs.History, "History of executed commands") val EDITOR_INDICATOR: IconWithTooltip = IconWithTooltip(KotlinIcons.LAUNCH, "Write your commands here") val EDITOR_READLINE_INDICATOR: IconWithTooltip = IconWithTooltip(AllIcons.General.Balloon, "Waiting for input...") - val COMMAND_MARKER: IconWithTooltip = IconWithTooltip(AllIcons.General.Run, "Executed command") + val COMMAND_MARKER: IconWithTooltip = IconWithTooltip(AllIcons.RunConfigurations.TestState.Run, "Executed command") val READLINE_MARKER: IconWithTooltip = IconWithTooltip(AllIcons.Icons.Ide.SpeedSearchPrompt, "Input line") // command result icons - val SYSTEM_HELP: IconWithTooltip = IconWithTooltip(AllIcons.Actions.Menu_help, "System help") + val SYSTEM_HELP: IconWithTooltip = IconWithTooltip(AllIcons.Actions.Help, "System help") val RESULT: IconWithTooltip = IconWithTooltip(AllIcons.Vcs.Equal, "Result") val COMPILER_ERROR: Icon = AllIcons.General.Error val RUNTIME_EXCEPTION: IconWithTooltip = IconWithTooltip(AllIcons.General.BalloonWarning, "Runtime exception")